[Pkg-e-commits] [SCM] Enlightenment 17 branch, master, updated. debian/0.16.999.050+svn20081207-1-7819-gf844bd9

Albin Tonnerre albin.tonnerre at gmail.com
Fri Jul 3 14:24:54 UTC 2009


The following commit has been merged in the master branch:
commit 9f9bd3ab172b5a408de974137eb7d1e49fa91a2f
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date:   Fri Jun 19 16:51:18 2009 +0200

    Import upstream release 0.16.999.061

diff --git a/Makefile.in b/Makefile.in
index 9329dd9..9529da3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -260,6 +260,7 @@ 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@
@@ -272,6 +273,7 @@ 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@
diff --git a/config.h.in b/config.h.in
index 0150558..fb2dd34 100644
--- a/config.h.in
+++ b/config.h.in
@@ -284,6 +284,9 @@
 /* Use module dropshadow */
 #undef USE_MODULE_DROPSHADOW
 
+/* Use module everything */
+#undef USE_MODULE_EVERYTHING
+
 /* Use module exebuf */
 #undef USE_MODULE_EXEBUF
 
@@ -320,6 +323,9 @@
 /* Use module syscon */
 #undef USE_MODULE_SYSCON
 
+/* Use module systray */
+#undef USE_MODULE_SYSTRAY
+
 /* Use module temperature */
 #undef USE_MODULE_TEMPERATURE
 
diff --git a/config/Makefile.in b/config/Makefile.in
index 7f52bcc..1fbc0e8 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -242,6 +242,7 @@ 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@
@@ -254,6 +255,7 @@ 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@
diff --git a/config/default/Makefile.in b/config/default/Makefile.in
index f681779..3629d45 100644
--- a/config/default/Makefile.in
+++ b/config/default/Makefile.in
@@ -230,6 +230,7 @@ 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@
@@ -242,6 +243,7 @@ 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@
diff --git a/config/default/e.src b/config/default/e.src
index aaab81d..db4f828 100644
--- a/config/default/e.src
+++ b/config/default/e.src
@@ -1,5 +1,5 @@
 group "E_Config" struct {
-  value "config_version" int: 65838;
+  value "config_version" int: 65842;
   value "show_splash" int: 0;
   value "init_default_theme" string: "default.edj";
   value "desktop_default_name" string: "Desktop %i, %i";
@@ -446,9 +446,12 @@ group "E_Config" struct {
   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.0;
   value "desklock_autolock_idle" int: 0;
   value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000;
   value "desklock_use_custom_desklock" int: 0;
+  value "desklock_ask_presentation" uchar: 1;
+  value "desklock_ask_presentation_timeout" double: 30;
   value "display_res_restore" int: 0;
   value "display_res_width" int: 1;
   value "display_res_height" int: 1;
@@ -459,6 +462,8 @@ group "E_Config" struct {
   value "screensaver_interval" int: 5;
   value "screensaver_blanking" int: 2;
   value "screensaver_expose" int: 2;
+  value "screensaver_ask_presentation" uchar: 1;
+  value "screensaver_ask_presentation_timeout" double: 30;
   value "dpms_enable" int: 1;
   value "dpms_standby_enable" int: 1;
   value "dpms_suspend_enable" int: 1;
@@ -527,4 +532,6 @@ group "E_Config" struct {
   value "syscon.extra.icon_size" int: 48;
   value "syscon.timeout" double: 0.0;
   value "syscon.do_input" uchar: 0;
+  value "mode.presentation" uchar: 0;
+  value "mode.offline" uchar: 0;
 }
diff --git a/config/default/profile.desktop b/config/default/profile.desktop
index baee810..02aa0bf 100644
--- a/config/default/profile.desktop
+++ b/config/default/profile.desktop
@@ -5,9 +5,11 @@ Name[it]=Predefinito
 Name[hu]=Alapértelmezett
 Name[fr]=Prédéfini
 Name[el]=Προκαθορισμένο
+Name[eo]=Pravaloroj
 Icon=icon.png
 Comment=Select this to begin<br>the initial setup again.
 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
diff --git a/config/illume/Makefile.in b/config/illume/Makefile.in
index e03357b..e07ba8d 100644
--- a/config/illume/Makefile.in
+++ b/config/illume/Makefile.in
@@ -230,6 +230,7 @@ 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@
@@ -242,6 +243,7 @@ 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@
diff --git a/config/illume/e.src b/config/illume/e.src
index b02e133..f0d577a 100644
--- a/config/illume/e.src
+++ b/config/illume/e.src
@@ -1,5 +1,5 @@
 group "E_Config" struct {
-  value "config_version" int: 65839;
+  value "config_version" int: 65842;
   value "show_splash" int: 1;
   value "init_default_theme" string: "default.edj";
   value "desktop_default_name" string: "Desktop %i, %i";
@@ -656,9 +656,12 @@ group "E_Config" struct {
   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.0;
   value "desklock_autolock_idle" int: 0;
   value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000;
   value "desklock_use_custom_desklock" int: 0;
+  value "desklock_ask_presentation" uchar: 1;
+  value "desklock_ask_presentation_timeout" double: 30;
   value "display_res_restore" int: 0;
   value "display_res_width" int: 1;
   value "display_res_height" int: 1;
@@ -669,6 +672,8 @@ group "E_Config" struct {
   value "screensaver_interval" int: 5;
   value "screensaver_blanking" int: 2;
   value "screensaver_expose" int: 2;
+  value "screensaver_ask_presentation" uchar: 1;
+  value "screensaver_ask_presentation_timeout" double: 30;
   value "dpms_enable" int: 0;
   value "dpms_standby_enable" int: 0;
   value "dpms_suspend_enable" int: 0;
@@ -817,4 +822,6 @@ group "E_Config" struct {
       value "is_main" int: 0;
     }
   }
+  value "mode.presentation" uchar: 0;
+  value "mode.offline" uchar: 0;
 }
diff --git a/config/illume/profile.desktop b/config/illume/profile.desktop
index bafed69..ecd177c 100644
--- a/config/illume/profile.desktop
+++ b/config/illume/profile.desktop
@@ -3,9 +3,11 @@ Type=Link
 Name=Illume
 Name[fr]=Illume
 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[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.
 Comment[el]=Το προφίλ Illume είναι<br>για μικροσυσκευές όπως <br>κινητά τηλέφωνα ή internet<br>tablets με μικρές οθόνες αφής.<br>Επιλέξτε μόνο αν έχετε τέτοια<br>συσκευή.
+Comment[eo]=Profilo Illume por la<br>enkorpigitaj sistemoj<br>kiel la telefonoj kaj<br>ttt-tabletoj kun etaj<br>tuŝekranoj. Nur uzu<br>tiun se vi vere havas<br>tian aparaton.
diff --git a/config/minimalist/Makefile.in b/config/minimalist/Makefile.in
index 184caf0..7a6a51a 100644
--- a/config/minimalist/Makefile.in
+++ b/config/minimalist/Makefile.in
@@ -230,6 +230,7 @@ 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@
@@ -242,6 +243,7 @@ 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@
diff --git a/config/minimalist/e.src b/config/minimalist/e.src
index 4331f6c..01c59f7 100644
--- a/config/minimalist/e.src
+++ b/config/minimalist/e.src
@@ -1,5 +1,5 @@
 group "E_Config" struct {
-  value "config_version" int: 65839;
+  value "config_version" int: 65842;
   value "show_splash" int: 1;
   value "init_default_theme" string: "default.edj";
   value "desktop_default_background" string: "Light_Gradient.edj";
@@ -1860,9 +1860,12 @@ group "E_Config" struct {
   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.0;
   value "desklock_autolock_idle" int: 0;
   value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000;
   value "desklock_use_custom_desklock" int: 0;
+  value "desklock_ask_presentation" uchar: 1;
+  value "desklock_ask_presentation_timeout" double: 30;
   value "display_res_restore" int: 0;
   value "display_res_width" int: 1;
   value "display_res_height" int: 1;
@@ -1873,6 +1876,8 @@ group "E_Config" struct {
   value "screensaver_interval" int: 5;
   value "screensaver_blanking" int: 2;
   value "screensaver_expose" int: 2;
+  value "screensaver_ask_presentation" uchar: 1;
+  value "screensaver_ask_presentation_timeout" double: 30;
   value "dpms_enable" int: 0;
   value "dpms_standby_enable" int: 0;
   value "dpms_suspend_enable" int: 0;
@@ -2049,4 +2054,6 @@ group "E_Config" struct {
       value "is_main" int: 0;
     }
   }
+  value "mode.presentation" uchar: 0;
+  value "mode.offline" uchar: 0;
 }
diff --git a/config/minimalist/profile.desktop b/config/minimalist/profile.desktop
index 9c49360..364bfdd 100644
--- a/config/minimalist/profile.desktop
+++ b/config/minimalist/profile.desktop
@@ -5,9 +5,11 @@ Name[it]=Minimalista
 Name[hu]=Minimalista
 Name[fr]=Minimaliste
 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[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é.
 Comment[el]=Ένα μινιμαλιστικό προφίλ<br>με πολύ λίγα στοιχεία στην<br>οθόνη. Θα αρέσει σε<br>αυτούς που θέλουν τα απολύτως<br>απαραίτητα.
+Comment[eo]=Minimuma agordo kun<br>malmulte da objektoj sur<br>la ekrano. Taŭgas<br>por ĉiuj kiuj ŝatas<br>senĝenajn labortablojn.
diff --git a/config/netbook/Makefile.in b/config/netbook/Makefile.in
index a125015..f2bcc31 100644
--- a/config/netbook/Makefile.in
+++ b/config/netbook/Makefile.in
@@ -230,6 +230,7 @@ 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@
@@ -242,6 +243,7 @@ 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@
diff --git a/config/netbook/e.src b/config/netbook/e.src
index e0a0dae..bbeeb38 100644
--- a/config/netbook/e.src
+++ b/config/netbook/e.src
@@ -1,5 +1,5 @@
 group "E_Config" struct {
-  value "config_version" int: 65839;
+  value "config_version" int: 65842;
   value "show_splash" int: 1;
   value "init_default_theme" string: "default.edj";
   value "desktop_default_background" string: "Dark_Gradient.edj";
@@ -1924,9 +1924,12 @@ group "E_Config" struct {
   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.0;
   value "desklock_autolock_idle" int: 0;
   value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000;
   value "desklock_use_custom_desklock" int: 0;
+  value "desklock_ask_presentation" uchar: 1;
+  value "desklock_ask_presentation_timeout" double: 30;
   value "display_res_restore" int: 0;
   value "display_res_width" int: 1;
   value "display_res_height" int: 1;
@@ -1937,6 +1940,8 @@ group "E_Config" struct {
   value "screensaver_interval" int: 5;
   value "screensaver_blanking" int: 2;
   value "screensaver_expose" int: 2;
+  value "screensaver_ask_presentation" uchar: 1;
+  value "screensaver_ask_presentation_timeout" double: 30;
   value "dpms_enable" int: 0;
   value "dpms_standby_enable" int: 0;
   value "dpms_suspend_enable" int: 0;
@@ -2113,4 +2118,6 @@ group "E_Config" struct {
       value "is_main" int: 0;
     }
   }
+  value "mode.presentation" uchar: 0;
+  value "mode.offline" uchar: 0;
 }
diff --git a/config/netbook/profile.desktop b/config/netbook/profile.desktop
index e428e7a..7cbf7bd 100644
--- a/config/netbook/profile.desktop
+++ b/config/netbook/profile.desktop
@@ -3,9 +3,11 @@ Type=Link
 Name=Netbook
 Name[fr]=Netbook
 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[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
diff --git a/config/scaleable/Makefile.in b/config/scaleable/Makefile.in
index 94ef43a..632d132 100644
--- a/config/scaleable/Makefile.in
+++ b/config/scaleable/Makefile.in
@@ -230,6 +230,7 @@ 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@
@@ -242,6 +243,7 @@ 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@
diff --git a/config/scaleable/e.src b/config/scaleable/e.src
index 0a6b008..459ff7c 100644
--- a/config/scaleable/e.src
+++ b/config/scaleable/e.src
@@ -1,5 +1,5 @@
 group "E_Config" struct {
-  value "config_version" int: 65839;
+  value "config_version" int: 65842;
   value "show_splash" int: 1;
   value "init_default_theme" string: "default.edj";
   value "desktop_default_name" string: "Desktop %i, %i";
@@ -1947,9 +1947,12 @@ group "E_Config" struct {
   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.0;
   value "desklock_autolock_idle" int: 0;
   value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000;
   value "desklock_use_custom_desklock" int: 0;
+  value "desklock_ask_presentation" uchar: 1;
+  value "desklock_ask_presentation_timeout" double: 30;
   value "display_res_restore" int: 0;
   value "display_res_width" int: 1;
   value "display_res_height" int: 1;
@@ -1960,6 +1963,8 @@ group "E_Config" struct {
   value "screensaver_interval" int: 5;
   value "screensaver_blanking" int: 2;
   value "screensaver_expose" int: 2;
+  value "screensaver_ask_presentation" uchar: 1;
+  value "screensaver_ask_presentation_timeout" double: 30;
   value "dpms_enable" int: 0;
   value "dpms_standby_enable" int: 0;
   value "dpms_suspend_enable" int: 0;
@@ -2136,4 +2141,6 @@ group "E_Config" struct {
       value "is_main" int: 0;
     }
   }
+  value "mode.presentation" uchar: 0;
+  value "mode.offline" uchar: 0;
 }
diff --git a/config/scaleable/profile.desktop b/config/scaleable/profile.desktop
index 9747884..3fdf63d 100644
--- a/config/scaleable/profile.desktop
+++ b/config/scaleable/profile.desktop
@@ -5,9 +5,11 @@ Name[it]=Scalabile
 Name[hu]=Kalibrálható
 Name[fr]=Proportionnel
 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[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.
 Comment[el]=Η κανονική ρύθμιση αλλά<br>με αυτόματη αλλαγή μεγέθους<br>για να αλλάζει κλίμακα ανάλογα<br>με την ανάλυση της οθόνης σας.
+Comment[eo]=La normala agordo, sed<br>kun aŭtomata skalado<br>ebligata por adapti al<br>la ekrandistingivo,<br>se difinita korekte.
diff --git a/config/standard/Makefile.in b/config/standard/Makefile.in
index d62f128..5489158 100644
--- a/config/standard/Makefile.in
+++ b/config/standard/Makefile.in
@@ -230,6 +230,7 @@ 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@
@@ -242,6 +243,7 @@ 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@
diff --git a/config/standard/e.src b/config/standard/e.src
index 2aca4fc..a2e6940 100644
--- a/config/standard/e.src
+++ b/config/standard/e.src
@@ -1,5 +1,5 @@
 group "E_Config" struct {
-  value "config_version" int: 65839;
+  value "config_version" int: 65842;
   value "show_splash" int: 1;
   value "init_default_theme" string: "default.edj";
   value "desktop_default_name" string: "Desktop %i, %i";
@@ -1957,9 +1957,12 @@ group "E_Config" struct {
   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.0;
   value "desklock_autolock_idle" int: 0;
   value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000;
   value "desklock_use_custom_desklock" int: 0;
+  value "desklock_ask_presentation" uchar: 1;
+  value "desklock_ask_presentation_timeout" double: 30;
   value "display_res_restore" int: 0;
   value "display_res_width" int: 1;
   value "display_res_height" int: 1;
@@ -1970,6 +1973,8 @@ group "E_Config" struct {
   value "screensaver_interval" int: 5;
   value "screensaver_blanking" int: 2;
   value "screensaver_expose" int: 2;
+  value "screensaver_ask_presentation" uchar: 1;
+  value "screensaver_ask_presentation_timeout" double: 30;
   value "dpms_enable" int: 0;
   value "dpms_standby_enable" int: 0;
   value "dpms_suspend_enable" int: 0;
@@ -2146,4 +2151,6 @@ group "E_Config" struct {
       value "is_main" int: 0;
     }
   }
+  value "mode.presentation" uchar: 0;
+  value "mode.offline" uchar: 0;
 }
diff --git a/config/standard/profile.desktop b/config/standard/profile.desktop
index 2c36e03..2cda6f1 100644
--- a/config/standard/profile.desktop
+++ b/config/standard/profile.desktop
@@ -4,9 +4,11 @@ Name=Standard
 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[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[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
diff --git a/configure b/configure
index 33bdebf..c349450 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for enlightenment 0.16.999.060.
+# Generated by GNU Autoconf 2.61 for enlightenment 0.16.999.061.
 #
 # Report bugs to <enlightenment-devel at lists.sourceforge.net>.
 #
@@ -723,8 +723,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='enlightenment'
 PACKAGE_TARNAME='enlightenment'
-PACKAGE_VERSION='0.16.999.060'
-PACKAGE_STRING='enlightenment 0.16.999.060'
+PACKAGE_VERSION='0.16.999.061'
+PACKAGE_STRING='enlightenment 0.16.999.061'
 PACKAGE_BUGREPORT='enlightenment-devel at lists.sourceforge.net'
 
 ac_unique_file="configure.ac"
@@ -1150,6 +1150,12 @@ 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
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
@@ -1698,7 +1704,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.060 to adapt to many kinds of systems.
+\`configure' configures enlightenment 0.16.999.061 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1772,7 +1778,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of enlightenment 0.16.999.060:";;
+     short | recursive ) echo "Configuration of enlightenment 0.16.999.061:";;
    esac
   cat <<\_ACEOF
 
@@ -1791,215 +1797,95 @@ Optional Features:
   --disable-nls           do not use Native Language Support
   --disable-rpath         do not hardcode runtime library paths
   --enable-files          enable Files menu item [yes]
-  --disable-ibar          disable optional module ibar. Default is
-                          enabled.
-
-  --disable-dropshadow    disable optional module dropshadow. Default is
-                          enabled.
-
-  --disable-clock         disable optional module clock. Default is
-                          enabled.
-
-  --disable-pager         disable optional module pager. Default is
-                          enabled.
-
-  --disable-battery       disable optional module battery. Default is
-                          enabled.
-
-  --disable-temperature   disable optional module temperature. Default is
-                          enabled.
-
-  --disable-cpufreq       disable optional module cpufreq. Default is
-                          enabled.
-
-  --disable-ibox          disable optional module ibox. Default is
-                          enabled.
-
-  --disable-start         disable optional module start. Default is
-                          enabled.
-
-  --disable-exebuf        disable optional module exebuf. Default is
-                          enabled.
-
-  --disable-winlist       disable optional module winlist. Default is
-                          enabled.
-
-  --disable-fileman       disable optional module fileman. Default is
-                          enabled.
-
+  --disable-ibar          optional module ibar [default=enabled]
+  --disable-dropshadow    optional module dropshadow [default=enabled]
+  --disable-clock         optional module clock [default=enabled]
+  --disable-pager         optional module pager [default=enabled]
+  --disable-battery       optional module battery [default=enabled]
+  --disable-temperature   optional module temperature [default=enabled]
+  --disable-cpufreq       optional module cpufreq [default=enabled]
+  --disable-ibox          optional module ibox [default=enabled]
+  --disable-start         optional module start [default=enabled]
+  --disable-exebuf        optional module exebuf [default=enabled]
+  --disable-winlist       optional module winlist [default=enabled]
+  --disable-fileman       optional module fileman [default=enabled]
   --disable-fileman-opinfo
-                          disable optional module fileman-opinfo. Default is
-                          enabled.
-
-  --disable-wizard        disable optional module wizard. Default is
-                          enabled.
-
-  --disable-conf          disable optional module conf. Default is
-                          enabled.
-
+                          optional module fileman-opinfo [default=enabled]
+  --disable-wizard        optional module wizard [default=enabled]
+  --disable-conf          optional module conf [default=enabled]
   --disable-conf-wallpaper
-                          disable optional module conf-wallpaper. Default is
-                          enabled.
-
+                          optional module conf-wallpaper [default=enabled]
   --disable-conf-wallpaper2
-                          disable optional module conf-wallpaper2. Default is
-                          enabled.
-
-  --disable-conf-theme    disable optional module conf-theme. Default is
-                          enabled.
-
-  --disable-conf-colors   disable optional module conf-colors. Default is
-                          enabled.
-
-  --disable-conf-fonts    disable optional module conf-fonts. Default is
-                          enabled.
-
+                          optional module conf-wallpaper2 [default=enabled]
+  --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
-                          disable optional module conf-borders. Default is
-                          enabled.
-
+                          optional module conf-borders [default=enabled]
   --disable-conf-icon-theme
-                          disable optional module conf-icon-theme. Default is
-                          enabled.
-
+                          optional module conf-icon-theme [default=enabled]
   --disable-conf-mouse-cursor
-                          disable optional module conf-mouse-cursor. Default is
-                          enabled.
-
+                          optional module conf-mouse-cursor [default=enabled]
   --disable-conf-transitions
-                          disable optional module conf-transitions. Default is
-                          enabled.
-
+                          optional module conf-transitions [default=enabled]
   --disable-conf-startup
-                          disable optional module conf-startup. Default is
-                          enabled.
-
-  --disable-conf-intl     disable optional module conf-intl. Default is
-                          enabled.
-
-  --disable-conf-imc      disable optional module conf-imc. Default is
-                          enabled.
-
+                          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
-                          disable optional module conf-profiles. Default is
-                          enabled.
-
-  --disable-msgbus-lang   disable optional module msgbus-lang. Default is
-                          enabled.
-
-  --disable-conf-engine   disable optional module conf-engine. Default is
-                          enabled.
-
+                          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
-                          disable optional module conf-applications. Default is
-                          enabled.
-
-  --disable-conf-desks    disable optional module conf-desks. Default is
-                          enabled.
-
-  --disable-conf-desk     disable optional module conf-desk. Default is
-                          enabled.
-
+                          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
-                          disable optional module conf-display. Default is
-                          enabled.
-
+                          optional module conf-display [default=enabled]
   --disable-conf-desklock
-                          disable optional module conf-desklock. Default is
-                          enabled.
-
+                          optional module conf-desklock [default=enabled]
   --disable-conf-screensaver
-                          disable optional module conf-screensaver. Default is
-                          enabled.
-
-  --disable-conf-dpms     disable optional module conf-dpms. Default is
-                          enabled.
-
+                          optional module conf-screensaver [default=enabled]
+  --disable-conf-dpms     optional module conf-dpms [default=enabled]
   --disable-conf-shelves
-                          disable optional module conf-shelves. Default is
-                          enabled.
-
+                          optional module conf-shelves [default=enabled]
   --disable-conf-keybindings
-                          disable optional module conf-keybindings. Default is
-                          enabled.
-
+                          optional module conf-keybindings [default=enabled]
   --disable-conf-mousebindings
-                          disable optional module conf-mousebindings. Default is
-                          enabled.
-
+                          optional module conf-mousebindings [default=enabled]
   --disable-conf-edgebindings
-                          disable optional module conf-edgebindings. Default is
-                          enabled.
-
-  --disable-conf-mouse    disable optional module conf-mouse. Default is
-                          enabled.
-
+                          optional module conf-edgebindings [default=enabled]
+  --disable-conf-mouse    optional module conf-mouse [default=enabled]
   --disable-conf-window-display
-                          disable optional module conf-window-display. Default is
-                          enabled.
-
+                          optional module conf-window-display [default=enabled]
   --disable-conf-window-focus
-                          disable optional module conf-window-focus. Default is
-                          enabled.
-
+                          optional module conf-window-focus [default=enabled]
   --disable-conf-window-remembers
-                          disable optional module conf-window-remembers. Default is
-                          enabled.
-
+                          optional module conf-window-remembers [default=enabled]
   --disable-conf-window-manipulation
-                          disable optional module conf-window-manipulation. Default is
-                          enabled.
-
-  --disable-conf-menus    disable optional module conf-menus. Default is
-                          enabled.
-
+                          optional module conf-window-manipulation [default=enabled]
+  --disable-conf-menus    optional module conf-menus [default=enabled]
   --disable-conf-clientlist
-                          disable optional module conf-clientlist. Default is
-                          enabled.
-
+                          optional module conf-clientlist [default=enabled]
   --disable-conf-dialogs
-                          disable optional module conf-dialogs. Default is
-                          enabled.
-
+                          optional module conf-dialogs [default=enabled]
   --disable-conf-performance
-                          disable optional module conf-performance. Default is
-                          enabled.
-
+                          optional module conf-performance [default=enabled]
   --disable-conf-winlist
-                          disable optional module conf-winlist. Default is
-                          enabled.
-
-  --disable-conf-exebuf   disable optional module conf-exebuf. Default is
-                          enabled.
-
-  --disable-conf-paths    disable optional module conf-paths. Default is
-                          enabled.
-
-  --disable-conf-mime     disable optional module conf-mime. Default is
-                          enabled.
-
+                          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]
   --disable-conf-interaction
-                          disable optional module conf-interaction. Default is
-                          enabled.
-
-  --disable-conf-scale    disable optional module conf-scale. Default is
-                          enabled.
-
-  --disable-gadman        disable optional module gadman. Default is
-                          enabled.
-
-  --disable-mixer         disable optional module mixer. Default is
-                          enabled.
-
-  --enable-connman        enable optional module connman. Default is
-                          disabled.
-
-  --disable-illume        disable optional module illume. Default is
-                          enabled.
-
-  --disable-syscon        disable optional module syscon. Default is
-                          enabled.
-
+                          optional module conf-interaction [default=enabled]
+  --disable-conf-scale    optional module conf-scale [default=enabled]
+  --disable-gadman        optional module gadman [default=enabled]
+  --disable-mixer         optional module mixer [default=enabled]
+  --enable-connman        optional module connman [default=disabled]
+  --disable-illume        optional module illume [default=enabled]
+  --disable-syscon        optional module syscon [default=enabled]
+  --disable-everything    optional module everything [default=enabled]
+  --disable-systray       optional module systray [default=enabled]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -2013,9 +1899,10 @@ Optional Packages:
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir
-  --with-profile=TARGET_PROFILE    specify a target format profile of:
-                                    LOWRES_PDA, MEDIUMRES_PDA, HIRES_PDA,
-				    SLOW_PC, MEDIUM_PC, FAST_PC
+  --with-profile=TARGET_PROFILE
+                          specify a target format profile of: LOWRES_PDA,
+                          MEDIUMRES_PDA, HIRES_PDA, SLOW_PC, MEDIUM_PC,
+                          FAST_PC
   --with-edje-cc=PATH              specify a specific path to edje_cc
   --with-eet-eet=PATH              specify a specific path to eet utility
 
@@ -2148,7 +2035,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-enlightenment configure 0.16.999.060
+enlightenment configure 0.16.999.061
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -2162,7 +2049,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by enlightenment $as_me 0.16.999.060, which was
+It was created by enlightenment $as_me 0.16.999.061, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -3989,7 +3876,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='enlightenment'
- VERSION='0.16.999.060'
+ VERSION='0.16.999.061'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6552,13 +6439,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6555: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6442: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6558: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6445: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6561: output\"" >&5)
+  (eval echo "\"\$as_me:6448: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7668,7 +7555,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7671 "configure"' > conftest.$ac_ext
+  echo '#line 7558 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9015,11 +8902,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:9018: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8905: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9022: \$? = $ac_status" >&5
+   echo "$as_me:8909: \$? = $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.
@@ -9339,11 +9226,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:9342: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9229: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9346: \$? = $ac_status" >&5
+   echo "$as_me:9233: \$? = $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.
@@ -9444,11 +9331,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:9447: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9334: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9451: \$? = $ac_status" >&5
+   echo "$as_me:9338: \$? = $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
@@ -9499,11 +9386,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:9502: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9389: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9506: \$? = $ac_status" >&5
+   echo "$as_me:9393: \$? = $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
@@ -12260,7 +12147,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12263 "configure"
+#line 12150 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12360,7 +12247,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12363 "configure"
+#line 12250 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12592,7 +12479,7 @@ CC="$lt_save_CC"
 
 
 
-release="ver-pre-01"
+release="ver-svn-02"
 
 
 
@@ -18673,17 +18560,11 @@ profile="SLOW_PC"
 
 # Check whether --with-profile was given.
 if test "${with_profile+set}" = set; then
-  withval=$with_profile;
-  v=$withval;
-  profile=$v
-  echo "  Enlightenment build profile set to "$profile;
-
-else
-
-  profile="SLOW_PC"
-
+  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;}
 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
 
@@ -24551,7 +24432,169 @@ 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/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"
+# ----------------------------------------------------------------------
+# BEGIN: Check for optional module: everything (default: true)
+#
+
+
+        USING_MODULES=1
+
+        EVERYTHING=true
+        # Check whether --enable-everything was given.
+if test "${enable_everything+set}" = set; then
+  enableval=$enable_everything; EVERYTHING=${enableval:-false}
+fi
+
+        if test x$EVERYTHING = xyes || test x$EVERYTHING = x1; then
+                EVERYTHING=true
+        fi
+        if test x$EVERYTHING = xno || test x$EVERYTHING = x0; then
+                EVERYTHING=false
+        fi
+
+        USE_MODULE_EVERYTHING=$EVERYTHING
+
+
+        # 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 everything
+        if test x$EVERYTHING = xtrue; then
+
+
+                if test x$EVERYTHING = xfalse; then
+                        echo -e "${COLOR_YELLOW}Warning:${COLOR_END} optional module ${COLOR_H}everything${COLOR_END} disabled by extra checks."
+                fi
+        fi
+
+        # Check if user checks succeeded
+        if test x$EVERYTHING = xtrue; then
+                OPTIONAL_MODULES="$OPTIONAL_MODULES everything"
+
+cat >>confdefs.h <<_ACEOF
+#define USE_MODULE_EVERYTHING 1
+_ACEOF
+
+        else
+                UNUSED_OPTIONAL_MODULES="$UNUSED_OPTIONAL_MODULES everything"
+        fi
+
+         if test x$EVERYTHING = xtrue; then
+  USE_MODULE_EVERYTHING_TRUE=
+  USE_MODULE_EVERYTHING_FALSE='#'
+else
+  USE_MODULE_EVERYTHING_TRUE='#'
+  USE_MODULE_EVERYTHING_FALSE=
+fi
+
+
+
+
+#
+# END: Check for optional module: everything (true)
+# ----------------------------------------------------------------------
+
+
+# ----------------------------------------------------------------------
+# BEGIN: Check for optional module: systray (default: true)
+#
+
+
+        USING_MODULES=1
+
+        SYSTRAY=true
+        # Check whether --enable-systray was given.
+if test "${enable_systray+set}" = set; then
+  enableval=$enable_systray; SYSTRAY=${enableval:-false}
+fi
+
+        if test x$SYSTRAY = xyes || test x$SYSTRAY = x1; then
+                SYSTRAY=true
+        fi
+        if test x$SYSTRAY = xno || test x$SYSTRAY = x0; then
+                SYSTRAY=false
+        fi
+
+        USE_MODULE_SYSTRAY=$SYSTRAY
+
+
+        # 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 systray
+        if test x$SYSTRAY = xtrue; then
+
+
+                if test x$SYSTRAY = xfalse; then
+                        echo -e "${COLOR_YELLOW}Warning:${COLOR_END} optional module ${COLOR_H}systray${COLOR_END} disabled by extra checks."
+                fi
+        fi
+
+        # Check if user checks succeeded
+        if test x$SYSTRAY = xtrue; then
+                OPTIONAL_MODULES="$OPTIONAL_MODULES systray"
+
+cat >>confdefs.h <<_ACEOF
+#define USE_MODULE_SYSTRAY 1
+_ACEOF
+
+        else
+                UNUSED_OPTIONAL_MODULES="$UNUSED_OPTIONAL_MODULES systray"
+        fi
+
+         if test x$SYSTRAY = xtrue; then
+  USE_MODULE_SYSTRAY_TRUE=
+  USE_MODULE_SYSTRAY_FALSE='#'
+else
+  USE_MODULE_SYSTRAY_TRUE='#'
+  USE_MODULE_SYSTRAY_FALSE=
+fi
+
+
+
+
+#
+# END: Check for optional module: systray (true)
+# ----------------------------------------------------------------------
+
+
+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"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -25167,6 +25210,20 @@ 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.
+Usually this means the macro was only invoked conditionally." >&5
+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.
+Usually this means the macro was only invoked conditionally." >&5
+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_clean_files_save=$ac_clean_files
@@ -25467,7 +25524,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by enlightenment $as_me 0.16.999.060, which was
+This file was extended by enlightenment $as_me 0.16.999.061, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25520,7 +25577,7 @@ Report bugs to <bug-autoconf at gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-enlightenment config.status 0.16.999.060
+enlightenment config.status 0.16.999.061
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -26028,6 +26085,10 @@ do
     "src/modules/illume/dicts/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/illume/dicts/Makefile" ;;
     "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/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/everything/module.desktop" ;;
+    "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" ;;
     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
     "data/images/Makefile") CONFIG_FILES="$CONFIG_FILES data/images/Makefile" ;;
@@ -26620,8 +26681,8 @@ 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
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$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
@@ -26660,6 +26721,55 @@ CEOF$ac_eof
 _ACEOF
 
 
+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
+_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;}
+   { (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
@@ -26909,7 +27019,7 @@ 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 's/|#_!!_#|//g' >$tmp/out
+" $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
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
diff --git a/configure.ac b/configure.ac
index 37384c3..22c1d3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 # get rid of that stupid cache mechanism
 rm -f config.cache
 
-AC_INIT(enlightenment, 0.16.999.060, enlightenment-devel at lists.sourceforge.net)
-AC_PREREQ(2.52)
-AC_CONFIG_SRCDIR(configure.ac)
+AC_INIT([enlightenment], [0.16.999.061], [enlightenment-devel at lists.sourceforge.net])
+AC_PREREQ([2.52])
+AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
@@ -26,7 +26,7 @@ define([AC_LIBTOOL_LANG_F77_CONFIG], [:])
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
-release="ver-pre-01"
+release="ver-svn-02"
 AC_SUBST(release)
 
 AC_CHECK_FUNCS(setenv)
@@ -271,16 +271,10 @@ AC_SUBST(requirements_e)
 
 profile="SLOW_PC"
 AC_ARG_WITH(profile,
-[  --with-profile=TARGET_PROFILE    specify a target format profile of:
-                                    LOWRES_PDA, MEDIUMRES_PDA, HIRES_PDA, 
-				    SLOW_PC, MEDIUM_PC, FAST_PC ],
-[
-  v=$withval;
-  profile=$v
-  echo "  Enlightenment build profile set to "$profile;
-],[
-  profile="SLOW_PC"
-])
+  AS_HELP_STRING([--with-profile=TARGET_PROFILE], [specify a target format profile of:
+                                    LOWRES_PDA, MEDIUMRES_PDA, HIRES_PDA, SLOW_PC, MEDIUM_PC, FAST_PC]),
+  [profile=$withval])
+AC_MSG_NOTICE([Enlightenment build profile set to $profile])
 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
 AC_SUBST(EDJE_DEF)
@@ -429,6 +423,8 @@ AC_E_OPTIONAL_MODULE([mixer], true, [CHECK_MODULE_MIXER])
 AC_E_OPTIONAL_MODULE([connman], false)
 AC_E_OPTIONAL_MODULE([illume], true)
 AC_E_OPTIONAL_MODULE([syscon], true)
+AC_E_OPTIONAL_MODULE([everything], true)
+AC_E_OPTIONAL_MODULE([systray], true)
 
 AC_OUTPUT([
 Makefile
@@ -561,6 +557,10 @@ 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
diff --git a/data/Makefile.in b/data/Makefile.in
index c3fc328..71a45c8 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -232,6 +232,7 @@ 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@
@@ -244,6 +245,7 @@ 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@
diff --git a/data/backgrounds/Makefile.in b/data/backgrounds/Makefile.in
index c0da2e9..f21ec13 100644
--- a/data/backgrounds/Makefile.in
+++ b/data/backgrounds/Makefile.in
@@ -230,6 +230,7 @@ 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@
@@ -242,6 +243,7 @@ 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@
diff --git a/data/etc/Makefile.in b/data/etc/Makefile.in
index be934b0..3f10cb5 100644
--- a/data/etc/Makefile.in
+++ b/data/etc/Makefile.in
@@ -230,6 +230,7 @@ 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@
@@ -242,6 +243,7 @@ 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@
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 42a307b..dcceaa5 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -230,6 +230,7 @@ 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@
@@ -242,6 +243,7 @@ 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@
diff --git a/data/images/Makefile.in b/data/images/Makefile.in
index 7f6b7d3..d22d314 100644
--- a/data/images/Makefile.in
+++ b/data/images/Makefile.in
@@ -230,6 +230,7 @@ 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@
@@ -242,6 +243,7 @@ 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@
diff --git a/data/input_methods/Makefile.in b/data/input_methods/Makefile.in
index cecde6a..7066a0c 100644
--- a/data/input_methods/Makefile.in
+++ b/data/input_methods/Makefile.in
@@ -230,6 +230,7 @@ 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@
@@ -242,6 +243,7 @@ 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@
diff --git a/data/other/Makefile.in b/data/other/Makefile.in
index 9bf94c9..989f8b2 100644
--- a/data/other/Makefile.in
+++ b/data/other/Makefile.in
@@ -230,6 +230,7 @@ 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@
@@ -242,6 +243,7 @@ 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@
diff --git a/data/themes/Makefile.in b/data/themes/Makefile.in
index efa40a4..4c3a089 100644
--- a/data/themes/Makefile.in
+++ b/data/themes/Makefile.in
@@ -242,6 +242,7 @@ 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@
@@ -254,6 +255,7 @@ 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@
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 6253df6..45592b8 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -2,9 +2,9 @@
 // Add group{} locations to all sections. eg. "widget/preview" is found in Wallpaper selector"
 //	Icons:
 //		EFM - All popup icons ... eg, paste copy delete properties
-//		EFM - folders (perhaps?), dynamic mime icons
-//		Add Warning Icon to delete confirm dialog in EFM
-//		Icons for Menus modules (Why do I keep finding myself more work?)
+//		Icons for Menus modules
+//		Icon for Edge Bindings
+//		Icon for Modes?
 //
 
 /*
@@ -127,6 +127,50 @@ collections { /* begin the collection of edje groups that are in this file */
       }
    }
 
+   group { name: "e/desktop/background/scrollframe";
+      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  0.0;
+                  offset:   -1   -1;
+               }
+            }
+         }
+      }
+   }
+
+   group { name: "e/desktop/background/scrollframe";
+      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  0.0;
+                  offset:   -1   -1;
+               }
+            }
+         }
+      }
+   }
+
 /////////////////////////////////////////////////////////////////////////////
    /*** DEFAULT WINDOW BORDER ***/
    group { name: "e/widgets/border/default/border";
@@ -7500,6 +7544,15 @@ collections { /* begin the collection of edje groups that are in this file */
 	       color: 255 255 255 255;
 	    }
 	 }
+	 part { name: "e.eventarea";
+	    type: RECT;
+	    mouse_events: 1;
+	    repeat_events: 1;
+	    description { state: "default" 0.0;
+	       visible: 1;
+	       color: 255 255 255 0;
+	    }
+	 }
       }
       programs {
 	 program { name: "on";
@@ -7555,14 +7608,14 @@ collections { /* begin the collection of edje groups that are in this file */
 
 	 program { name: "name_show";
 	    signal: "mouse,in";
-	    source: "mouse_over";
+	    source: "e.eventarea";
 	    action: STATE_SET "active" 0.0;
 	    transition: SINUSOIDAL 0.1;
             target: "e.text.label";
 	 }
 	 program { name: "name_hide";
 	    signal: "mouse,out";
-	    source: "mouse_over";
+	    source: "e.eventarea";
 	    action: STATE_SET "default" 0.0;
 	    transition: SINUSOIDAL 0.2;
             target: "e.text.label";
@@ -9974,6 +10027,506 @@ collections { /* begin the collection of edje groups that are in this file */
    }
 
 /////////////////////////////////////////////////////////////////////////////
+   /*** MOD: SYSTRAY ***/
+   group { name: "e/modules/systray/main";
+      alias: "e/modules/systray/main/default";
+      alias: "e/modules/systray/main/invisible";
+      data {
+         item: "inset" "255 255 255";
+         item: "plain" "230 230 230";
+         item: "default" "255 255 255";
+      }
+      parts {
+         part { name: "base";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 0 0 128;
+            }
+         }
+         part { name: "e.size";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+            }
+         }
+         part { name: "e.box";
+            type: BOX;
+            description { state: "default" 0.0;
+               rel1.to: "e.size";
+               rel2.to: "e.size";
+               box {
+                  layout: "horizontal";
+                  padding: 2 0;
+                  align: 0.5 0.5;
+                  min: 1 1;
+               }
+            }
+            description { state: "vertical" 0.0;
+               rel1.to: "e.size";
+               rel2.to: "e.size";
+               box {
+                  layout: "vertical";
+                  padding: 0 2;
+                  align: 0.5 0.5;
+                  min: 1 1;
+               }
+            }
+         }
+         programs {
+            program { name: "e,action,disable";
+               signal: "e,action,disable";
+               source: "e";
+               action: STATE_SET "disabled" 0.0;
+               target: "base";
+            }
+            program { name: "e,action,enable";
+               signal: "e,action,enable";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "base";
+            }
+            program { name: "e,action,orient,float";
+               signal: "e,action,orient,float";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,horiz";
+               signal: "e,action,orient,horiz";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,vert";
+               signal: "e,action,orient,vert";
+               source: "e";
+               action: STATE_SET "vertical" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,left";
+               signal: "e,action,orient,left";
+               source: "e";
+               action: STATE_SET "vertical" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,right";
+               signal: "e,action,orient,right";
+               source: "e";
+               action: STATE_SET "vertical" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,top";
+               signal: "e,action,orient,top";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,bottom";
+               signal: "e,action,orient,bottom";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_tl";
+               signal: "e,action,orient,corner_tl";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_tr";
+               signal: "e,action,orient,corner_tr";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_bl";
+               signal: "e,action,orient,corner_bl";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_br";
+               signal: "e,action,orient,corner_br";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_lt";
+               signal: "e,action,orient,corner_lt";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_rt";
+               signal: "e,action,orient,corner_rt";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_lb";
+               signal: "e,action,orient,corner_lb";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_rb";
+               signal: "e,action,orient,corner_rb";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+         }
+      }
+   }
+
+   group { name: "e/modules/systray/main/alternate";
+      data {
+         item: "inset" "255 255 255";
+         item: "plain" "255 255 255";
+         item: "default" "255 255 255";
+      }
+      images.image: "systray_rounded_corners.png" COMP;
+      parts {
+         part { name: "base";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+         }
+         part { name: "rounded_corners";
+            type: IMAGE;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1 {
+                  relative: 0.0 0.0;
+                  offset: -3 -3;
+                  to: "e.size";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  offset: 2 2;
+                  to: "e.size";
+               }
+               image {
+                  normal: "systray_rounded_corners.png";
+                  border: 3 3 3 3;
+                  middle: SOLID;
+               }
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 0 0 128;
+            }
+         }
+         part { name: "e.size";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+            }
+         }
+         part { name: "e.box";
+            type: BOX;
+            description {
+               state: "default" 0.0;
+               rel1.to: "e.size";
+               rel2.to: "e.size";
+               box {
+                  layout: "horizontal";
+                  padding: 2 0;
+                  align: 0.5 0.5;
+                  min: 1 1;
+               }
+            }
+            description { state: "vertical" 0.0;
+               rel1.to: "e.size";
+               rel2.to: "e.size";
+               box {
+                  layout: "vertical";
+                  padding: 0 2;
+                  align: 0.5 0.5;
+                  min: 1 1;
+               }
+            }
+         }
+         programs {
+            program { name: "e,action,disable";
+               signal: "e,action,disable";
+               source: "e";
+               action: STATE_SET "disabled" 0.0;
+               target: "rounded_corners";
+            }
+            program { name: "e,action,enable";
+               signal: "e,action,enable";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "rounded_corners";
+            }
+            program { name: "e,action,orient,float";
+               signal: "e,action,orient,float";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,horiz";
+               signal: "e,action,orient,horiz";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,vert";
+               signal: "e,action,orient,vert";
+               source: "e";
+               action: STATE_SET "vertical" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,left";
+               signal: "e,action,orient,left";
+               source: "e";
+               action: STATE_SET "vertical" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,right";
+               signal: "e,action,orient,right";
+               source: "e";
+               action: STATE_SET "vertical" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,top";
+               signal: "e,action,orient,top";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,bottom";
+               signal: "e,action,orient,bottom";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_tl";
+               signal: "e,action,orient,corner_tl";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_tr";
+               signal: "e,action,orient,corner_tr";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_bl";
+               signal: "e,action,orient,corner_bl";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_br";
+               signal: "e,action,orient,corner_br";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_lt";
+               signal: "e,action,orient,corner_lt";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_rt";
+               signal: "e,action,orient,corner_rt";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_lb";
+               signal: "e,action,orient,corner_lb";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_rb";
+               signal: "e,action,orient,corner_rb";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+         }
+      }
+   }
+
+   group { name: "e/modules/systray/main/alternate/inset";
+      data {
+         item: "inset" "255 255 255";
+         item: "plain" "255 255 255";
+         item: "default" "255 255 255";
+      }
+      parts {
+         part { name: "base";
+            type: RECT;
+            description {
+               state: "default" 0.0;
+               color: 255 255 255 255;
+            }
+            description {
+               state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 255 0 0 128;
+            }
+         }
+         part { name: "e.size";
+            type: RECT;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               color: 0 0 0 0;
+               rel1.offset: 4 4;
+               rel2.offset: -5 -5;
+            }
+         }
+         part { name: "e.box";
+            type: BOX;
+            description {
+               state: "default" 0.0;
+               rel1.to: "e.size";
+               rel2.to: "e.size";
+               box {
+                  layout: "horizontal";
+                  padding: 2 0;
+                  align: 0.5 0.5;
+                  min: 1 1;
+               }
+            }
+            description { state: "vertical" 0.0;
+               rel1.to: "e.size";
+               rel2.to: "e.size";
+               box {
+                  layout: "vertical";
+                  padding: 0 2;
+                  align: 0.5 0.5;
+                  min: 1 1;
+               }
+            }
+         }
+         programs {
+            program { name: "e,action,disable";
+               signal: "e,action,disable";
+               source: "e";
+               action: STATE_SET "disabled" 0.0;
+               target: "base";
+            }
+            program { name: "e,action,enable";
+               signal: "e,action,enable";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "base";
+            }
+            program { name: "e,action,orient,float";
+               signal: "e,action,orient,float";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,horiz";
+               signal: "e,action,orient,horiz";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,vert";
+               signal: "e,action,orient,vert";
+               source: "e";
+               action: STATE_SET "vertical" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,left";
+               signal: "e,action,orient,left";
+               source: "e";
+               action: STATE_SET "vertical" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,right";
+               signal: "e,action,orient,right";
+               source: "e";
+               action: STATE_SET "vertical" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,top";
+               signal: "e,action,orient,top";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,bottom";
+               signal: "e,action,orient,bottom";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_tl";
+               signal: "e,action,orient,corner_tl";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_tr";
+               signal: "e,action,orient,corner_tr";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_bl";
+               signal: "e,action,orient,corner_bl";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_br";
+               signal: "e,action,orient,corner_br";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_lt";
+               signal: "e,action,orient,corner_lt";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_rt";
+               signal: "e,action,orient,corner_rt";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_lb";
+               signal: "e,action,orient,corner_lb";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+            program { name: "e,action,orient,corner_rb";
+               signal: "e,action,orient,corner_rb";
+               source: "e";
+               action: STATE_SET "default" 0.0;
+               target: "e.box";
+            }
+         }
+      }
+   }
+
+/////////////////////////////////////////////////////////////////////////////
    /*** MOD: WINLIST ***/
 
    group { name: "e/widgets/winlist/main";
@@ -10742,7 +11295,7 @@ collections { /* begin the collection of edje groups that are in this file */
 	 part { name: "e.swallow.main";
 	    type: SWALLOW;
 	    description { state: "default" 0.0;
-               fixed: 1 1;
+//               fixed: 1 1;
                align: 0.5 0.0;
 	       rel1.offset: 12 12;
                rel2.relative: 1.0 0.0;
@@ -10764,7 +11317,7 @@ collections { /* begin the collection of edje groups that are in this file */
 	 part { name: "e.swallow.extra";
 	    type: SWALLOW;
 	    description { state: "default" 0.0;
-               fixed: 1 1;
+//               fixed: 1 1;
                align: 0.5 1.0;
                rel1.relative: 0.0 1.0;
 	       rel1.offset: 12 -13;
@@ -13116,6 +13669,9 @@ collections { /* begin the collection of edje groups that are in this file */
 	 image: "icon_efm_dnd_copy.png" COMP;
 	 image: "icon_efm_dnd_ask.png" COMP;
 	 image: "icon_efm_dnd_move.png" COMP;
+
+	 image: "icon_efm_vol_unmounted.png" COMP;
+	 image: "icon_efm_vol_mounted.png" COMP;
       }
       parts {
 	 part { name: "label2";
@@ -13399,6 +13955,36 @@ collections { /* begin the collection of edje groups that are in this file */
 	       color: 0 0 0 0;
 	    }
 	 }
+	 part { name: "vol_state";
+	    type: IMAGE;
+	    mouse_events: 0;
+	    repeat_events: 0;
+	    description { state: "default" 0.0;
+	       color:      0 0 0 0;
+	    }
+	    description { state: "visible" 0.0;
+	       aspect: 1.0 1.0;
+	       aspect_preference: BOTH;
+	       align: 1.0 1.0;
+	       min: 16 16;
+	       rel1 {
+	          relative: 0.75 0.0;
+	          to: "icon";
+	       }
+	       rel2 {
+	          relative: 1.0 1.0;
+	          to: "icon";
+	       }
+	    }
+	    description { state: "unmounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_unmounted.png";
+	    }
+	    description { state: "mounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_mounted.png";
+	    }
+	 }
 	 part { name: "dnd_action";
 	    type: IMAGE;
 	    mouse_events:  0;
@@ -13427,6 +14013,13 @@ collections { /* begin the collection of edje groups that are in this file */
 	       image.normal:  "icon_efm_dnd_move.png";
 	    }
 	 }
+	 part { name: "e.swallow.entry";
+	    type: SWALLOW;
+	    description { state: "default" 0.0;
+	       rel1.to: "e.text.label";
+	       rel2.to: "e.text.label";
+	    }
+	 }
       }
       programs {
 	 program { name: "go_active";
@@ -13469,6 +14062,24 @@ collections { /* begin the collection of edje groups that are in this file */
 	    action: STATE_SET "copy" 0.0;
 	    target: "dnd_action";
 	 }
+	 program { name: "vol_off";
+	    signal: "e,state,volume,off";
+	    source: "e";
+	    action: STATE_SET "default" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_unmounted";
+	    signal: "e,state,volume,unmounted";
+	    source: "e";
+	    action: STATE_SET "unmounted" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_mounted";
+	    signal: "e,state,volume,mounted";
+	    source: "e";
+	    action: STATE_SET "mounted" 0.0;
+	    target: "vol_state";
+	 }
 	 program { name: "thumb_gen";
 	    signal:  "e,action,thumb,gen";
 	    source:  "e";
@@ -13529,6 +14140,9 @@ collections { /* begin the collection of edje groups that are in this file */
 	 image: "icon_efm_dnd_copy.png" COMP;
 	 image: "icon_efm_dnd_ask.png" COMP;
 	 image: "icon_efm_dnd_move.png" COMP;
+
+	 image: "icon_efm_vol_unmounted.png" COMP;
+	 image: "icon_efm_vol_mounted.png" COMP;
       }
       parts {
 	 part { name: "label2";
@@ -13812,6 +14426,36 @@ collections { /* begin the collection of edje groups that are in this file */
 	       color: 0 0 0 0;
 	    }
 	 }
+	 part { name: "vol_state";
+	    type: IMAGE;
+	    mouse_events: 0;
+	    repeat_events: 0;
+	    description { state: "default" 0.0;
+	       color:      0 0 0 0;
+	    }
+	    description { state: "visible" 0.0;
+	       aspect: 1.0 1.0;
+	       aspect_preference: BOTH;
+	       align: 1.0 1.0;
+	       min: 16 16;
+	       rel1 {
+	          relative: 0.75 0.0;
+	          to: "icon";
+	       }
+	       rel2 {
+	          relative: 1.0 1.0;
+	          to: "icon";
+	       }
+	    }
+	    description { state: "unmounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_unmounted.png";
+	    }
+	    description { state: "mounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_mounted.png";
+	    }
+	 }
 	 part { name: "dnd_action";
 	    type: IMAGE;
 	    mouse_events:  0;
@@ -13840,6 +14484,13 @@ collections { /* begin the collection of edje groups that are in this file */
 	       image.normal:  "icon_efm_dnd_move.png";
 	    }
 	 }
+	 part { name: "e.swallow.entry";
+	    type: SWALLOW;
+	    description { state: "default" 0.0;
+	       rel1.to: "e.text.label";
+	       rel2.to: "e.text.label";
+	    }
+	 }
       }
       programs {
 	 program { name: "go_active";
@@ -13882,6 +14533,24 @@ collections { /* begin the collection of edje groups that are in this file */
 	    action: STATE_SET "copy" 0.0;
 	    target: "dnd_action";
 	 }
+	 program { name: "vol_off";
+	    signal: "e,state,volume,off";
+	    source: "e";
+	    action: STATE_SET "default" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_unmounted";
+	    signal: "e,state,volume,unmounted";
+	    source: "e";
+	    action: STATE_SET "unmounted" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_mounted";
+	    signal: "e,state,volume,mounted";
+	    source: "e";
+	    action: STATE_SET "mounted" 0.0;
+	    target: "vol_state";
+	 }
 	 program { name: "thumb_gen";
 	    signal:  "e,action,thumb,gen";
 	    source:  "e";
@@ -13942,6 +14611,9 @@ collections { /* begin the collection of edje groups that are in this file */
 	 image: "icon_efm_dnd_copy.png" COMP;
 	 image: "icon_efm_dnd_ask.png" COMP;
 	 image: "icon_efm_dnd_move.png" COMP;
+
+	 image: "icon_efm_vol_unmounted.png" COMP;
+	 image: "icon_efm_vol_mounted.png" COMP;
       }
       parts {
 	 part { name: "bg";
@@ -14201,6 +14873,36 @@ collections { /* begin the collection of edje groups that are in this file */
 	       color: 0 0 0 0;
 	    }
 	 }
+	 part { name: "vol_state";
+	    type: IMAGE;
+	    mouse_events: 0;
+	    repeat_events: 0;
+	    description { state: "default" 0.0;
+	       color:      0 0 0 0;
+	    }
+	    description { state: "visible" 0.0;
+	       aspect: 1.0 1.0;
+	       aspect_preference: BOTH;
+	       align: 1.0 1.0;
+	       min: 16 16;
+	       rel1 {
+	          relative: 0.75 0.0;
+	          to: "icon";
+	       }
+	       rel2 {
+	          relative: 1.0 1.0;
+	          to: "icon";
+	       }
+	    }
+	    description { state: "unmounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_unmounted.png";
+	    }
+	    description { state: "mounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_mounted.png";
+	    }
+	 }
 	 part { name: "dnd_action";
 	    type: IMAGE;
 	    mouse_events:  0;
@@ -14269,6 +14971,24 @@ collections { /* begin the collection of edje groups that are in this file */
 	    action: STATE_SET "copy" 0.0;
 	    target: "dnd_action";
 	 }
+	 program { name: "vol_off";
+	    signal: "e,state,volume,off";
+	    source: "e";
+	    action: STATE_SET "default" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_unmounted";
+	    signal: "e,state,volume,unmounted";
+	    source: "e";
+	    action: STATE_SET "unmounted" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_mounted";
+	    signal: "e,state,volume,mounted";
+	    source: "e";
+	    action: STATE_SET "mounted" 0.0;
+	    target: "vol_state";
+	 }
 	 program { name: "thumb_gen";
 	    signal:  "e,action,thumb,gen";
 	    source:  "e";
@@ -14329,6 +15049,9 @@ collections { /* begin the collection of edje groups that are in this file */
 	 image: "icon_efm_dnd_copy.png" COMP;
 	 image: "icon_efm_dnd_ask.png" COMP;
 	 image: "icon_efm_dnd_move.png" COMP;
+
+	 image: "icon_efm_vol_unmounted.png" COMP;
+	 image: "icon_efm_vol_mounted.png" COMP;
       }
       parts {
 	 part { name: "bg";
@@ -14588,6 +15311,36 @@ collections { /* begin the collection of edje groups that are in this file */
 	       color: 0 0 0 0;
 	    }
 	 }
+	 part { name: "vol_state";
+	    type: IMAGE;
+	    mouse_events: 0;
+	    repeat_events: 0;
+	    description { state: "default" 0.0;
+	       color:      0 0 0 0;
+	    }
+	    description { state: "visible" 0.0;
+	       aspect: 1.0 1.0;
+	       aspect_preference: BOTH;
+	       align: 1.0 1.0;
+	       min: 16 16;
+	       rel1 {
+	          relative: 0.75 0.0;
+	          to: "icon";
+	       }
+	       rel2 {
+	          relative: 1.0 1.0;
+	          to: "icon";
+	       }
+	    }
+	    description { state: "unmounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_unmounted.png";
+	    }
+	    description { state: "mounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_mounted.png";
+	    }
+	 }
 	 part { name: "dnd_action";
 	    type: IMAGE;
 	    mouse_events:  0;
@@ -14656,6 +15409,24 @@ collections { /* begin the collection of edje groups that are in this file */
 	    action: STATE_SET "copy" 0.0;
 	    target: "dnd_action";
 	 }
+	 program { name: "vol_off";
+	    signal: "e,state,volume,off";
+	    source: "e";
+	    action: STATE_SET "default" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_unmounted";
+	    signal: "e,state,volume,unmounted";
+	    source: "e";
+	    action: STATE_SET "unmounted" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_mounted";
+	    signal: "e,state,volume,mounted";
+	    source: "e";
+	    action: STATE_SET "mounted" 0.0;
+	    target: "vol_state";
+	 }
 	 program { name: "thumb_gen";
 	    signal:  "e,action,thumb,gen";
 	    source:  "e";
@@ -14720,6 +15491,9 @@ collections { /* begin the collection of edje groups that are in this file */
 	 image: "icon_efm_dnd_copy.png" COMP;
 	 image: "icon_efm_dnd_ask.png" COMP;
 	 image: "icon_efm_dnd_move.png" COMP;
+
+	 image: "icon_efm_vol_unmounted.png" COMP;
+	 image: "icon_efm_vol_mounted.png" COMP;
       }
       parts {
 	 part {
@@ -15032,6 +15806,35 @@ collections { /* begin the collection of edje groups that are in this file */
 	       color: 255 255 255 255;
 	    }
 	 }
+	 part { name: "vol_state";
+	    type: IMAGE;
+	    mouse_events: 0;
+	    repeat_events: 0;
+	    description { state: "default" 0.0;
+	       color:      0 0 0 0;
+	    }
+	    description { state: "visible" 0.0;
+	       aspect: 1.0 1.0;
+	       aspect_preference: BOTH;
+	       align: 1.0 1.0;
+	       rel1 {
+	          relative: 0.5 0.0;
+	          to: "icon";
+	       }
+	       rel2 {
+	          relative: 1.0 1.0;
+	          to: "icon";
+	       }
+	    }
+	    description { state: "unmounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_unmounted.png";
+	    }
+	    description { state: "mounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_mounted.png";
+	    }
+	 }
 	 part { name: "dnd_action";
 	    type:          IMAGE;
 	    mouse_events:  0;
@@ -15082,6 +15885,13 @@ collections { /* begin the collection of edje groups that are in this file */
 	       color: 0 0 0 0;
 	    }
 	 }
+	 part { name: "e.swallow.entry";
+	    type: SWALLOW;
+	    description { state: "default" 0.0;
+	       rel1.to: "e.text.label";
+	       rel2.to: "e.text.label";
+	    }
+	 }
       }
       programs {
 	 program { name: "go_active";
@@ -15121,6 +15931,24 @@ collections { /* begin the collection of edje groups that are in this file */
 	    action: STATE_SET "copy" 0.0;
 	    target: "dnd_action";
 	 }
+	 program { name: "vol_off";
+	    signal: "e,state,volume,off";
+	    source: "e";
+	    action: STATE_SET "default" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_unmounted";
+	    signal: "e,state,volume,unmounted";
+	    source: "e";
+	    action: STATE_SET "unmounted" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_mounted";
+	    signal: "e,state,volume,mounted";
+	    source: "e";
+	    action: STATE_SET "mounted" 0.0;
+	    target: "vol_state";
+	 }
 	 program { name: "thumb_gen";
 	    signal:  "e,action,thumb,gen";
 	    source:  "e";
@@ -15185,6 +16013,9 @@ collections { /* begin the collection of edje groups that are in this file */
 	 image: "icon_efm_dnd_copy.png" COMP;
 	 image: "icon_efm_dnd_ask.png" COMP;
 	 image: "icon_efm_dnd_move.png" COMP;
+
+	 image: "icon_efm_vol_unmounted.png" COMP;
+	 image: "icon_efm_vol_mounted.png" COMP;
       }
       parts {
 	 part {
@@ -15497,6 +16328,35 @@ collections { /* begin the collection of edje groups that are in this file */
 	       color: 255 255 255 255;
 	    }
 	 }
+	 part { name: "vol_state";
+	    type: IMAGE;
+	    mouse_events: 0;
+	    repeat_events: 0;
+	    description { state: "default" 0.0;
+	       color:      0 0 0 0;
+	    }
+	    description { state: "visible" 0.0;
+	       aspect: 1.0 1.0;
+	       aspect_preference: BOTH;
+	       align: 1.0 1.0;
+	       rel1 {
+	          relative: 0.5 0.0;
+	          to: "icon";
+	       }
+	       rel2 {
+	          relative: 1.0 1.0;
+	          to: "icon";
+	       }
+	    }
+	    description { state: "unmounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_unmounted.png";
+	    }
+	    description { state: "mounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_mounted.png";
+	    }
+	 }
 	 part { name: "dnd_action";
 	    type:          IMAGE;
 	    mouse_events:  0;
@@ -15547,6 +16407,13 @@ collections { /* begin the collection of edje groups that are in this file */
 	       color: 0 0 0 0;
 	    }
 	 }
+	 part { name: "e.swallow.entry";
+	    type: SWALLOW;
+	    description { state: "default" 0.0;
+	       rel1.to: "e.text.label";
+	       rel2.to: "e.text.label";
+	    }
+	 }
       }
       programs {
 	 program { name: "go_active";
@@ -15586,6 +16453,24 @@ collections { /* begin the collection of edje groups that are in this file */
 	    action: STATE_SET "copy" 0.0;
 	    target: "dnd_action";
 	 }
+	 program { name: "vol_off";
+	    signal: "e,state,volume,off";
+	    source: "e";
+	    action: STATE_SET "default" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_unmounted";
+	    signal: "e,state,volume,unmounted";
+	    source: "e";
+	    action: STATE_SET "unmounted" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_mounted";
+	    signal: "e,state,volume,mounted";
+	    source: "e";
+	    action: STATE_SET "mounted" 0.0;
+	    target: "vol_state";
+	 }
 	 program { name: "thumb_gen";
 	    signal:  "e,action,thumb,gen";
 	    source:  "e";
@@ -15651,6 +16536,9 @@ collections { /* begin the collection of edje groups that are in this file */
 	 image: "icon_efm_dnd_copy.png" COMP;
 	 image: "icon_efm_dnd_ask.png" COMP;
 	 image: "icon_efm_dnd_move.png" COMP;
+
+	 image: "icon_efm_vol_unmounted.png" COMP;
+	 image: "icon_efm_vol_mounted.png" COMP;
       }
       parts {
 	 part {
@@ -15964,6 +16852,35 @@ collections { /* begin the collection of edje groups that are in this file */
 	       color: 255 255 255 255;
 	    }
 	 }
+	 part { name: "vol_state";
+	    type: IMAGE;
+	    mouse_events: 0;
+	    repeat_events: 0;
+	    description { state: "default" 0.0;
+	       color:      0 0 0 0;
+	    }
+	    description { state: "visible" 0.0;
+	       aspect: 1.0 1.0;
+	       aspect_preference: BOTH;
+	       align: 1.0 1.0;
+	       rel1 {
+	          relative: 0.5 0.0;
+	          to: "icon";
+	       }
+	       rel2 {
+	          relative: 1.0 1.0;
+	          to: "icon";
+	       }
+	    }
+	    description { state: "unmounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_unmounted.png";
+	    }
+	    description { state: "mounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_mounted.png";
+	    }
+	 }
 	 part { name: "dnd_action";
 	    type:          IMAGE;
 	    mouse_events:  0;
@@ -16014,6 +16931,13 @@ collections { /* begin the collection of edje groups that are in this file */
 	       color: 0 0 0 0;
 	    }
 	 }
+	 part { name: "e.swallow.entry";
+	    type: SWALLOW;
+	    description { state: "default" 0.0;
+	       rel1.to: "e.text.label";
+	       rel2.to: "e.text.label";
+	    }
+	 }
       }
       programs {
 	 program { name: "go_active";
@@ -16053,6 +16977,24 @@ collections { /* begin the collection of edje groups that are in this file */
 	    action: STATE_SET "copy" 0.0;
 	    target: "dnd_action";
 	 }
+	 program { name: "vol_off";
+	    signal: "e,state,volume,off";
+	    source: "e";
+	    action: STATE_SET "default" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_unmounted";
+	    signal: "e,state,volume,unmounted";
+	    source: "e";
+	    action: STATE_SET "unmounted" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_mounted";
+	    signal: "e,state,volume,mounted";
+	    source: "e";
+	    action: STATE_SET "mounted" 0.0;
+	    target: "vol_state";
+	 }
 	 program { name: "thumb_gen";
 	    signal:  "e,action,thumb,gen";
 	    source:  "e";
@@ -16118,6 +17060,9 @@ collections { /* begin the collection of edje groups that are in this file */
 	 image: "icon_efm_dnd_copy.png" COMP;
 	 image: "icon_efm_dnd_ask.png" COMP;
 	 image: "icon_efm_dnd_move.png" COMP;
+
+	 image: "icon_efm_vol_unmounted.png" COMP;
+	 image: "icon_efm_vol_mounted.png" COMP;
       }
       parts {
 	 part {
@@ -16430,6 +17375,35 @@ collections { /* begin the collection of edje groups that are in this file */
 	       color: 255 255 255 255;
 	    }
 	 }
+	 part { name: "vol_state";
+	    type: IMAGE;
+	    mouse_events: 0;
+	    repeat_events: 0;
+	    description { state: "default" 0.0;
+	       color:      0 0 0 0;
+	    }
+	    description { state: "visible" 0.0;
+	       aspect: 1.0 1.0;
+	       aspect_preference: BOTH;
+	       align: 1.0 1.0;
+	       rel1 {
+	          relative: 0.5 0.0;
+	          to: "icon";
+	       }
+	       rel2 {
+	          relative: 1.0 1.0;
+	          to: "icon";
+	       }
+	    }
+	    description { state: "unmounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_unmounted.png";
+	    }
+	    description { state: "mounted" 0.0;
+	       inherit: "visible" 0.0;
+	       image.normal:  "icon_efm_vol_mounted.png";
+	    }
+	 }
 	 part { name: "dnd_action";
 	    type:          IMAGE;
 	    mouse_events:  0;
@@ -16480,6 +17454,13 @@ collections { /* begin the collection of edje groups that are in this file */
 	       color: 0 0 0 0;
 	    }
 	 }
+	 part { name: "e.swallow.entry";
+	    type: SWALLOW;
+	    description { state: "default" 0.0;
+	       rel1.to: "e.text.label";
+	       rel2.to: "e.text.label";
+	    }
+	 }
       }
       programs {
 	 program { name: "go_active";
@@ -16519,6 +17500,24 @@ collections { /* begin the collection of edje groups that are in this file */
 	    action: STATE_SET "copy" 0.0;
 	    target: "dnd_action";
 	 }
+	 program { name: "vol_off";
+	    signal: "e,state,volume,off";
+	    source: "e";
+	    action: STATE_SET "default" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_unmounted";
+	    signal: "e,state,volume,unmounted";
+	    source: "e";
+	    action: STATE_SET "unmounted" 0.0;
+	    target: "vol_state";
+	 }
+	 program { name: "vol_mounted";
+	    signal: "e,state,volume,mounted";
+	    source: "e";
+	    action: STATE_SET "mounted" 0.0;
+	    target: "vol_state";
+	 }
 	 program { name: "thumb_gen";
 	    signal:  "e,action,thumb,gen";
 	    source:  "e";
@@ -18157,7 +19156,7 @@ group { name: "e/toolbar/default/base";
                color: 255 255 255 0;
 	       image {
 		  normal: "bt_glow.png";
-		  border: 12 12 12 12;
+		  border: 7 7 9 9;
 	       }
                fill.smooth : 0;
 	    }
@@ -23048,6 +24047,7 @@ ICON("view-inherit","icon_dummy.png",64)                 // *** // EFMBUTTON("in
 //Standard Status Icons
 ICON("dialog-warning","icon_warning.png",128)                   // "enlightenment/warning"
 ICON("dialog-error","icon_warning.png",128)                     // "enlightenment/error"
+ICON("dialog-ask","icon_dummy.png",64)				// "enlightenment/unknown"
 ICON("unknown","icon_dummy.png",64)                      // *** // "enlightenment/unknown"
 
 //Standard Application Icons
@@ -23162,6 +24162,9 @@ ICON("computer","icon_efm_root.png", 64)                        // "fileman/root
 ICON("drive-harddisk","icon_efm_hdd.png", 128)                  // "fileman/hd" "fileman/hdd"
 ICON("drive-optical","icon_efm_cd.png", 128)                    // "fileman/??"
 ICON("media-flash","icon_efm_flash.png", 128)                   // "fileman/??"
+ICON("drive-removable-media","icon_efm_usbmedia.png", 128);
+
+ICON("media-eject","icon_efm_eject.png", 64)
 
 /* End of FreeDesktop.Org icons */
 
@@ -25364,4 +26367,353 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
 	 }
       }
    }
+
+
+/////////////////////////////////////////////////////////////////////////////
+   /*** MOD: EVERYTHING ***/
+
+   group { name: "e/widgets/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;
+      }
+      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: "list_bg";
+	    type: RECT;
+	    description { state: "default" 0.0;
+	       rel1 {
+		  to: "e.swallow.list";
+		  offset: -1 -1;
+	       }
+	       rel2 {
+		  to: "e.swallow.list";
+		  offset: 0  0;
+	       }
+	       color: 255 255 255 255;
+	    }
+	 }
+
+	 part { name: "e.swallow.bar";
+	    type: SWALLOW;
+	    /* clip_to: "list_clip"; */
+	    description { state: "default" 0.0;
+	       min: 32 32;
+	       max: 9999 32;
+	       align: 0.5 0.0;
+	       rel1 {
+		  relative: 0.0 1.0;
+		  offset:   8 10;
+		  to_y: "bg";
+	       }
+	       rel2.offset:   -9  -13;
+	    }
+	 }
+	 
+	 part { name: "e.swallow.list";
+	    type: SWALLOW;
+	    clip_to: "list_clip";
+	    description { state: "default" 0.0;
+	       min: 32 64;
+	       align: 0.5 1.0;
+	       rel1 {
+		  relative: 0.0 1.0;
+		  offset:   12 10;
+		  to_y: "e.swallow.bar";
+	       }
+	       rel2.offset:   -13  -13;
+	    }
+	 }
+	 part { name: "list_clip";
+	    type: RECT;
+	    description { state: "default" 0.0;
+	       color: 255 255 255 255;
+	       rel1.to_y: "e.swallow.list";
+	       rel2.to_y: "e.swallow.list";
+	    }
+	 }
+	 part { name: "list_over";
+	    mouse_events:  0;
+	    description { state: "default" 0.0;
+	       rel1 {
+		  offset: -1 -1;
+		  to: "list_bg";
+	       }
+	       rel2 {
+		  offset: 0 0;
+		  to: "list_bg";
+	       }
+	       image {
+		  normal: "inset_sunk.png";
+		  border: 7 7 7 7;
+		  middle: 0;
+	       }
+	       fill.smooth : 0;
+	    }
+	 }
+	 part { name: "bg";
+	    mouse_events: 0;
+	    description { state: "default" 0.0;
+	       min: 0 42;
+	       max: 99999 42;
+
+	       rel1 {
+		  relative: 0.0 0.0;
+		  offset:   4   6;
+	       }
+	       rel2 {
+		  relative: 1.0 0.0;
+		  offset:   -6  48;
+	       }
+
+	       image {
+		  normal: "menu_sel_bg.png";
+		  border: 8 8 5 9;
+	       }
+	    }
+	 }
+	 part { name: "e.text.label";
+	    type: TEXT;
+	    effect: SHADOW;
+	    scale: 1;
+	    description { state: "default" 0.0;
+	       fixed: 0 1;
+	       align: 0.0 0.5;
+	       rel1 {
+		  relative: 1.0 0.0;
+		  offset:   4   6;
+		  to_x:     "e.swallow.icons";
+	       }
+	       rel2 {
+		  relative: 1.0 0.0;
+		  offset:   -10  48;
+		  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";
+	       }
+	    }
+	 }
+	 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;
+	       rel1 {
+		  relative: 1.0  0.0;
+		  offset:   1    0;
+		  to: "e.text.label";
+	       }
+	       rel2 {
+		  relative: 1.0  1.0;
+		  offset:   1    -1;
+		  to: "e.text.label";
+	       }
+	       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;
+	    description { state: "default" 0.0;
+	       min: 32 32;
+	       max: 32 32;
+	       align: 0.0 0.0;
+	       rel1 {
+		  offset:  6  4;
+		  to: "bg";
+	       }
+	       rel2 {
+		  offset:   -7  -5;
+		  to: "bg";
+	       }
+	    }
+	 }
+	 part { name: "fg";
+	    mouse_events: 0;
+	    description { state: "default" 0.0;
+	       rel1.to: "bg";
+	       rel2.to: "bg";
+	       image {
+		  normal: "menu_sel_fg.png";
+		  border: 8 8 5 9;
+	       }
+	    }
+	 }
+      }
+      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;
+	    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;
+	       }
+	    }
+	    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: "e.text.title";
+	    type: TEXT;
+	    effect: SOFT_SHADOW;
+            mouse_events: 0;
+	    scale: 1;
+	    description {
+	       state: "default" 0.0;
+	       rel1 {
+		  offset: 2 1;
+		  relative: 1.0 0.0;
+		  to_x: "e.swallow.icons";
+	       }
+	       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";
+	       }
+	    }
+	    description { state: "selected" 0.0;
+	       inherit: "default" 0.0;
+	       color: 255 255 255 255;
+	       color3: 0 0 0 64;
+	       color_class: "menu_item";
+	    }
+	 }
+	 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: "fg";
+	    mouse_events: 0;
+	    description { state: "default" 0.0;
+	       visible: 0;
+	       color: 255 255 255 0;
+	       rel1.to: "bg";
+	       rel2.to: "bg";
+	       image {
+		  normal: "menu_sel_fg.png";
+		  border: 8 8 5 9;
+	       }
+	    }
+	    description { state: "selected" 0.0;
+	       inherit: "default" 0.0;
+	       visible: 1;
+	       color: 255 255 255 255;
+	    }
+	 }
+	 part {
+	    name:          "e.event.exebuf.item";
+	    type:          RECT;
+	    mouse_events:  1;
+	    description {
+	       state:    "default" 0.0;
+	       min:      14 14;
+	       visible:  1;
+	       color: 0 0 0 0;
+	       rel1 {
+		  relative: 1.0  0.0;
+		  offset:   1    -1;
+		  to_x: "e.swallow.icons";
+	       }
+	       rel2 {
+		  relative: 1.0  1.0;
+		  offset:   -1   -1;
+	       }
+	    }
+	 }
+      }
+      programs {
+	 program { name: "sel";
+	    signal: "e,state,selected";
+	    source: "e";
+	    action: STATE_SET "selected" 0.0;
+	    transition: LINEAR 0.2;
+	    target: "bg";
+	    target: "fg";
+	    target: "e.text.title";
+	 }
+	 program { name: "unsel";
+	    signal: "e,state,unselected";
+	    source: "e";
+	    action: STATE_SET "default" 0.0;
+	    transition: LINEAR 0.1;
+	    target: "bg";
+	    target: "fg";
+	    target: "e.text.title";
+	 }
+      }
+   }
 }
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 6a59baa..d4f49af 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -336,6 +336,9 @@ icon_efm_tmp.png \
 icon_efm_view_details.png \
 icon_efm_view_name.png \
 icon_efm_view.png \
+icon_efm_vol_unmounted.png \
+icon_efm_vol_mounted.png \
+icon_efm_usbmedia.png \
 icon_engine.png \
 icon_extensions.png \
 icon_favorites.png \
@@ -554,5 +557,6 @@ wp-bot1.png \
 wp-tb2.png \
 wp-bot2.png \
 wp-tb3.png \
-wp-tbs.png
+wp-tbs.png \
+systray_rounded_corners.png
 
diff --git a/data/themes/images/Makefile.in b/data/themes/images/Makefile.in
index f59e930..b2d3f43 100644
--- a/data/themes/images/Makefile.in
+++ b/data/themes/images/Makefile.in
@@ -220,6 +220,7 @@ 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@
@@ -232,6 +233,7 @@ 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@
@@ -647,6 +649,9 @@ icon_efm_tmp.png \
 icon_efm_view_details.png \
 icon_efm_view_name.png \
 icon_efm_view.png \
+icon_efm_vol_unmounted.png \
+icon_efm_vol_mounted.png \
+icon_efm_usbmedia.png \
 icon_engine.png \
 icon_extensions.png \
 icon_favorites.png \
@@ -865,7 +870,8 @@ wp-bot1.png \
 wp-tb2.png \
 wp-bot2.png \
 wp-tb3.png \
-wp-tbs.png
+wp-tbs.png \
+systray_rounded_corners.png
 
 all: all-am
 
diff --git a/data/themes/images/bt_glow.png b/data/themes/images/bt_glow.png
index e995ff1..0f516c3 100644
Binary files a/data/themes/images/bt_glow.png and b/data/themes/images/bt_glow.png differ
diff --git a/data/themes/images/icon_efm_usbmedia.png b/data/themes/images/icon_efm_usbmedia.png
new file mode 100644
index 0000000..aa6169b
Binary files /dev/null and b/data/themes/images/icon_efm_usbmedia.png differ
diff --git a/data/themes/images/icon_efm_vol_mounted.png b/data/themes/images/icon_efm_vol_mounted.png
new file mode 100644
index 0000000..f52b563
Binary files /dev/null and b/data/themes/images/icon_efm_vol_mounted.png differ
diff --git a/data/themes/images/icon_efm_vol_unmounted.png b/data/themes/images/icon_efm_vol_unmounted.png
new file mode 100644
index 0000000..793d9a1
Binary files /dev/null and b/data/themes/images/icon_efm_vol_unmounted.png differ
diff --git a/data/themes/images/systray_rounded_corners.png b/data/themes/images/systray_rounded_corners.png
new file mode 100644
index 0000000..6bb669d
Binary files /dev/null and b/data/themes/images/systray_rounded_corners.png differ
diff --git a/data/xsession/Makefile.in b/data/xsession/Makefile.in
index 2116fb6..e2b089f 100644
--- a/data/xsession/Makefile.in
+++ b/data/xsession/Makefile.in
@@ -231,6 +231,7 @@ 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@
@@ -243,6 +244,7 @@ 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@
diff --git a/data/xsession/enlightenment.desktop.in b/data/xsession/enlightenment.desktop.in
index adcf030..94ed9b5 100644
--- a/data/xsession/enlightenment.desktop.in
+++ b/data/xsession/enlightenment.desktop.in
@@ -1,8 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Enlightenment
+Name[eo]=Enlightenment
 Comment=Log in using Enlightenment (Version @VERSION@)
-Comment[it]=Effettua accesso con Enlightenment (Versione @VERSION@)
+Comment[eo]=Ensaluti pere de Enlightenment (Versio @VERSION@)
+Comment[fr]=Ouvrir une session Enlightenment (Version @VERSION@)
+Comment[it]=Accedi con Enlightenment (Versione @VERSION@)
 Type=XSession
 Icon=@prefix@/share/enlightenment/data/images/enlightenment.png
 Exec=@prefix@/bin/enlightenment_start
diff --git a/doc/Makefile.in b/doc/Makefile.in
index f987f20..dcd8ccf 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -230,6 +230,7 @@ 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@
@@ -242,6 +243,7 @@ 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@
diff --git a/enlightenment.pc b/enlightenment.pc
index 8a07010..277495c 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-pre-01
+release=ver-svn-02
 
 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.060
+Version: 0.16.999.061
 Libs: -L${libdir}
 Libs.private: 
 Cflags: -I${includedir} -DUSE_E_CONFIG_H
diff --git a/enlightenment.spec b/enlightenment.spec
index 3996702..6115803 100644
--- a/enlightenment.spec
+++ b/enlightenment.spec
@@ -1,6 +1,6 @@
 Summary: The Enlightenment window manager
 Name: enlightenment
-Version: 0.16.999.060
+Version: 0.16.999.061
 Release: 0.%(date '+%Y%m%d')
 License: BSD
 Group: User Interface/Desktops
diff --git a/m4/ac-plugins.m4 b/m4/ac-plugins.m4
index 3cf286e..82c2e2f 100644
--- a/m4/ac-plugins.m4
+++ b/m4/ac-plugins.m4
@@ -101,11 +101,9 @@ AC_DEFUN([AC_E_OPTIONAL_MODULE],
         m4_pushdef([modname_opt], [m4_bpatsubst(m4_tolower([$1]), _, -)])
         m4_pushdef([INITVAL], [m4_default([$2], [false])])dnl
         m4_pushdef([ENABLE_HELP], AS_HELP_STRING([--enable-modname_opt],
-                               [enable optional module modname_opt. Default is disabled.])
-                )dnl
+                               [optional module modname_opt @<:@default=disabled@:>@]))dnl
         m4_pushdef([DISABLE_HELP], AS_HELP_STRING([--disable-modname_opt],
-                               [disable optional module modname_opt. Default is enabled.])
-                )dnl
+                               [optional module modname_opt @<:@default=enabled@:>@]))dnl
         m4_pushdef([HELP_STR], m4_if(INITVAL, [true], [DISABLE_HELP], [ENABLE_HELP]))dnl
         m4_pushdef([NOT_INITVAL], m4_if(INITVAL, [true], [false], [true]))dnl
 
diff --git a/po/LINGUAS b/po/LINGUAS
index 4263cf5..a0307b3 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -10,10 +10,12 @@ fi
 fr
 fr_CH
 he
+hr
 hu
 it
 ja
 ko
+ku
 nb
 nl
 pl
@@ -24,5 +26,6 @@ sk
 sl
 sv
 tr
+uk
 zh_CN
 zh_TW
diff --git a/po/POTFILES.in b/po/POTFILES.in
index adf0f43..19de96c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -264,3 +264,4 @@ src/modules/mixer/conf_module.c
 src/modules/mixer/e_mod_main.c
 src/modules/connman/e_iface.c
 src/modules/connman/e_mod_main.c
+src/modules/systray/e_mod_main.c
diff --git a/po/bg.gmo b/po/bg.gmo
index 583c62c..55df68b 100644
Binary files a/po/bg.gmo and b/po/bg.gmo differ
diff --git a/po/bg.po b/po/bg.po
index 909f606..660296f 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2007-11-15 00:40+0200\n"
 "Last-Translator: Viktor Kojouharov <vkojouharov at abv.bg>\n"
 "Language-Team: English <en at li.org>\n"
@@ -20,20 +20,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "За Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -78,406 +78,408 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Сигурни ли сте, че искате да убиете този прозорец?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Да"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Не"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Сигурни ли сте, че искате да излезнете?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Искате да излезете от Enlightenment.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Сигурни ли сте, че искате да излезнете?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Сигурни ли сте, че искате да изключите компютъра?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Сигурни ли сте, че искате да рестартирате компютъра?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 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:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "Искате да изключите временно компютъра.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Сигурни ли сте, че искате да превключите в режим \"hibernate\"?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 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:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Прозорец: Действия"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Преместване"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Оразмеряване"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Меню"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Меню на прозореца"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Повдигане"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "По-ниско"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Убиване"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Прозорец : Състояния"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Режим на залепване"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Режим на скриване"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Режим на Цял Екран"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Уголемяване"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Уголемяване вертикално"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Уголемяване хоризонтално"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Уголемяване на цял екран"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Режим на уголемяване \"Умен\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Режим на уголемяване \"Разширяване\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Режим на уголемяване \"Запълване\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Режим на навиване нагоре"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Режим на навиване надолу"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "Режим на навиване наляво"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Режим на навиване надясно"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Режим на навиване"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Премахване на рамката"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "Състояние на забождане"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Поле"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Прелистване полето наляво"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Прелистване полето надясно"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Прелистване полето нагоре"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Прелистване полето надолу"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Прелистване полето по..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Показване на полето"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "Показване на полето"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Прелистване полето до..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Прелистване полето линейно..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Преминаване до поле 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Преминаване до поле 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Преминаване до поле 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Преминаване до поле 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Преминаване до поле 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Преминаване до поле 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Преминаване до поле 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Преминаване до поле 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Преминаване до поле 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Преминаване до поле 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Преминаване до поле 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Преминаване до поле 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Изпращане до поле..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Прелистване полето наляво"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Прелистване полето надясно"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Прелистване полето нагоре"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Прелистване полето надолу"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Прелистване полето по..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Прелистване полето до..."
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Прелистване полето линейно..."
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "Прелистване полето до..."
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Преминаване до поле 0"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Преминаване до поле 1"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Преминаване до поле 2"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Преминаване до поле 3"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Преминаване до поле 4"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Преминаване до поле 5"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Преминаване до поле 6"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Преминаване до поле 7"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Преминаване до поле 8"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Преминаване до поле 9"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Преминаване до поле 10"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Преминаване до поле 11"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Изпращане до поле..."
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -487,103 +489,118 @@ msgstr "Изпращане до поле..."
 msgid "Screen"
 msgstr "Екран"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Изпращане на мишката до екран 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Изпращане на мишката до екран 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Изпращане на мишката до екран..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Изпращане на мишката напред 1 екран "
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Изпращане на мишката назад 1 екран "
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Изпращане на мишката напред/назад екрани..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Прозорец : Движения"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "До следващото поле"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "До предишното поле"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "По поле #..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "До поле..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Показване на главното меню"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Показване на предпочитаното меню"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Показване на меню \"Всички програми\""
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Показване на клиентско меню"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Показване на меню..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Команда"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Програма"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Рестартиране"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Изход"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 #, fuzzy
 msgid "Exit Now"
 msgstr "Изход"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment·%s·Модул"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Режим на Цял Екран"
+
+#: src/bin/e_actions.c:2813
+#, 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -596,58 +613,58 @@ msgstr "Изход"
 msgid "System"
 msgstr "Системни"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Изход"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Рестартиране на компютъра"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Временно изключване"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Режим \"Hibernate\""
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 #, fuzzy
 msgid "Lock"
 msgstr "Забрани"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Изчистване на прозорци"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "Прозорец: Действия"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Delayed Action"
 msgstr "Специфични програми"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Поставяне като фон"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "Сканиране на Desktop файлове завършено"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "Сканиране на Desktop файлове"
 
@@ -656,13 +673,14 @@ msgstr "Сканиране на Desktop файлове"
 msgid "Color Selector"
 msgstr "Избор на профили"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -677,7 +695,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -689,7 +707,7 @@ msgstr "Добре"
 msgid "Cancel"
 msgstr "Отказ"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -707,7 +725,7 @@ msgstr ""
 "Сега<br>може да конфигурирате Е както ви харесва. Извиняваме се за това "
 "неудобство.<br>"
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -722,12 +740,12 @@ msgstr ""
 "лошо, и затова конфигурацията е възстановена по<br>подразбиране. Извиняваме "
 "се за това неудобство.<br>"
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "Настройки на полетата"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -735,7 +753,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -745,7 +763,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -754,7 +772,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -763,7 +781,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -771,12 +789,12 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Проблем при запис на конфигурацията на E17"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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,7 +820,7 @@ 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Разширения"
 
@@ -811,22 +829,22 @@ msgstr "Разширения"
 msgid "Container %d"
 msgstr "Контейнер %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Грешка - няма поддържка на PAM"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Няма поддържка на PAM в Enlightenment, затова<br>заключването на екрана е "
 "изключено"
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Заключването е неуспешно"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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 +852,15 @@ msgstr ""
 "Заключването на екрана е неуспешно, защото някоя програма<br>е прихванала "
 "клавиатурата или мишката и те не могат да се прихванат от E17"
 
-#: src/bin/e_desklock.c:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Моля, въведете вашата парола"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Грешка в системата за идентификация"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -850,6 +868,25 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
+#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Непълни характеристики на прозореца"
@@ -946,23 +983,23 @@ msgstr "Избиране на икона"
 msgid "Select an Executable"
 msgstr "Избиране на изпълним файл"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Изтриване"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Изрязване"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Копиране"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Вмъкване"
 
@@ -997,267 +1034,321 @@ msgstr ""
 "Enlightenment·не успя да пусне програмата:<br><br>%s<br><br>Програмата не "
 "успя да се стартира."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Грешка при стартиране на програмата"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s е спряла неочаквано"
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Изходен код %i е върнат от·%s."
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s е прекъсната от сигнал Interrupt."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s е прекъсната от сигнал Quit."
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s е прекъсната от сигнал Abort."
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s е прекъсната от Floating Point грешка."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s е прекъсната от сигнал Uninterruptable Kill."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s е прекъсната от сигнал Segmentation Fault."
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s е прекъсната от сигнал Broken Pipe."
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s е прекъсната от сигнал Termination."
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s е прекъсната от грешка на шината."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s е прекъсната от сигнал с номер %i."
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***Остатъкът от резултата е скрит. Запазете го за да го видите***\n"
 
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Дневник с грешки"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Няма съобщение с грешки"
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Запазване на това съобщение"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Тези грешки ще бъдат записани като %s/%s.log"
 
-#: src/bin/e_exec.c:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Информация за грешката"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Информация за сигналната грешка"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Резултат"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Няма резултат"
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 #, fuzzy
 msgid "Nonexistent path"
 msgstr "Несъществуващ път"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, fuzzy, c-format
 msgid "%s doesn't exist."
 msgstr "%s не съществува"
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Грешка при изпълнение"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Грешка при изпълнение"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Грешка при изпълнение"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i файлове"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 #, fuzzy
 msgid "Link"
 msgstr "Линейно"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 #, fuzzy
 msgid "Abort"
 msgstr "За"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Настройки на избиране"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Режим за разглеждане"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Опресняване на изгледа"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Показване на скрити файлове"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "Запомняне на подреждането"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Сортиране сега"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Нова директория"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Преименуване"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Елемент от меню"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Характеристики"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 #, fuzzy
 msgid "Use default"
 msgstr "Използване на стандарто"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Списък"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "Размер на иконите"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Поставяне като фон"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "Съдържание на рафта"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Изчистване"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Създаване на нова директория"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Име на новата директория:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Преименуване на %s до:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Преименуване на файл"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 #, fuzzy
 msgid "Retry"
 msgstr "Рестартиране"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 #, fuzzy
 msgid "Error"
 msgstr "Грешка при изпълнение"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "Стартиране"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Сигурни ли сте, че искате да изтриете <br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Потвърждаване за изтриването"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Сигурни ли сте, че искате да изтриете <br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1318,8 +1409,8 @@ msgid "Preview"
 msgstr "Преглед"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "По подразбиране"
 
@@ -1328,7 +1419,7 @@ msgid "Thumbnail"
 msgstr "Миниизображение"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Друг"
 
@@ -1344,70 +1435,70 @@ msgstr "Информация за връзката"
 msgid "Select an Image"
 msgstr "Избиране на изображение"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr "Непознат дял"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "Сменяемо устройство"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Прост"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Вдълбано"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Изглед"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Автоматично плъзгане на съдържание"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Възможност за оразмеряване"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Започване редактирането на този инструмент"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Премахване"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "Спиране редактирането на този инструмент"
 
@@ -1458,8 +1549,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1467,7 +1558,7 @@ msgstr "Размер"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
 #: src/bin/e_int_border_menu.c:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Ниво"
 
@@ -1650,12 +1741,12 @@ msgstr "Цял екран"
 msgid "Window List"
 msgstr "Списък с прозорци"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Превключвател на полета"
 
@@ -1906,11 +1997,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 #, fuzzy
 msgid "Settings"
 msgstr "Настройки на полетата"
@@ -1945,8 +2036,8 @@ msgstr "Заредени модули"
 msgid "Unload Module"
 msgstr "Изключване на модул"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1976,13 +2067,13 @@ msgstr "Избрани джунджурийки"
 msgid "Remove Gadget"
 msgstr "Премахване"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 #, fuzzy
 msgid "Toolbar Settings"
 msgstr "Прехвърляне"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Подредба"
 
@@ -2065,122 +2156,122 @@ msgstr "(Няма прозорци)"
 msgid "No name!!"
 msgstr "Няма име!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(Няма рафтове)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Рафт №"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Добавяне на рафт"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Изтриване на рафт"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Настройки"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Дребен"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Среден размер"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Голям"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Грамаден"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Съдържание на рафта"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Над всичко"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Под прозорците"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "На самото поле"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "Позволяване на прозорците да застъпват този рафт"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Смаляване до размера на съдържанието"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f·пиксела"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Стилове"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "Автоматично скриване"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "Автоматично скриване на рафта"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "Показване при влизане с показалеца"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "Показване при натискане с показалеца"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "Време преди скриване"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f·секунди"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "Продължителност"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "Показване върху всички полета"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "Показване върху определено поле"
 
@@ -2553,7 +2644,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment не може да настрои системата 'плъзгане и пускане'"
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2748,30 +2839,37 @@ msgstr "Enlightenment·%s·Модул"
 msgid "Would you like to unload this module?<br>"
 msgstr "Искате ли да изключите този модул?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 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:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Спиране на всякакво редактиране "
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Започване на редактиране на всичко"
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Съдържание на рафта"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Изтриване на този рафт"
 
@@ -2939,7 +3037,7 @@ msgstr "За тази тема"
 msgid "Set As Theme"
 msgstr "Избиране като тема"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Съдържание на лентата с инструменти"
@@ -2958,67 +3056,67 @@ msgstr ""
 "спрян, докато тези прозорци не бъдат затворени, или не се "
 "премахне<br>забраната им за изход."
 
-#: src/bin/e_utils.c:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Байтове"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f КБ"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f МБ"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f ГБ"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "В бъдещето"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "В последната минута"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "Преди %li години"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "Преди %li месеца"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "Преди %li седмици"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "Преди %li дни"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "Преди %li часа"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "Преди %li минути"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3030,7 +3128,7 @@ msgstr "Незнаен"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Добавяне"
 
@@ -3053,7 +3151,7 @@ msgid "Add to Favorites"
 msgstr "Добавяне до предпочитаните"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3174,6 +3272,7 @@ msgid "Internal"
 msgstr "Вграден(и)"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
@@ -3186,25 +3285,25 @@ msgstr ""
 msgid "Battery"
 msgstr "Батерия"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "Показване на предупреждение при изтощение на батерията"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr ""
 
@@ -3213,11 +3312,26 @@ msgid "Clock"
 msgstr "Часовник"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 #, fuzzy
 msgid "Settings Panel"
 msgstr "Настройки на полетата"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Настройки на полетата"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "Време за цялостно изкючване"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+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"
@@ -3240,7 +3354,7 @@ msgid "Restart Applications"
 msgstr "Рестартиращи програми"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "Всички Пограми"
 
@@ -3601,42 +3715,55 @@ msgstr "Избор"
 msgid "Desk"
 msgstr "Поле"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "Настройки за заключване"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Автоматично заключване"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 #, fuzzy
 msgid "Lock when Enlightenment starts"
 msgstr "Използване на показалеца от E17"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: 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:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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:240
+#: 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
@@ -3647,27 +3774,27 @@ msgstr "%1.0f минути"
 msgid "Personal"
 msgstr "Лични"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Настройки на входящата кутия"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: 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:337
+#: 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:341
+#: 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:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3676,29 +3803,49 @@ msgstr "Показване в зона #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Тип тапет"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Тапет от темата"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+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:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "Използване на потребителско заключване"
 
@@ -3706,59 +3853,74 @@ msgstr "Използване на потребителско заключван
 msgid "Screen Lock"
 msgstr "Заключване на екрана"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "Настройки за виртуални полета"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Брой от полета"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "Анимирано прелистване"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Полета"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: 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:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "Анимация на прелистване"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Изключено"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "Плъзгане"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Приближаване"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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
+#, fuzzy
+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 "Виртуални полета"
@@ -3774,8 +3936,8 @@ msgstr "Диалогови настройки"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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 "Общи настройки"
@@ -3947,24 +4109,24 @@ msgstr "Текущия Х сървър няма <br> DPMS разширение."
 msgid "Display Power Management Settings"
 msgstr "Енергийни настройки на монитора"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: 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:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 #, fuzzy
 msgid "Timers"
 msgstr "Хронометър(и)"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "Време за изчакване"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "Време за временно изключване"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "Време за цялостно изкючване"
 
@@ -4554,7 +4716,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f·пиксела"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4775,7 +4937,7 @@ msgid "Select an Edj File"
 msgstr "Избиране на edj файл"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Файлове"
 
@@ -5132,55 +5294,50 @@ msgstr "Максимален размер"
 msgid "Scaling"
 msgstr "Ниво"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Настройки за предпазител на екрана"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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:168
+#: 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:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f·секунди"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "Скриване"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Предпочитано"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "Не е предпочитано"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr "Излагане на събития"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Позволяване"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "Забраняване"
 
@@ -5193,7 +5350,7 @@ msgid "Configured Shelves"
 msgstr "Настроени рафтове"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Настройки при зареждане"
@@ -5239,10 +5396,6 @@ msgstr "Категории за теми"
 msgid "Assign"
 msgstr "Възлагане"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "Изчистване"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "Изчистване на всичко"
@@ -6124,30 +6277,21 @@ msgstr "Сенки"
 msgid "Run Command Dialog"
 msgstr "Диалог за стартиране на програми"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "Грешка при изпълнение"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: 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:332
+#: src/modules/fileman/e_mod_main.c:322
 #, fuzzy
 msgid "Favorites"
 msgstr "Меню за предпочитания"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 #, fuzzy
 msgid "Root"
 msgstr "Рестартиране на компютъра"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: src/modules/fileman/e_mod_main.c:431
 #, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
@@ -6165,7 +6309,7 @@ msgstr ""
 "Сега<br>може да конфигурирате Е както ви харесва. Извиняваме се за това "
 "неудобство.<br>"
 
-#: src/modules/fileman/e_mod_main.c:454
+#: src/modules/fileman/e_mod_main.c:444
 #, fuzzy
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
@@ -6181,98 +6325,106 @@ msgstr ""
 "лошо, и затова конфигурацията е възстановена по<br>подразбиране. Извиняваме "
 "се за това неудобство.<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 #, fuzzy
 msgid "Fileman Settings Updated"
 msgstr "Конфигурация на файловия манипулатор"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr "Конфигурация на файловия манипулатор"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Размер на иконите"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 #, fuzzy
 msgid "View"
 msgstr "Режим за разглеждане"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr "Отваряне на директории на място"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "Сортиране на директории най-отпред"
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Стандартен размер"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "Използване на единично натискане на бутона"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr "Показване на разширения на иконите"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "Показване на пълен път"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr "Показване на икони вържу полето"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr "Показване на лентата с инструменти"
 
-#: src/modules/fileman/e_mod_config.c:257
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:729
+msgid "Behavior"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:270
 #, fuzzy
 msgid "Show HAL icons on desktop"
 msgstr "Показване върху всички полета"
 
-#: src/modules/fileman/e_mod_config.c:261
-#: src/modules/gadman/e_mod_gadman.c:729
-msgid "Behavior"
+#: 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:1187
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr "Една директория нагоре"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "Добавяне на стартер"
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Отваряне"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Отваряне с ..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "Програми"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Специфични програми"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 #, fuzzy
 msgid "Custom Command"
 msgstr "Стартиране на програма"
@@ -6374,40 +6526,40 @@ msgstr "Предишен прозорец"
 msgid "Select a window"
 msgstr "Избиране на прозорец"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 #, fuzzy
 msgid "IBar Settings"
 msgstr "Прехвърляне"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Източник на избрания ibar"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Надпис на иконата"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Имена на икони"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "Показване на името"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "Показване на коментар"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "Показване на общо поле"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "Създаване на нов ibar източник"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "Задаване на име за новия източник:"
 
@@ -6422,29 +6574,29 @@ msgstr "Искате да изтриете \"%s\".<br><br>Сигурни ли с
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Сигурни ли сте, че искате да изтриете този източник?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Характеристики на иконата"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Премахване на икона"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 #, fuzzy
 msgid "Add An Icon"
 msgstr "Добавяне на стартер"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 #, fuzzy
 msgid "Create New Icon"
 msgstr "Създаване на икона"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Добавяне на стартер"
 
@@ -6498,99 +6650,99 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr "Настройки на превключватела"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 #, fuzzy
 msgid "Show desktop names"
 msgstr "Показване на икони вържу полето"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 #, fuzzy
 msgid "Popup Settings"
 msgstr "Настройки за изкачащ прозорец на превключвателя"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 #, fuzzy
 msgid "Show popup on desktop change"
 msgstr "Показване на изскачащ прозорец при смяна на поле"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 #, fuzzy
 msgid "Show popup for urgent windows"
 msgstr "Показване на изскачащ прозорец при спешни прозорци"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr "Бутон за избор и плъзгане"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "Щракнете"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 #, fuzzy
 msgid "Drag and Drop button"
 msgstr "Бутон за местене (Пази текущата позиция)"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 #, fuzzy
 msgid "Drag whole desktop"
 msgstr "Виртуални полета"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f·пиксела"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "Съпротивление при плъзгане"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 #, fuzzy
 msgid "Popup pager height"
 msgstr "Бързина на изкачащ прозорец"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 #, fuzzy
 msgid "Popup speed"
 msgstr "Бързина на изкачащ прозорец"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f·секунди"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 #, fuzzy
 msgid "Urgent Window Settings"
 msgstr "Настройки на списъка с прозорци"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 #, fuzzy
 msgid "Show popup on urgent window"
 msgstr "Показване на изскачащ прозорец при спешни прозорци"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Изскачащия прозорец остава на екрана"
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr "Прихващане на бутони"
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6598,12 +6750,12 @@ msgstr ""
 "Натиснете клавишна комбинация,<br>или <hilight>Escape</hilight>за отказ,"
 "<br>или <hilight>Del</hilight> за връщане."
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:343
 #, fuzzy
 msgid "Attetion"
 msgstr "Действия"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 #, fuzzy
 msgid ""
 "You cannot use the right mouse button in the<br>shelf for this as it is "
@@ -6613,33 +6765,33 @@ msgstr ""
 "Десният бутон на мишката не може да се използва, защото вече се използва от "
 "E."
 
-#: src/modules/pager/e_mod_config.c:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Бутон %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 #, fuzzy
 msgid "Show Pager Popup"
 msgstr "Настройки за изкачащ прозорец на превключвателя"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "Прелистване полето надясно"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "Прелистване полето наляво"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "Прелистване полето нагоре"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "Прелистване полето надолу"
@@ -6909,7 +7061,7 @@ msgstr ""
 msgid "Right:"
 msgstr "Бледи"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 #, fuzzy
 msgid "Mute"
 msgstr "Елемент от меню"
@@ -6956,12 +7108,12 @@ msgstr "Настройки на модули"
 msgid "Mixer Settings Updated"
 msgstr "Конфигурацията на файловия манипулатор е подновена"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 #, fuzzy
 msgid "Controls"
 msgstr "Прегледът над системата е завържен"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -7000,6 +7152,19 @@ msgstr "Специфични програми"
 msgid "Networks"
 msgstr ""
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "Системни"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Конфигурация на виртуалните полета"
 
diff --git a/po/ca.gmo b/po/ca.gmo
index 90728a2..57fe07e 100644
Binary files a/po/ca.gmo and b/po/ca.gmo differ
diff --git a/po/ca.po b/po/ca.po
index da97a0f..f79cc82 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-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2008-06-26 11:22+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -14,20 +14,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Sobre Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -75,72 +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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Si"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "No"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Estàs segur que vol sortir ?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Segur que vols sortir ?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Segur que vols parar el Ordinador ?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Segur que vols Re-iniciar ?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 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:2047
+#: src/bin/e_actions.c:2061
 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:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Estàs segur que vol hibernar ?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -148,338 +150,338 @@ msgstr ""
 "Has demanat Hibernar el seu Ordinador.<br><br> Estàs  segur que el vols "
 "suspendre a disc ?"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Finestra : Accions"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Mou "
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Re-dimensiona"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menú"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Menú de Finestra"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Augment"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Més petit"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Mata"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Finestra : Estat"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Mode enganxós"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Mode icònic "
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Mostra a Pantalla Completa"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maximitza"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Maximitza Verticalment"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Maximitza Horitzontalment"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Maximitza a Pantalla Completa"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Mode Maximització \"Smart\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Mode Maximització \"Expand\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Mode Maximització \"Fill\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Mode d'Ombrejat Amunt Toggle"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Mode d'Ombrejat Avall Toggle"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "Mode d'Ombrejat a l'Esquerrat Toggle"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Mode d'Ombrejat a Dreta Toggle"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Mode d'Ombrejat Toggle"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Estat Sense Tanca de la Vora"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "Estat de la Tanca Clavada "
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Taula de Treball"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Salta a la Taula de Treball de l'Esquerra"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Salta a la Taula de Treball de la Dreta"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Salta a la Taula de Treball de Dalt"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Salta a la Taula de Treball de Baix"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Canvia de Taula de Treball per..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Mostra la Taula de Treball"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "Mostra la Taula de Treball"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Canvia de Taula de Treball a ..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Canvia de Taula de Treball linealment ..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Canvia a la Taula de Treball 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Canvia a la Taula de Treball 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Canvia a la Taula de Treball 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Canvia a la Taula de Treball 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Canvia a la Taula de Treball 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Canvia a la Taula de Treball 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Canvia a la Taula de Treball 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Canvia a la Taula de Treball 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Canvia a la Taula de Treball 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Canvia a la Taula de Treball 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Canvia a la Taula de Treball 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Canvia a la Taula de Treball 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Canvia a la Taula de Treball ...."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Salta a la Taula de Treball de l'Esquerra"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Salta a la Taula de Treball de la Dreta"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Salta a la Taula de Treball de Dalt"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Salta a la Taula de Treball de Baix"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Canvia de Taula de Treball per..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Canvia de Taula de Treball a ..."
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Canvia de Taula de Treball linealment ..."
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "Canvia de Taula de Treball a ..."
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Canvia a la Taula de Treball 0"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Canvia a la Taula de Treball 1"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Canvia a la Taula de Treball 2"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Canvia a la Taula de Treball 3"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Canvia a la Taula de Treball 4"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Canvia a la Taula de Treball 5"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Canvia a la Taula de Treball 6"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Canvia a la Taula de Treball 7"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Canvia a la Taula de Treball 8"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Canvia a la Taula de Treball 9"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Canvia a la Taula de Treball 10"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Canvia a la Taula de Treball 11"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Canvia a la Taula de Treball ...."
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -489,103 +491,118 @@ msgstr "Canvia a la Taula de Treball ...."
 msgid "Screen"
 msgstr "Pantalla"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Envia el Ratolí A l'Escriptori 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Envia el Ratolí A l'Escriptori 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Envia el Ratolí a la Pantalla ...."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Envia el Ratolí un Escriptori més enllà"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Envia el Ratolí un Escriptori previ"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Envia el Ratolí Endavant/Endarrera Pantalles"
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Finestra : Moviment"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "Següent Taula de Treball"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Envia a la Taula de Treball prèvia"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "A Taula de Treball #..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "A Taula de Treball ..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Mostra el Menú Principal"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Mostra el Menú Favorits"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Mostra Totes les Aplicacions del Menú"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Mostra el Menú Clients"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Mostra Menú ..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Comanda"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Aplicació"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Re-inicia "
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Surt"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 #, fuzzy
 msgid "Exit Now"
 msgstr "Surt"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Mòdul  %s de Enlightenment"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Mostra a Pantalla Completa"
+
+#: src/bin/e_actions.c:2813
+#, 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -598,60 +615,60 @@ msgstr "Surt"
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Surt"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Re-iniciar l'ordinador"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Suspendre l'ordinador"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Hiberna"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 #, fuzzy
 msgid "Lock"
 msgstr "Bloquejos "
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Neteja Finestres"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "Finestra : Accions"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Delayed Action"
 msgstr "Accions del Mòdul"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 #, fuzzy
 msgid "Set As Background"
 msgstr "Fons de Pantalla"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 #, fuzzy
 msgid "Desktop files scan done"
 msgstr "Fitxer de Taula de Treball"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "Fitxer de Taula de Treball"
@@ -661,13 +678,14 @@ 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:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -682,7 +700,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -694,7 +712,7 @@ msgstr "D'acord"
 msgid "Cancel"
 msgstr "Cancel·la "
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -713,7 +731,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:746
+#: src/bin/e_config.c:760
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -729,12 +747,12 @@ msgstr ""
 "fitxers de configuració han estat <br> restaurats per defecte. Perdona els "
 "inconvenients.<br>"
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "Paràmetres de Pantalla"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, fuzzy, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -745,7 +763,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:1663
+#: src/bin/e_config.c:1723
 #, fuzzy, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -760,7 +778,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:1676
+#: src/bin/e_config.c:1736
 #, fuzzy, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -773,7 +791,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:1687
+#: src/bin/e_config.c:1747
 #, fuzzy, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -786,7 +804,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:1699
+#: src/bin/e_config.c:1759
 #, fuzzy, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -798,12 +816,12 @@ msgstr ""
 "succeït l'error és :<br> %s <br><br> Aquest fitxer ha estat borrat per dades "
 "incorrectes ."
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemes al Escriure la Configuració de l'Enlightenment"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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,7 +847,7 @@ msgid "Modules"
 msgstr "Mòduls"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Extensions"
 
@@ -838,22 +856,22 @@ msgstr "Extensions"
 msgid "Container %d"
 msgstr "Contenidor %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Error- no hi ha suport per PAM"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 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:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Errada en el Bloqueig"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -861,15 +879,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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Si us plau, introdueix la teva paraula clau de desbloqueig"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Error del Sistema d'Autentificació"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -880,6 +898,25 @@ 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
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Propietats de Finestra Incompletes"
@@ -981,23 +1018,23 @@ msgstr "Seleccioneu una Icona"
 msgid "Select an Executable"
 msgstr "Seleccioneu un Executable "
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Talla"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Còpia "
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Enganxa"
 
@@ -1031,71 +1068,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:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Error en l'Execució de l'Aplicació"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s ha parat d'executar-se inesperadament."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, 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:442
+#: src/bin/e_exec.c:443
 #, 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:444
+#: src/bin/e_exec.c:445
 #, 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:448
+#: src/bin/e_exec.c:449
 #, 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:451
+#: src/bin/e_exec.c:452
 #, 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:454
+#: src/bin/e_exec.c:455
 #, 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:457
+#: src/bin/e_exec.c:458
 #, 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:460
+#: src/bin/e_exec.c:461
 #, 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:463
+#: src/bin/e_exec.c:464
 #, 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:466
+#: src/bin/e_exec.c:467
 #, 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:469
+#: src/bin/e_exec.c:470
 #, 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:525
+#: src/bin/e_exec.c:528
 #, fuzzy
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
@@ -1103,201 +1140,255 @@ msgstr ""
 "***El recordatori de sortida ha estat trancat. Guarda la sortida per veure."
 "***<br>"
 
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Error en els Logs"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "No hi havia missatge d'error"
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Desa Aquest Missatge"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, 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:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Error d'Informació"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Error del senyal d'Informació"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Dades de sortida"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "No hi ha sortida"
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Error en Execució"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Error en Execució"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Error en Execució"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i Fitxers"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 #, fuzzy
 msgid "Link"
 msgstr "Lineal "
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 #, fuzzy
 msgid "Abort"
 msgstr "Quant a..."
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Paràmetres de Configuració "
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 #, fuzzy
 msgid "View Mode"
 msgstr "Mode Bàsic"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Refresca la Vista"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Mostra els Fitxers Ocults"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "Recorda l'Ordre"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Ordena Ara"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nou Directori"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Canvia el Nom"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Error en Execució"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Propietats"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 #, fuzzy
 msgid "Use default"
 msgstr "Ajusta a Predeterminat"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 #, fuzzy
 msgid "Grid Icons"
 msgstr "Fitxers d'Icones"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 #, fuzzy
 msgid "Custom Icons"
 msgstr "Costum"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 #, fuzzy
 msgid "List"
 msgstr "Llistat de Finestres"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "Nom d'Icona"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Fons de Pantalla"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "Continguts de la LLeixa"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Neteja"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Creeu un nou Directori"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Nom Nou del Directori:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Canvia el nom %s a : "
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Canvia el nom del Fitxer"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 #, fuzzy
 msgid "Retry"
 msgstr "Re-inicia "
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 #, fuzzy
 msgid "Error"
 msgstr "Error en Execució"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "Carregant %s"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, 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:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Confirmació de Borrar"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, 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:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1358,8 +1449,8 @@ msgid "Preview"
 msgstr "Vista prèvia"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Defecte"
 
@@ -1368,7 +1459,7 @@ msgid "Thumbnail"
 msgstr "Ungla"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Costum"
 
@@ -1384,70 +1475,70 @@ msgstr "Informació d'Enllaç "
 msgid "Select an Image"
 msgstr "Seleccioneu una Imatge"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "Desconegut"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "Dispositiu Extraïble"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Text Pla"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Sagnat"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Aparença"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Mostra automàticament els continguts"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Autoritzat a ser re-dimensionat"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Inici de moviment/re-dimensió d'aquest Gadget"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Borra aquest Gadget"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "Para de moure/re-dimensionar aquest gadget"
 
@@ -1501,8 +1592,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1510,7 +1601,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Apilant"
 
@@ -1694,12 +1785,12 @@ msgstr "Pantalla Completa"
 msgid "Window List"
 msgstr "Llista de Finestres"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Paginador"
 
@@ -1968,11 +2059,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 #, fuzzy
 msgid "Settings"
 msgstr "Paràmetres de Pantalla"
@@ -2009,8 +2100,8 @@ msgstr "Mòduls Carregats "
 msgid "Unload Module"
 msgstr "Mòduls Descarregats "
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2041,13 +2132,13 @@ msgstr "Gadjets seleccionats"
 msgid "Remove Gadget"
 msgstr "Borrar Gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 #, fuzzy
 msgid "Toolbar Settings"
 msgstr "Paràmetres"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Disposició "
 
@@ -2134,123 +2225,123 @@ msgstr "(No Ha Ha Finestres)"
 msgid "No name!!"
 msgstr "No hi ha Nom!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(No existeixen Lleixes"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Lleixa #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Afegeix una Lleixa"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Elimina la Lleixa"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: 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:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Molt petit"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Mitjà"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Gran"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Enorme"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Continguts de la LLeixa"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Damunt de tot"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Sota Finestres"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Per sota de tot"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "Deixa solapar les finestres a la lleixa"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Estils"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "Auto oculta "
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "Oculta automàticament la Lleixa"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "Mostra Quan el ratolí estigui sobre "
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "Mostra en clicar el ratolí "
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "Temps d'Amagar"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f segons"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "Durada de l'ocultació "
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 #, fuzzy
 msgid "Show on all Desktops"
 msgstr "Mostra la Taula de Treball"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 #, fuzzy
 msgid "Show on specified Desktops"
 msgstr "Mostra la Taula de Treball"
@@ -2641,7 +2732,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2842,31 +2933,38 @@ msgstr "Mòdul  %s de Enlightenment"
 msgid "Would you like to unload this module?<br>"
 msgstr "Estàs segur que vol descarregar aquest mòdul ?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 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:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Parar de Moure/Re-dimensionar Elements"
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Començar a Moure/Re-dimensionar Elements"
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Continguts de la LLeixa"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Elimina Aquesta Lleixa"
 
@@ -3038,7 +3136,7 @@ msgstr "Sobre Aquest Tema"
 msgid "Set As Theme"
 msgstr "Escull un Tema"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Continguts de la LLeixa"
@@ -3054,67 +3152,67 @@ msgid ""
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "En el Futur"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "En aquest últim Minut"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li anys"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Mesos "
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Setmanes"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Dies"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Hores"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Minuts"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3126,7 +3224,7 @@ msgstr "Desconegut"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Afegeix"
 
@@ -3149,7 +3247,7 @@ msgid "Add to Favorites"
 msgstr "Afegeix a Aplicacions Preferents"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3270,6 +3368,7 @@ msgid "Internal"
 msgstr "Intern"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
@@ -3282,25 +3381,25 @@ msgstr ""
 msgid "Battery"
 msgstr "Bateria"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "Mostrem una alerta quan la bateria estigui baixa"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 #, fuzzy
 msgid "Battery Meter"
 msgstr "Bateria"
@@ -3310,11 +3409,26 @@ msgid "Clock"
 msgstr "Rellotge"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 #, fuzzy
 msgid "Settings Panel"
 msgstr "Paràmetres de Pantalla"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Paràmetres de Pantalla"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "Parat"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Mòduls"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3337,7 +3451,7 @@ msgid "Restart Applications"
 msgstr "Re-inicia Aplicacions"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "Totes les Aplicacions"
 
@@ -3700,42 +3814,55 @@ msgstr "Selecciona"
 msgid "Desk"
 msgstr "Desk"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "Configuració del Bloqueig de Pantalla "
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Bloqueig Automàtic"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 #, fuzzy
 msgid "Lock when Enlightenment starts"
 msgstr "Utilitza el Cursor d'Enlightenment "
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
 msgstr "Bloqueja quan el salva pantalles estigui activat"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+msgid "Time after screensaver activated"
+msgstr "Temps restant per canviar el salva pantalles"
+
+#: 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 segons"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
 msgid "Lock when idle time exceeded"
 msgstr "Bloqueja quan el temps d'espera hagi accedit "
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:184
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
 msgid "Idle time to exceed"
 msgstr "Temps d'espera per bloqueig"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 minuts"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3746,27 +3873,27 @@ msgstr "%1.0f minuts"
 msgid "Personal"
 msgstr "Personal"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Paràmetres de Configuració de la Finestra d'Entrada"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
 msgstr "Mostra en totes les zones de pantalla"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr "Mostra en aquesta zona de pantalla"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
 msgstr "Mostra en la zona de pantalla #:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3775,29 +3902,49 @@ msgstr "Mostra en la zona de pantalla #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Mode de Fons de Pantalla"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
 #: src/modules/gadman/e_mod_config.c:149
 msgid "Theme Defined"
 msgstr "Tema Definit"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Fons de Pantalla del Tema"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "Utilitza la Imatge del Tema "
+
+#: 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:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr ""
 
@@ -3805,59 +3952,74 @@ msgstr ""
 msgid "Screen Lock"
 msgstr "Bloqueig de Pantalla"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "Configuració de Taules de Treball Virtuals "
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Nombre de Taules de Treball"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "Salts Animats"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Taules de Treball"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Salta quan s'arrastrin objectes a l'extrem de la Pantalla"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "Animació de Salt"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Parat"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "Vidre"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 sec"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Canvia el Fons de Pantalla"
+
+#: 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 "Taules de Treball Virtuals"
@@ -3873,8 +4035,8 @@ msgstr "Configuració de Diàlegs"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -4046,24 +4208,24 @@ msgstr ""
 msgid "Display Power Management Settings"
 msgstr "Configuració per Mostrar el Manegament d'Energia"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
 msgid "Enable Display Power Management"
 msgstr "Autoritza Mostrar el Manegador d'Energia"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 #, fuzzy
 msgid "Timers"
 msgstr "Temes"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr ""
 
@@ -4652,7 +4814,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pixels"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4874,7 +5036,7 @@ msgid "Select an Edj File"
 msgstr "Seleccioneu Fitxer Edj"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Fitxers"
 
@@ -5233,55 +5395,50 @@ msgstr "Mida Màxima"
 msgid "Scaling"
 msgstr "Apilant"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Opcions de Salva Pantalles"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 "Autoritza el Salva-pantalla d' X"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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 "Temps de Salvapantalla"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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 "Temps restant per arrancar el salva pantalles "
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
 msgstr "Temps restant per canviar el salva pantalles"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f segons"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Preferit"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Autoritza"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "No Autoritzat"
 
@@ -5294,7 +5451,7 @@ msgid "Configured Shelves"
 msgstr "LLeixes Configurades"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Arrancada"
@@ -5342,10 +5499,6 @@ msgstr "Categories de Tema"
 msgid "Assign"
 msgstr "Assigna"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "Neteja"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "Neteja-ho Tot"
@@ -6222,30 +6375,21 @@ msgstr ""
 msgid "Run Command Dialog"
 msgstr "Executar Comanda de Diàleg"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "Error en Execució"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: 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:332
+#: src/modules/fileman/e_mod_main.c:322
 #, fuzzy
 msgid "Favorites"
 msgstr "Menú Favorits"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 #, fuzzy
 msgid "Root"
 msgstr "Re-iniciar l'ordinador"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: src/modules/fileman/e_mod_main.c:431
 #, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
@@ -6264,7 +6408,7 @@ msgstr ""
 "configuració.<br>Pot re-configurar les coses ara. Disculpa per les molèsties "
 "per la teva configuració<br>"
 
-#: src/modules/fileman/e_mod_main.c:454
+#: src/modules/fileman/e_mod_main.c:444
 #, fuzzy
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
@@ -6281,103 +6425,111 @@ msgstr ""
 "fitxers de configuració han estat <br> restaurats per defecte. Perdona els "
 "inconvenients.<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 #, fuzzy
 msgid "Fileman Settings Updated"
 msgstr "Paràmetres de Menú"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 #, fuzzy
 msgid "Fileman Settings"
 msgstr "Paràmetres de Menú"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 #, fuzzy
 msgid "Icon Size"
 msgstr "Nom d'Icona"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 #, fuzzy
 msgid "View"
 msgstr "Mode Bàsic"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Mida Bàsica"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 #, fuzzy
 msgid "Show Icon Extension"
 msgstr "Mostra l'Etiqueta d'Icona"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 #, fuzzy
 msgid "Show Desktop Icons"
 msgstr "Mostra els icones de Taula de Treball"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 #, fuzzy
 msgid "Show Toolbar"
 msgstr "Color d'Ombra"
 
-#: src/modules/fileman/e_mod_config.c:257
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:729
+msgid "Behavior"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:270
 #, fuzzy
 msgid "Show HAL icons on desktop"
 msgstr "Mostra la Taula de Treball"
 
-#: src/modules/fileman/e_mod_config.c:261
-#: src/modules/gadman/e_mod_gadman.c:729
-msgid "Behavior"
+#: 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:1187
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr "Pujar al Directori Pare"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "Afegeix Aplicació"
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Obre"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Obre amb ..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "Aplicacions"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Aplicacions Específiques"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 #, fuzzy
 msgid "Custom Command"
 msgstr "Executa Comanda"
@@ -6478,40 +6630,40 @@ msgstr "Finestra Prèvia "
 msgid "Select a window"
 msgstr "Seleccioneu una Finestra"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 #, fuzzy
 msgid "IBar Settings"
 msgstr "Paràmetres"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Etiquetes d'Icones"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Mostra l'Etiqueta d'Icona"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "Mostra el Nom d'Aplicació"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "Mostra el Comentari d'Aplicació"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "Mostra les Aplicacions Genèriques "
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "Crea una Nova ibar "
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "Introdueix un nom per aquest nou codi"
 
@@ -6528,29 +6680,29 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Estàs Segur que vol eliminar aquesta \"barra\" ?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Canvia les Propietats de l'Icona"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Borra Icona"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 #, fuzzy
 msgid "Add An Icon"
 msgstr "Afegeix Aplicació"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 #, fuzzy
 msgid "Create New Icon"
 msgstr "Crea Icona"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Afegeix Aplicació"
 
@@ -6604,98 +6756,98 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr "Paràmetres"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 msgid "Flip desktop on mouse wheel"
 msgstr "Canvia de Taula de Treballi quan el ratolí estigui a l'extrem"
 
-#: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:164
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 #, fuzzy
 msgid "Show desktop names"
 msgstr "Mostra els icones de Taula de Treball"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 #, fuzzy
 msgid "Popup Settings"
 msgstr "Paràmetres de Popups"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 #, fuzzy
 msgid "Show popup on desktop change"
 msgstr "Mostra l'Indicador de Taula de Treball en canviar"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 #, fuzzy
 msgid "Show popup for urgent windows"
 msgstr "Mostra el Popup en una Finestra Urgent"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr "Seleccioni i Rellisqui botó"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "Click al conjunt"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 #, fuzzy
 msgid "Drag whole desktop"
 msgstr "Taula de Treball Virtual"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "Resistència en Arrastrar Finestres"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 #, fuzzy
 msgid "Popup pager height"
 msgstr "Velocitat Desplegable"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 #, fuzzy
 msgid "Popup speed"
 msgstr "Velocitat Desplegable"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f segons"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 #, fuzzy
 msgid "Urgent Window Settings"
 msgstr "Finestra Urgent"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 #, fuzzy
 msgid "Show popup on urgent window"
 msgstr "Mostra el Popup en una Finestra Urgent"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6703,12 +6855,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:344
+#: src/modules/pager/e_mod_config.c:343
 #, fuzzy
 msgid "Attetion"
 msgstr "Acció"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 #, fuzzy
 msgid ""
 "You cannot use the right mouse button in the<br>shelf for this as it is "
@@ -6718,33 +6870,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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Botó %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 #, fuzzy
 msgid "Show Pager Popup"
 msgstr "Paràmetres de Popups"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "Salta a la Taula de Treball de la Dreta"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "Salta a la Taula de Treball de l'Esquerra"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "Salta a la Taula de Treball de Dalt"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "Salta a la Taula de Treball de Baix"
@@ -7014,7 +7166,7 @@ msgstr ""
 msgid "Right:"
 msgstr "Lluminós"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr ""
 
@@ -7060,12 +7212,12 @@ msgstr "Configuració del Mòdul"
 msgid "Mixer Settings Updated"
 msgstr "Configuració Actualitzada"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 #, fuzzy
 msgid "Controls"
 msgstr "Comores"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -7103,6 +7255,19 @@ msgstr "Aplicacions Específiques"
 msgid "Networks"
 msgstr ""
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "Sistema"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Configura Taules de Treball Virtuals "
 
diff --git a/po/cs.gmo b/po/cs.gmo
index 5dfcc8d..c431e02 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index b4a4947..a919a9e 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-04-22 22:52+1000\n"
-"PO-Revision-Date: 2009-04-19 18:59+0100\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
+"PO-Revision-Date: 2009-06-11 15:29+0100\n"
 "Last-Translator: quaker66 <quaker66 at gmail.com>\n"
 "Language-Team: easylinux <easylinux at sachiel.eu>\n"
 "MIME-Version: 1.0\n"
@@ -18,20 +18,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "O Enlightenmentu"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -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-2006, Tým vývojářů Enlightenmentu.<br><br>Doufáme, že "
+"Copyright &copy; 1999-2008, 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 "
@@ -74,383 +74,385 @@ 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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Ano"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Ne"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Opravdu chcete jít pryč?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Opravdu se chcete odhlásit?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Opravdu chcete vypnout PC?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Opravdu chcete restartovat PC?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 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:2047
+#: src/bin/e_actions.c:2061
 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:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Opravdu chcete hibernovat PC?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 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:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Okno : Akce"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Přesunout"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Změnit velikost"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Menu okna"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Do popředí"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Nižší"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Zabít"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Okno : Stav"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Přepnout lepkavý mód"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Přepnout ikonický mód"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Přepnout fullscreen mód"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maximalizovat"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Maximalizovat vertikálně"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Maximalizovat horizontálně"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Maximalizovat fullscreen"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Mód maximalizace \"Chytrý\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Mód maximalizace \"Roztáhnout\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Mód maxilaizace \"Vyplnit\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Zarolovat okno nahoru"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Zarolovat okno dolů"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "Zarolovat okno doleva"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Zarolovat okno doprava"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Změnit mód stínu"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Přepnout stav bez rámů"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "Přepnout přitlačený stav"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Plocha"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Překlopit desktop doleva"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Překlopit desktop doprava"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Překlopit plochu nahoru"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Překlopit desktop dolů"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Překlopit plochu z..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Zobrazit plochu"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
 msgstr "Zobrazit panel"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Překlopit plochu na..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Překlopit plochu lineárně"
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Přejít na plochu 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Přejít na plochu 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Přejít na plochu 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Přejít na plochu 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Přejít na plochu 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Přejít na plochu 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Přejít na plochu 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Přejít na plochu 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Přejít na plochu 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Přejít na plochu 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Přejít na plochu 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Přejít na plochu 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Přejít na plochu..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Překlopit desktop doleva (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Překlopit plochu doprava (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Překlopit plochu nahoru (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Překlopit desktop dolů (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Překlopit plochu z... (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Překlopit plochu na... (Všechny obrazovkyú"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Překlopit plochu lineárně... (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
 msgstr "Překlopit plochu ve směru..."
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Přejít na plochu 0 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Přejít na plochu 1 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Přejít na plochu 2 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Přejít na plochu 3 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Přejít na plochu 4 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Přejít na plochu 5 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Přejít na plochu 6 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Přejít na plochu 7 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Přejít na plochu 8 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Přejít na plochu 9 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Přejít na plochu 10 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Přejít na plochu 11 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Přejít na plochu... (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -460,102 +462,114 @@ msgstr "Přejít na plochu... (Všechny obrazovky)"
 msgid "Screen"
 msgstr "Obrazovka"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Poslat myš na obrazovku 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Poslat myš na obrazovku 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Poslat myš na obrazovku..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Poslat myš dopředu o jednu obrazovku"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Poslat myš zpět o jednu obrazovku"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Poslat myš dopředu/zpět..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Okno : Pohyb"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "Na další plochu"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Na předchozí plochu"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "Z plochy #..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Na plochu..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Zobrazit hlavní menu"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Zobrazit menu oblíbených"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Zobrazit všechny menu aplikací"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Zobrazit menu oken"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Zobrazit menu..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Příkaz"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Aplikace"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Restartovat"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Pryč"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
 msgstr "Pryč teď"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment : Mód"
+
+#: src/bin/e_actions.c:2808
+msgid "Presentation Mode Toggle"
+msgstr "Přepnout mód prezentace"
+
+#: src/bin/e_actions.c:2813
+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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -568,55 +582,55 @@ msgstr "Pryč teď"
 msgid "System"
 msgstr "Systém"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Odhlásit se"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr "Vypnout nyní"
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr "Vypnout"
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Restartovat"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Uspat"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Hibernovat"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 msgid "Lock"
 msgstr "Zamknout"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Vyčistit okna"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr "Různé : Akce"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
 msgstr "Zpožděná akce"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Použít jako pozadí"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "Scan desktop souborů dokončen."
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "Scan desktop souboru"
 
@@ -624,13 +638,14 @@ msgstr "Scan desktop souboru"
 msgid "Color Selector"
 msgstr "Výběr barvy"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -645,7 +660,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -657,7 +672,7 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 +690,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:746
+#: src/bin/e_config.c:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -689,11 +704,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:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
 msgstr "Nastavení aktualizováno"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -704,7 +719,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:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -719,7 +734,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:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -732,7 +747,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:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -745,7 +760,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:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -756,11 +771,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:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problémy při zápisu konfigurace E17"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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,7 +801,7 @@ msgid "Modules"
 msgstr "Moduly"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Rozšíření"
 
@@ -795,22 +810,22 @@ msgstr "Rozšíření"
 msgid "Container %d"
 msgstr "Kontejner %i"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Chyba - žádná podpora PAM"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 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:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Uzamčení selhalo"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -819,15 +834,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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Prosím zadejte heslo pro odemčení"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Chyba systému autentizace"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -838,6 +853,28 @@ 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
+msgid "Activate Presentation Mode?"
+msgstr "Povolit prezentační mód?"
+
+#: src/bin/e_desklock.c:1040
+msgid ""
+"You unlocked desktop too fast.<br><br>Would you like to enable "
+"<b>presentation</b> mode and temporarily disable screen saver, lock and "
+"power saving?"
+msgstr ""
+"Odemkli jste obrazovku příliš rychle.<br><br>Chtěli byste povolit "
+"<b>prezentační mód</b> a dočasně vypnout spořič, zámek obrazovky a správu "
+"napájení?"
+
+#: src/bin/e_desklock.c:1051 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
+msgid "No, and stop asking"
+msgstr "Ne, a přestat se ptát"
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Nekompletní vlastnosti okna"
@@ -936,23 +973,23 @@ msgstr "Vyberte ikonu"
 msgid "Select an Executable"
 msgstr "Vyberte spustitelný soubor"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Vystřihnout"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Vložit"
 
@@ -986,259 +1023,307 @@ msgstr ""
 "Enlightenment nedokázal spustit aplikaci:<br><br>%s<br><br>Aplikace selhala "
 "při startu."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Chyba při spouštění aplikace"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "Proces %s se neočekávaně ukončil."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, 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:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s byl přerušen signálem interrupt."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s byl přerušen signálem quit."
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s byl přerušen signálem abort."
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, 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:454
+#: src/bin/e_exec.c:455
 #, 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:457
+#: src/bin/e_exec.c:458
 #, 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:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s byl přerušen chybou roury."
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, 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:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s byl přerušen chybou sběrnice."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, 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:525
+#: src/bin/e_exec.c:528
 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:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Chybové záznamy"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Nebyla zaznamenána žádná chybová zpráva."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Uložit tuto zprávu"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, 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:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Chybová informace"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Informace o chybovém signálu"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Výstupní data"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Nebyl zaznamenán žádný výstup."
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr "Neexistující cesta"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s neexistuje."
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+msgid "Mount Error"
+msgstr "Chyba při připojování"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr "Nemůžu připojit zařízení"
+
+#: src/bin/e_fm.c:3047
+msgid "Unmount Error"
+msgstr "Chyba při odpojování"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr "Nemůžu odpojit zařízení"
+
+#: src/bin/e_fm.c:3062
+msgid "Eject Error"
+msgstr "Chyba při vysouvání"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr "Nemůžu vysunout zařízení"
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i souborů"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
 msgstr "Odkaz"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr "Zrušit"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
 msgstr "Nastavení odvození rodiče"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Režim zobrazení"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Obnovit"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Zobrazit skryté soubory"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "Zapamatovat řazení"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Setřídit teď"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nový adresář"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr "Odpojit"
+
+#: src/bin/e_fm.c:8063
+msgid "Mount"
+msgstr "Připojit"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr "Vysunout"
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
 msgstr "Použít výchozí"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Ikony v mřížce"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Vlastní ikony"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Seznam"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Velikost ikon (%d)"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+msgid "Set background..."
+msgstr "Nastavit pozadí..."
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+msgid "Set overlay..."
+msgstr "Nastavit překrytí..."
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Vymazat"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Vytvořit složku"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Název nové složky:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Přejmenovat %s na:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Přejmenovat soubor"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr "Zkusit znovu"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Chyba"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr "Ne všem"
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr "Ano všem"
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 msgid "Warning"
 msgstr "Varování"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, 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:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr "Ignorovat"
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr "Ignorovat vše"
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, 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:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Odsouhlasit smazání"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, 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:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1298,8 +1383,8 @@ msgid "Preview"
 msgstr "Náhled"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: 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í"
 
@@ -1308,7 +1393,7 @@ msgid "Thumbnail"
 msgstr "Náhled"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Vlastní"
 
@@ -1324,70 +1409,70 @@ msgstr "Info o odkazu"
 msgid "Select an Image"
 msgstr "Vybrat obrázek"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr "Neznámý svazek"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "Výměnné zařízení"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Plochý"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Vnořený"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Vzhled"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Automaticky skorolovat obsah"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Schopnost měnit velikost"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Přesunout nebo změnit velikost tohoto gadgetu"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Odstranit gadget"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "Uzamknout tento gadget"
 
@@ -1438,8 +1523,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1447,7 +1532,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Skládání"
 
@@ -1625,12 +1710,12 @@ msgstr "Fullscreen"
 msgid "Window List"
 msgstr "Seznam oken"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Pager"
 
@@ -1910,11 +1995,11 @@ msgstr "Automaticky aktivovat při startu"
 #: 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr "Volby"
 
@@ -1948,8 +2033,8 @@ msgstr "Nahrané moduly"
 msgid "Unload Module"
 msgstr "Deaktivovat modul"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1979,12 +2064,12 @@ msgstr "Vybrané gadgety"
 msgid "Remove Gadget"
 msgstr "Odstranit gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 msgid "Toolbar Settings"
 msgstr "Nastavení panelu nástrojů"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Rozložení"
 
@@ -2069,121 +2154,121 @@ msgstr "(Žádná okna)"
 msgid "No name!!"
 msgstr "Beze jména!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(Žádné panely)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Panel #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Přidat panel"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Smazat panel"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Nastavení panelu"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Drobný"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Střední"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Větší"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Mohutný"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 msgid "Set Contents..."
 msgstr "Nstavit obsah..."
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Nad vším"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Pod okny"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Pod vším"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "Povolit oknům překrýt panel"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Zúžit na velikost obsahu"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixelů"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Styly"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "Automatické skrývání"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "Automaticky skrývat panel"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "Zobrazit, když je myš na"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "Zobrazit při kliknutí myší"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "Čas před skrytím"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekund"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "Doba skrývání"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "Zobrazit na všech plochách"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "Zobrazit na vybraných plochách"
 
@@ -2573,8 +2658,8 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenmentu se nepodařilo spustit systém dnd."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
-msgstr "Nastavuji Grab Input Handing"
+msgid "Setup Grab Input Handling"
+msgstr "Nastavit správu zachycení vstupu"
 
 #: src/bin/e_main.c:872
 msgid "Enlightenment cannot set up its input grab handling system."
@@ -2760,29 +2845,39 @@ msgstr "Enlightenment %s Modul"
 msgid "Would you like to unload this module?<br>"
 msgstr "Chcete tento modul uvolnit?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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 ""
+"Vypnuli jste spořič příliš rychle.<br><br>Chtěli byste povolit "
+"<b>prezentační mód</b> a dočasně vypnout spořič, zámek obrazovky a správu "
+"napájení?"
+
+#: src/bin/e_shelf.c:1272 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:1259
+#: src/bin/e_shelf.c:1273
 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:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 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:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 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:1692
+#: src/bin/e_shelf.c:1703
 msgid "Set Shelf Contents"
 msgstr "Nastavit obsah panelu"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Smazat tento panel"
 
@@ -2933,7 +3028,7 @@ msgstr "O tématu"
 msgid "Set As Theme"
 msgstr "Použít jako téma"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 msgid "Set Toolbar Contents"
 msgstr "Nastavit obsah toolbaru"
 
@@ -2951,67 +3046,67 @@ 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:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f bajtů"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f kB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "V budoucnu"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "V poslední minutě"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "Před %li lety"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "Před %li měsíci"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "Před %li týdny"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "Před %li dny"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "Před %li hodinami"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "Před %li minutami"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3023,7 +3118,7 @@ msgstr "Neznámý"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Přidat"
 
@@ -3046,7 +3141,7 @@ msgid "Add to Favorites"
 msgstr "Přidat do oblíbených"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3160,6 +3255,7 @@ msgid "Internal"
 msgstr "Interní"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
@@ -3171,24 +3267,24 @@ msgstr "Hardware"
 msgid "Battery"
 msgstr "Baterie"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr "Hladina vaší baterie je nízká!"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr "Doporučena je AC energie."
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr "CHYBA"
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr "Měřič baterie"
 
@@ -3197,10 +3293,22 @@ msgid "Clock"
 msgstr "Hodiny"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
 msgstr "Ovládací centrum"
 
+#: src/modules/conf/e_mod_main.c:234
+msgid "Presentation"
+msgstr "Prezentace"
+
+#: src/modules/conf/e_mod_main.c:241
+msgid "Offline"
+msgstr "Offline"
+
+#: src/modules/conf/e_mod_main.c:269
+msgid "Modes"
+msgstr "Módy"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3223,7 +3331,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:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "Všechny aplikace"
 
@@ -3578,41 +3686,53 @@ msgstr "Nastavit"
 msgid "Desk"
 msgstr "Plocha"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "Nastavení uzamčení obrazovky"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Automatické zamykání"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 msgid "Lock when Enlightenment starts"
 msgstr "Zamknout při startu Enlightenmentu"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
 msgstr "Uzamknout při aktivaci spořiče"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+msgid "Time after screensaver activated"
+msgstr "Čas, po kterém se aktivuje spořič"
+
+#: 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 sekund"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
 msgid "Lock when idle time exceeded"
 msgstr "Uzamknout při překročení času klidu"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:184
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
 msgid "Idle time to exceed"
 msgstr "Čas klidu"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 minut"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3623,27 +3743,27 @@ msgstr "%1.0f minut"
 msgid "Personal"
 msgstr "Osobní"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Nastavení přihlašovací obrazovky"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
 msgstr "Zobrazit na všech zónách obrazovky"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr "Zobrazit na nynější zóně obrazovky"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
 msgstr "Zobrazit na zóně obrazovky #:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3652,29 +3772,48 @@ msgstr "Zobrazit na zóně obrazovky #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Mód pozadí"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
 #: src/modules/gadman/e_mod_config.c:149
 msgid "Theme Defined"
 msgstr "Definováno tématem"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Pozadí tématu"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+msgid "User Wallpaper"
+msgstr "Uživatelské pozadí"
+
+#: 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 "Vstup do prezentačního módu"
+
+#: 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 "Nabídnout vstup do prezentačního módu"
+
+#: 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 "Pokud byl deaktivován před"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:457
 msgid "Custom Screenlock"
 msgstr "Vlastní screenlock"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "Použít vlastní screenlock"
 
@@ -3682,59 +3821,73 @@ msgstr "Použít vlastní screenlock"
 msgid "Screen Lock"
 msgstr "Zamčení obrazovky"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "Nastavení virtuálních ploch"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Počet ploch"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Překlopení plochy myší"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "Animované překlopení"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Plochy"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Překlopit, když posunete objekty na kraj obrazovky"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: src/modules/conf_desks/e_int_config_desks.c:298
 msgid "Wrap desktops around when flipping"
 msgstr "Překlopit zpět na první plochu z poslední"
 
-#: src/modules/conf_desks/e_int_config_desks.c:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "Animace překlopení"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Vypnuto"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "Pole"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Přiblížení"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 sek"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+msgid "Background panning"
+msgstr "Panorama"
+
+#: src/modules/conf_desks/e_int_config_desks.c:321
+#, c-format
+msgid "%.2f X-axis pan factor"
+msgstr "%.2f faktor panoramatu na ose X"
+
+#: src/modules/conf_desks/e_int_config_desks.c:325
+#, c-format
+msgid "%.2f Y-axis pan factor"
+msgstr "%.2f faktor panoramatu na ose Y"
+
 #: src/modules/conf_desks/e_mod_main.c:35
 msgid "Virtual Desktops"
 msgstr "Virtuální plochy"
@@ -3750,8 +3903,8 @@ msgstr "Nastavení dialogů"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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í"
@@ -3921,23 +4074,23 @@ msgstr "Aktivní zobrazovací server nemá <br>DPMS rozšíření."
 msgid "Display Power Management Settings"
 msgstr "Zobrazit nastavení správy napájení"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
 msgid "Enable Display Power Management"
 msgstr "Povolit správu napájení obrazu"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
 msgstr "Časovače"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "Rezervní čas"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "Suspend čas"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "Čas vypnutí"
 
@@ -4513,7 +4666,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pixelů"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr "Práh pro aplikaci síly táhnutí"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4733,7 +4886,7 @@ msgid "Select an Edj File"
 msgstr "Vybrat Edj soubor"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Soubory"
 
@@ -5077,55 +5230,50 @@ msgstr "Maximum"
 msgid "Scaling"
 msgstr "Škálování"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Nastavení spořiče"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 "Povolit X spořič"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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 "Časovač(e) spořiče"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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 "Čas, než se X spořič spustí"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
 msgstr "Čas, než se X spořič změní"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f sekund"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "Mazání"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Preferováno"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "Nepreferováno"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr "Události vystavení"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Povolit"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "Nepovolovat"
 
@@ -5138,7 +5286,7 @@ msgid "Configured Shelves"
 msgstr "Nastavené panely"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 msgid "Setup"
 msgstr "Nastavení"
 
@@ -5182,10 +5330,6 @@ msgstr "Kategorie tématu"
 msgid "Assign"
 msgstr "Přiřadit"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "Vymazat"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "Vymazat vše"
@@ -6034,27 +6178,19 @@ msgstr "Stíny"
 msgid "Run Command Dialog"
 msgstr "Dialog Spustit"
 
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount error"
-msgstr "Chyba připojení"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr "Připojení zařízení selhalo"
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
 msgstr "Domov"
 
-#: src/modules/fileman/e_mod_main.c:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
 msgstr "Oblíbené"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
 msgstr "Kořenový adresář"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -6072,7 +6208,7 @@ msgstr ""
 "si můžete nastavit modul zpět k obrazu svému.<br>Omlouváme se za způsobené "
 "potíže.<br>"
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -6087,92 +6223,100 @@ msgstr ""
 "modulu. Je to zlé a jako protiopatření<br>bylo vaše nastavení vráceno do "
 "původních hodnot.<br>Omlouvám se za vzniklé potíže.<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
 msgstr "Nastavení fileman modulu aktualizováno"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr "Nastavení fileman modulu"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Velikost ikon"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
 msgstr "Pohled"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr "Otevřít adresáře ve stejném okně"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "První řadit adresáře"
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 msgid "Case Sensitive"
 msgstr "Rozlišovat velikost písmen"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "Pouze jedno kliknutí"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr "Použít alternativní výběrové modifikátory"
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr "Zobrazit příponu ikony"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "Zobrazit plnou cestu"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr "Zobrazit ikony na ploše"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr "Zobrazit toolbar"
 
-#: src/modules/fileman/e_mod_config.c:257
-msgid "Show HAL icons on desktop"
-msgstr "Zobrazit HAL ikony na ploše"
-
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
 msgstr "Chování"
 
-#: src/modules/fileman/e_fwin.c:1187
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr "Zobrazit HAL ikony na ploše"
+
+#: src/modules/fileman/e_mod_config.c:273
+msgid "Mount volumes on insert"
+msgstr "Připojit zařízení při vložení"
+
+#: src/modules/fileman/e_mod_config.c:276
+msgid "Open filemanager on mount"
+msgstr "Otevřít správce souborů při připojení"
+
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr "Jít do předchozího adresáře"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 msgid "Other application..."
 msgstr "Jiná aplikace..."
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Otevřít"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Otevřít s.."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 msgid "Known Applications"
 msgstr "Známé aplikace"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Specifické aplikace"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr "Vlastní příkaz"
 
@@ -6261,39 +6405,39 @@ msgstr "Předchozí okno"
 msgid "Select a window"
 msgstr "Vybrat okno"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
 msgstr "iBar nastavení"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Vybraný zdroj iBaru"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Názvy ikon"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Zobrazit název ikony"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "Zobrazit název programu"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "Zobrazit komentář programu"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "Zobrazit obecné info programu"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "Vytvořit nový iBar zdroj"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "Zadejte jméno pro tento nový zdroj:"
 
@@ -6309,27 +6453,27 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Jste si jistí, že chcete vymazat tento iBar zdroj?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Změnit vlastnosti ikony"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Odstranit ikonu"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr "Přidat ikonu"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr "Vytvořit novou ikonu"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Přidat aplikaci"
 
@@ -6381,89 +6525,89 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr "Nastavení přepínače ploch"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 msgid "Flip desktop on mouse wheel"
 msgstr "Překlopit plochy kolečkem myši"
 
-#: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:164
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 msgid "Show desktop names"
 msgstr "Zobrazit jména ploch"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr "Nastavení pop-up"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr "Zobrazit popup při změně plochy"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr "Zobrazit popup pro důležitá okna"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr "Vybrat a přemístit tlačítko"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "Klikněte k nastavení"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr "Tlačítko Táhnout a pustit"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr "Táhnout celou plochu"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr "Výška keyaction popup"
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "Odpor k táhnutí"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr "Výška popup pageru"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr "Rychlost popup"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekund"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr "Nastavení důležitého okna"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr "Zobrazit popup na důležitém oknu"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 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:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr "Uchopení pager tlačítka"
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6471,11 +6615,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:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr "Pozor"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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 "
@@ -6485,29 +6629,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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Tlačítko %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr "Zobrazit pager popup"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr "Popup plochy doprava"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr "Popup plochy doleva"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr "Popup plochy nahoru"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr "Popup plochy dolů"
 
@@ -6753,7 +6897,7 @@ msgstr "Levý:"
 msgid "Right:"
 msgstr "Pravý:"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr "Ztlumit"
 
@@ -6793,11 +6937,11 @@ msgstr "Nastavení modulu Mixer"
 msgid "Mixer Settings Updated"
 msgstr "Nastavení Mixer modulu aktualizováno"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
 msgstr "Ovládací prvky"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6833,6 +6977,21 @@ msgstr "Specifické zařízení"
 msgid "Networks"
 msgstr "Sítě"
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr "Jiná upozorňovací oblast už existuje"
+
+#: src/modules/systray/e_mod_main.c:872
+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:1070
+msgid "Systray"
+msgstr "Upozorňovací oblast"
+
+#~ msgid "Mount of device failed"
+#~ msgstr "Připojení zařízení selhalo"
+
 #~ msgid "Shelf Size"
 #~ msgstr "Velikost panelu"
 
diff --git a/po/da.gmo b/po/da.gmo
index a8e49dc..2074cac 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index bcb6f23..f569f39 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2005-11-20 11:18+0100\n"
 "Last-Translator: Martin Geisler <mgeisler at mgeisler.net>\n"
 "Language-Team: Danish\n"
@@ -19,20 +19,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Om Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -76,49 +76,51 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Er du sikker på at du vil afslutte?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nej"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Er du sikker på at du vil afslutte?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 #, fuzzy
 msgid "Are you sure you want to log out?"
 msgstr "Er du sikker på at du vil afslutte?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 #, fuzzy
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 #, fuzzy
 msgid "Are you sure you want to turn off?"
 msgstr "Er du sikker på at du vil afslutte?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 #, fuzzy
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
@@ -127,12 +129,12 @@ msgstr ""
 "Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
 "afslutte?"
 
-#: src/bin/e_actions.c:1981
+#: src/bin/e_actions.c:1995
 #, fuzzy
 msgid "Are you sure you want to reboot?"
 msgstr "Er du sikker på at du vil afslutte?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 #, fuzzy
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
@@ -141,7 +143,7 @@ msgstr ""
 "Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
 "afslutte?"
 
-#: src/bin/e_actions.c:2047
+#: src/bin/e_actions.c:2061
 #, fuzzy
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
@@ -150,12 +152,12 @@ msgstr ""
 "Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
 "afslutte?"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 #, fuzzy
 msgid "Are you sure you want to hibernate?"
 msgstr "Er du sikker på at du vil afslutte?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 #, fuzzy
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
@@ -164,365 +166,365 @@ msgstr ""
 "Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
 "afslutte?"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Valg af vinduesramme"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr ""
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 #, fuzzy
 msgid "Resize"
 msgstr "Modstand"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 #, fuzzy
 msgid "Menu"
 msgstr "Manuel"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 #, fuzzy
 msgid "Window Menu"
 msgstr "Vinduesrolle"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr ""
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 #, fuzzy
 msgid "Lower"
 msgstr "Lav"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Dræb"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Vinduetype"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 #, fuzzy
 msgid "Fullscreen Mode Toggle"
 msgstr "Fuldskærm tilstand"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 #, fuzzy
 msgid "Maximize"
 msgstr "Maksimeret"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 #, fuzzy
 msgid "Maximize Vertically"
 msgstr "Maksimeringspolitik"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 #, fuzzy
 msgid "Maximize Horizontally"
 msgstr "Centrér horizontalt"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 #, fuzzy
 msgid "Maximize Fullscreen"
 msgstr "Fuldskærm"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 #, fuzzy
 msgid "Maximize Mode \"Smart\""
 msgstr "Maksimeret tilstand"
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 #, fuzzy
 msgid "Maximize Mode \"Fill\""
 msgstr "Maksimeringspolitik"
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 #, fuzzy
 msgid "Toggle Borderless State"
 msgstr "Uden ramme"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 #, fuzzy
 msgid "Toggle Pinned State"
 msgstr "Uden ramme"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 #, fuzzy
 msgid "Desktop"
 msgstr "Skriveborde"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 #, fuzzy
 msgid "Flip Desktop Left"
 msgstr "Skrivebordsnavn"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 #, fuzzy
 msgid "Flip Desktop Up"
 msgstr "Skriveborde"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 #, fuzzy
 msgid "Show The Desktop"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 #, fuzzy
 msgid "Switch To Desktop 0"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 #, fuzzy
 msgid "Switch To Desktop 1"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 #, fuzzy
 msgid "Switch To Desktop 2"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 #, fuzzy
 msgid "Switch To Desktop 3"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 #, fuzzy
 msgid "Switch To Desktop 4"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 #, fuzzy
 msgid "Switch To Desktop 5"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 #, fuzzy
 msgid "Switch To Desktop 6"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 #, fuzzy
 msgid "Switch To Desktop 7"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 #, fuzzy
 msgid "Switch To Desktop 8"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 #, fuzzy
 msgid "Switch To Desktop 9"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 #, fuzzy
 msgid "Switch To Desktop 10"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 #, fuzzy
 msgid "Switch To Desktop 11"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 #, fuzzy
 msgid "Switch To Desktop..."
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Skrivebordsnavn"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Skriveborde"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "Skrivebordsnavn"
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -533,109 +535,124 @@ msgstr "Send til skrivebord"
 msgid "Screen"
 msgstr "Skærmzone"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: 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
 msgid "Window : Moving"
 msgstr "Op- og nedrulning af vinduer"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 #, fuzzy
 msgid "To Next Desktop"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 #, fuzzy
 msgid "By Desktop #..."
 msgstr "Skriveborde"
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 #, fuzzy
 msgid "To Desktop..."
 msgstr "Skriveborde"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 #, fuzzy
 msgid "Show All Applications Menu"
 msgstr "(Ingen applikationer)"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr ""
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 #, fuzzy
 msgid "Command"
 msgstr "Udfør kommando"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 #, fuzzy
 msgid "Application"
 msgstr "(Ingen applikationer)"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr ""
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr ""
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment %s modul"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Fuldskærm tilstand"
+
+#: src/bin/e_actions.c:2813
+#, fuzzy
+msgid "Offline Mode Toggle"
+msgstr "Fuldskærm tilstand"
+
+#: 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -648,59 +665,59 @@ msgstr ""
 msgid "System"
 msgstr ""
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr ""
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr ""
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 #, fuzzy
 msgid "Hibernate"
 msgstr "Lineær"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 #, fuzzy
 msgid "Lock"
 msgstr "Låsninger"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Ryd vinduer op"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "Valg af vinduesramme"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Delayed Action"
 msgstr "Moduler"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr ""
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "Skriveborde"
@@ -709,13 +726,14 @@ msgstr "Skriveborde"
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -730,7 +748,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -742,7 +760,7 @@ msgstr "O.k."
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -762,7 +780,7 @@ msgstr ""
 "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:746
+#: src/bin/e_config.c:760
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -778,12 +796,12 @@ msgstr ""
 "som en forholdsregel er din konfiguration nu sat tilbage til\n"
 "standardværdierne. Beklager ulejligheden.\n"
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "Andre indstillinger"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -791,7 +809,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -801,7 +819,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -810,7 +828,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -819,7 +837,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -827,12 +845,12 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment opsætning"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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
@@ -860,7 +878,7 @@ msgid "Modules"
 msgstr "Moduler"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr ""
 
@@ -869,34 +887,34 @@ msgstr ""
 msgid "Container %d"
 msgstr "Beholder %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -904,6 +922,25 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
+#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr ""
@@ -1007,24 +1044,24 @@ msgstr "Vælg et vindue"
 msgid "Select an Executable"
 msgstr "Vælg et vindue"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Slet"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 #, fuzzy
 msgid "Cut"
 msgstr "Klip"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Kopier"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 #, fuzzy
 msgid "Paste"
 msgstr "Hurtig"
@@ -1062,275 +1099,329 @@ msgid ""
 "application failed to start."
 msgstr ""
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr ""
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:628
+#: src/bin/e_exec.c:631
 #, fuzzy
 msgid "Error Information"
 msgstr "Vis information"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 #, fuzzy
 msgid "Error Signal Information"
 msgstr "Vis information"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Udførselsfejl"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Udførselsfejl"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Udførselsfejl"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, fuzzy, c-format
 msgid "%i Files"
 msgstr "Filer"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 #, fuzzy
 msgid "Link"
 msgstr "Lineær"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 #, fuzzy
 msgid "Abort"
 msgstr "Om..."
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Fokusindstillinger"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 #, fuzzy
 msgid "View Mode"
 msgstr "Tilpasningstilstand"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 #, fuzzy
 msgid "Remember Ordering"
 msgstr "Husk ved hjælp af"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Omdøb"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Moduler"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 #, fuzzy
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 #, fuzzy
 msgid "Use default"
 msgstr "Slet"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 #, fuzzy
 msgid "Grid Icons"
 msgstr "Ikon"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 #, fuzzy
 msgid "Custom Icons"
 msgstr "Klip"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 #, fuzzy
 msgid "List"
 msgstr "Overspring i vinduesliste"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "Størrelse"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Basas info"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+msgid "Set overlay..."
+msgstr ""
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+#, fuzzy
+msgid "Clear"
+msgstr "Nær"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, fuzzy, c-format
 msgid "Rename %s to:"
 msgstr "Omdøb"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 #, fuzzy
 msgid "Rename File"
 msgstr "Omdøb"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 #, fuzzy
 msgid "Error"
 msgstr "Udførselsfejl"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "Starter %s"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Er du sikker på at du vil afslutte?"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 #, fuzzy
 msgid "Confirm Delete"
 msgstr "Slet"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, fuzzy, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Er du sikker på at du vil afslutte?"
 
-#: src/bin/e_fm.c:8730
+#: src/bin/e_fm.c:9251
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1392,8 +1483,8 @@ msgid "Preview"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: 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"
@@ -1403,7 +1494,7 @@ msgid "Thumbnail"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 #, fuzzy
 msgid "Custom"
 msgstr "Klip"
@@ -1422,70 +1513,70 @@ msgstr "Vis information"
 msgid "Select an Image"
 msgstr "Vælg et vindue"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1534,8 +1625,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1543,7 +1634,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Niveau"
 
@@ -1732,12 +1823,12 @@ msgstr "Fuldskærm"
 msgid "Window List"
 msgstr "Overspring i vinduesliste"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 #, fuzzy
 msgid "Pager"
 msgstr "Fare"
@@ -2032,11 +2123,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 #, fuzzy
 msgid "Settings"
 msgstr "Andre indstillinger"
@@ -2078,8 +2169,8 @@ msgstr "(Ingen indlæste moduler)"
 msgid "Unload Module"
 msgstr "Fejl ved indlæsning af modul"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2112,13 +2203,13 @@ msgstr "Dimser"
 msgid "Remove Gadget"
 msgstr "Dimser"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 #, fuzzy
 msgid "Toolbar Settings"
 msgstr "Basale indstillinger"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr ""
 
@@ -2213,131 +2304,131 @@ msgstr "(Ingen vinduer)"
 msgid "No name!!"
 msgstr "Intet navn!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 #, fuzzy
 msgid "Delete A Shelf"
 msgstr "Slet"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 #, fuzzy
 msgid "Shelf Settings"
 msgstr "Andre indstillinger"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Super lille"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Medium"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Stor"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Kæmpe"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 msgid "Set Contents..."
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 #, fuzzy
 msgid "Above Everything"
 msgstr "Alting"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 #, fuzzy
 msgid "Below Windows"
 msgstr "(Ingen vinduer)"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 #, fuzzy
 msgid "Below Everything"
 msgstr "Alting"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 #, fuzzy
 msgid "Allow windows to overlap the shelf"
 msgstr "Følg vinduet når det flyttes"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, fuzzy, c-format
 msgid "%3.0f pixels"
 msgstr "%2.0f pixels"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 #, fuzzy
 msgid "Auto Hide"
 msgstr "Automatisk hævning"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 #, fuzzy
 msgid "Show on mouse in"
 msgstr "Skærmzone"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, fuzzy, c-format
 msgid "%.1f seconds"
 msgstr "%1.1f sek."
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 #, fuzzy
 msgid "Hide duration"
 msgstr "Konfiguration"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 #, fuzzy
 msgid "Show on all Desktops"
 msgstr "Send til skrivebord"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 #, fuzzy
 msgid "Show on specified Desktops"
 msgstr "Send til skrivebord"
@@ -2714,7 +2805,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment kan ikke initialisere sit dnd-system."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2909,12 +3000,19 @@ msgstr "Enlightenment %s modul"
 msgid "Would you like to unload this module?<br>"
 msgstr "Vil du gerne unloade dette modul?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
 #, fuzzy
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Er du sikker på at du vil afslutte?"
 
-#: src/bin/e_shelf.c:1259
+#: src/bin/e_shelf.c:1273
 #, fuzzy
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
@@ -2923,20 +3021,20 @@ msgstr ""
 "Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
 "afslutte?"
 
-#: src/bin/e_shelf.c:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Temaer"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr ""
 
@@ -3087,7 +3185,7 @@ msgstr "Om dette tema"
 msgid "Set As Theme"
 msgstr "Om dette tema"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Konfiguration"
@@ -3107,67 +3205,67 @@ msgstr ""
 "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:805
+#: src/bin/e_utils.c:806
 #, fuzzy, c-format
 msgid "%'.0f Bytes"
 msgstr "%2.0f pixels"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3179,7 +3277,7 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr ""
 
@@ -3203,7 +3301,7 @@ msgid "Add to Favorites"
 msgstr ""
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3322,6 +3420,7 @@ msgid "Internal"
 msgstr "Generelt"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
@@ -3333,24 +3432,24 @@ msgstr ""
 msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr ""
 
@@ -3360,11 +3459,25 @@ msgid "Clock"
 msgstr "Luk"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 #, fuzzy
 msgid "Settings Panel"
 msgstr "Andre indstillinger"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Udvidede indstillinger"
+
+#: src/modules/conf/e_mod_main.c:241
+msgid "Offline"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Moduler"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3390,7 +3503,7 @@ msgid "Restart Applications"
 msgstr "Favoritapplikationer"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 #, fuzzy
 msgid "All Applications"
 msgstr "(Ingen applikationer)"
@@ -3771,44 +3884,56 @@ msgstr ""
 msgid "Desk"
 msgstr "Skriveborde"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 #, fuzzy
 msgid "Screen Lock Settings"
 msgstr "Fokusindstillinger"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 #, fuzzy
 msgid "Automatic Locking"
 msgstr "Automatisk højde"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 #, fuzzy
 msgid "Lock when Enlightenment starts"
 msgstr "Enlightenment: Fejl!"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: 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:180
+#: 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
+#, fuzzy, c-format
+msgid "%1.0f seconds"
+msgstr "%1.1f sek."
+
+#: 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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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
 #, fuzzy, c-format
 msgid "%1.0f minutes"
 msgstr "10 min."
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3820,30 +3945,30 @@ msgstr "10 min."
 msgid "Personal"
 msgstr "Rettigheder:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 #, fuzzy
 msgid "Login Box Settings"
 msgstr "Fokusindstillinger"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 #, fuzzy
 msgid "Show on all screen zones"
 msgstr "Skærmzone"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: 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:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 #, fuzzy
 msgid "Show on screen zone #:"
 msgstr "Skærmzone"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3852,30 +3977,50 @@ msgstr "Skærmzone"
 #: 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/fileman/e_mod_config.c:220
+#: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "Skriveborde"
+
+#: 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
 #, fuzzy
 msgid "Custom Screenlock"
 msgstr "Skærmzone"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr ""
 
@@ -3884,66 +4029,81 @@ msgstr ""
 msgid "Screen Lock"
 msgstr "Skærmzone"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 #, fuzzy
 msgid "Virtual Desktops Settings"
 msgstr "Virtuelt skrivebord"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 #, fuzzy
 msgid "Number of Desktops"
 msgstr "Ny skrivebordesrække"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 #, fuzzy
 msgid "Desktops"
 msgstr "Skriveborde"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: 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:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 #, fuzzy
 msgid "Flip Animation"
 msgstr "Vis information"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 #, fuzzy
 msgid "Pane"
 msgstr "Fare"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 #, fuzzy
 msgid "Zoom"
 msgstr "Nederst"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 sek."
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Basas info"
+
+#: 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
 #, fuzzy
 msgid "Virtual Desktops"
@@ -3961,8 +4121,8 @@ msgstr "Basale indstillinger"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -4125,25 +4285,25 @@ msgstr ""
 msgid "Display Power Management Settings"
 msgstr "Basale indstillinger"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: 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:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 #, fuzzy
 msgid "Timers"
 msgstr "Temaer"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 #, fuzzy
 msgid "Suspend time"
 msgstr "Send til skrivebord"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr ""
 
@@ -4771,7 +4931,7 @@ msgid "%1.0f pixels"
 msgstr "%2.0f pixels"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -5004,7 +5164,7 @@ msgid "Select an Edj File"
 msgstr "Vælg et vindue"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Filer"
 
@@ -5378,58 +5538,53 @@ msgstr "Maksimal hastighed"
 msgid "Scaling"
 msgstr "Niveau"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 #, fuzzy
 msgid "Screen Saver Settings"
 msgstr "Fokusindstillinger"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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:168
+#: 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:170
-#, fuzzy, c-format
-msgid "%1.0f seconds"
-msgstr "%1.1f sek."
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 #, fuzzy
 msgid "Blanking"
 msgstr "Niveau"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 #, fuzzy
 msgid "Allow"
 msgstr "Langsom"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr ""
 
@@ -5443,7 +5598,7 @@ msgid "Configured Shelves"
 msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Skarp"
@@ -5492,11 +5647,6 @@ msgstr ""
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-#, fuzzy
-msgid "Clear"
-msgstr "Nær"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 #, fuzzy
 msgid "Clear All"
@@ -6407,30 +6557,21 @@ msgstr ""
 msgid "Run Command Dialog"
 msgstr "Udfør kommando"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "Udførselsfejl"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: 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:332
+#: src/modules/fileman/e_mod_main.c:322
 #, fuzzy
 msgid "Favorites"
 msgstr "Favoritapplikationer"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 #, fuzzy
 msgid "Root"
 msgstr "Opløsning"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: src/modules/fileman/e_mod_main.c:431
 #, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
@@ -6450,7 +6591,7 @@ msgstr ""
 "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:454
+#: src/modules/fileman/e_mod_main.c:444
 #, fuzzy
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
@@ -6467,101 +6608,109 @@ msgstr ""
 "som en forholdsregel er din konfiguration nu sat tilbage til\n"
 "standardværdierne. Beklager ulejligheden.\n"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 #, fuzzy
 msgid "Fileman Settings Updated"
 msgstr "Andre indstillinger"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 #, fuzzy
 msgid "Fileman Settings"
 msgstr "Andre indstillinger"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 #, fuzzy
 msgid "Icon Size"
 msgstr "Størrelse"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 #, fuzzy
 msgid "View"
 msgstr "Tilpasningstilstand"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Størrelse"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 #, fuzzy
 msgid "Show Desktop Icons"
 msgstr "Send til skrivebord"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:257
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:729
+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:261
-#: src/modules/gadman/e_mod_gadman.c:729
-msgid "Behavior"
+#: 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:1187
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "(Ingen applikationer)"
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Åben"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "(Ingen applikationer)"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 #, fuzzy
 msgid "Specific Applications"
 msgstr "(Ingen applikationer)"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 #, fuzzy
 msgid "Custom Command"
 msgstr "Udfør kommando"
@@ -6665,43 +6814,43 @@ msgstr "Forsvundne vinduer"
 msgid "Select a window"
 msgstr "Vælg et vindue"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 #, fuzzy
 msgid "IBar Settings"
 msgstr "Basale indstillinger"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 #, fuzzy
 msgid "Display App Name"
 msgstr "Visning"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 #, fuzzy
 msgid "Display App Comment"
 msgstr "Visning"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 #, fuzzy
 msgid "Display App Generic"
 msgstr "Visning"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr ""
 
@@ -6719,31 +6868,31 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Er du sikker på at du vil afslutte?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 #, fuzzy
 msgid "Change Icon Properties"
 msgstr "Egenskaber"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 #, fuzzy
 msgid "Remove Icon"
 msgstr "Opret ikon"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 #, fuzzy
 msgid "Add An Icon"
 msgstr "(Ingen applikationer)"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 #, fuzzy
 msgid "Create New Icon"
 msgstr "Opret ikon"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 #, fuzzy
 msgid "Add Application"
 msgstr "(Ingen applikationer)"
@@ -6803,142 +6952,142 @@ msgstr ""
 msgid "Pager Settings"
 msgstr "Basale indstillinger"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: 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"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 #, fuzzy
 msgid "Popup Settings"
 msgstr "Fokusindstillinger"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 #, fuzzy
 msgid "Show popup for urgent windows"
 msgstr "Match kun ét vindue"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 #, fuzzy
 msgid "Select and Slide button"
 msgstr "Vælg et vindue"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 msgid "Click to set"
 msgstr "Klik for fokusering"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 #, fuzzy
 msgid "Drag whole desktop"
 msgstr "Virtuelt skrivebord"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: 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
 msgid "%.0f px"
 msgstr "%2.0f pixels"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 #, fuzzy
 msgid "Resistance to dragging"
 msgstr "Modstand mellem vinduer:"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 #, fuzzy
 msgid "Popup pager height"
 msgstr "Pop op hastighed"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 #, fuzzy
 msgid "Popup speed"
 msgstr "Pop op hastighed"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, fuzzy, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sek."
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 #, fuzzy
 msgid "Urgent Window Settings"
 msgstr "Overspringning i vinduesliste"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 #, fuzzy
 msgid "Show popup on urgent window"
 msgstr "Match kun ét vindue"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 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:344
+#: src/modules/pager/e_mod_config.c:343
 #, fuzzy
 msgid "Attetion"
 msgstr "Tilvalg"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Nederst"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "Fokusindstillinger"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "Skrivebordsnavn"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "Skriveborde"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -7208,7 +7357,7 @@ msgstr ""
 msgid "Right:"
 msgstr "Lys"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 #, fuzzy
 msgid "Mute"
 msgstr "Moduler"
@@ -7254,12 +7403,12 @@ msgstr "Fokusindstillinger"
 msgid "Mixer Settings Updated"
 msgstr "Konfiguration opgraderet"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 #, fuzzy
 msgid "Controls"
 msgstr "Sæt kontrollør"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -7297,6 +7446,18 @@ msgstr "(Ingen applikationer)"
 msgid "Networks"
 msgstr ""
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+msgid "Systray"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Virtuelt skrivebord"
diff --git a/po/de.gmo b/po/de.gmo
index e9a3210..2475995 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index df18ebd..62f6ab3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,17 +2,13 @@
 # This file is put in the public domain.
 # vandango <vandango at toenda.com>, 2005, 2005/07/10
 #
-# This translator was created/edited with the Elive translation tool
-# Azundris <edevel at azundris.com>, 2005/06/08.
-#
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
-"PO-Revision-Date: 2009-01-24 14:27-0500\n"
-"Last-Translator: AlexAnteMachina <alexander-jung at t-online.de>\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
+"PO-Revision-Date: 2009-06-09 11:41+0100\n"
+"Last-Translator: Thomas Gstädtner <thomas at gstaedtner.net>\n"
 "Language-Team: E17-de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,27 +18,26 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Über Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
-#, fuzzy
 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."
@@ -53,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 ""
-"Urheberrechtlich geschützt &copy; 1999-2007 durch das Enlightenment-"
+"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 "
@@ -83,59 +78,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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nein"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Möchten Sie Enlightenment wirklich beenden?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Möchten Sie sich wirklich abmelden?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Möchten Sie den Computer wirklich herunterfahren?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Möchten Sie wirklich neustarten?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 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:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -143,11 +140,11 @@ msgstr ""
 "Sie sind im Begriff den Computer in den Bereitschaftsmodus zu versetzen."
 "<br><br>Sind Sie sicher?"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Wollen Sie den Computer wirklich in den Ruhezustand herunterfahren?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -155,338 +152,316 @@ msgstr ""
 "Sie sind im Begriff den Computer in den Ruhezustand herunterzufahren."
 "<br><br>Sind Sie sicher?"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Fenster : Aktionen"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Verschieben"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Größe ändern"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menü"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Fenstermenü"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "nach oben"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "nach unten"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Schließen erzwingen"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Fenster : Zustand"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Klebrig-Modus-Umschalter"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Icon-Modus-Umschalter"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Vollbildmodus-Umschalter"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maximieren"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Maximiere vertikal"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Maximiere horizontal"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Maximiere auf Vollbild"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximierungsmodus \"Geschickt\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximieren-Modus \"Erweitern\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximierungsmodus \"Füllen\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Einklappmodus-Oben-Umschalter"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Ausklappmodus-Unten-Umschalter"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "EInklappmodus-Links-Umschalter"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Einklappmodus-Rechts-Umschalter"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Einklappmodus-Umschalter"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Schalte Rahmenloszustand um"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "Schalte Befestigungszustand um"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Arbeitsfläche"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Wechsle zu linker Arbeitsfläche"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Wechsle zu rechter Arbeitsfläche"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Wechsle zu oberer Arbeitsfläche"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Wechsle zu unterer Arbeitsfläche"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Wechsle um Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Zeige die Arbeitsfläche"
 
-#: src/bin/e_actions.c:2581
-#, fuzzy
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
-msgstr "Zeige die Arbeitsfläche"
+msgstr "Zeige die Modulablage"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Wechsle zu Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Wechsle linear zu Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Wechsle zu Arbeitsfläche 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Wechsle zu Arbeitsfläche 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Wechsle zu Arbeitsfläche 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Wechsle zu Arbeitsfläche 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Wechsle zu Arbeitsfläche 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Wechsle zu Arbeitsfläche 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Wechsle zu Arbeitsfläche 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Wechsle zu Arbeitsfläche 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Wechsle zu Arbeitsfläche 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Wechsle zu Arbeitsfläche 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Wechsle zu Arbeitsfläche 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Wechsle zu Arbeitsfläche 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Wechsle zu Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2628
-#, fuzzy
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
-msgstr "Wechsle zu linker Arbeitsfläche"
+msgstr "Klappe Arbeitsfläche nach links (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2630
-#, fuzzy
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
-msgstr "Klappe Arbeitsfläche nach oben"
+msgstr "Klappe Arbeitsfläche nach rechts (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2632
-#, fuzzy
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
-msgstr "Wechsle zu oberer Arbeitsfläche"
+msgstr "Klappe Arbeitsfläche nach oben (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2634
-#, fuzzy
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
-msgstr "Klappe Arbeitsfläche nach unten"
+msgstr "Klappe Arbeitsfläche nach unten (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2636
-#, fuzzy
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
-msgstr "Klappe Arbeitsfläche auf durch..."
+msgstr "Klappe ... Arbeitsflächen weiter (alle Bidschirme)"
 
-#: src/bin/e_actions.c:2642
-#, fuzzy
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
-msgstr "Klappe Arbeitsfläche auf zu..."
+msgstr "Klappe Arbeitsfläche nach... (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2648
-#, fuzzy
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
-msgstr "Klappe Arbeitsfläche linear auf..."
+msgstr "Klappe Arbeitsfläche linear nach... (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2654
-#, fuzzy
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
-msgstr "Wechsle zu Arbeitsfläche..."
+msgstr "Klappe Arbeitsfläche in Richtung..."
 
-#: src/bin/e_actions.c:2659
-#, fuzzy
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
-msgstr "Wechsle zu Arbeitsfläche 0"
+msgstr "Wechsle zu Arbeitsfläche 0 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2661
-#, fuzzy
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
-msgstr "Wechsle zu Arbeitsfläche 1"
+msgstr "Wechsle zu Arbeitsfläche 1 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2663
-#, fuzzy
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
-msgstr "Wechsle zu Arbeitsfläche 2"
+msgstr "Wechsle zu Arbeitsfläche 2 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2665
-#, fuzzy
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
-msgstr "Wechsle zu Arbeitsfläche 3"
+msgstr "Wechsle zu Arbeitsfläche 3 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2667
-#, fuzzy
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
-msgstr "Wechsle zu Arbeitsfläche 4"
+msgstr "Wechsle zu Arbeitsfläche 4 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2669
-#, fuzzy
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
-msgstr "Wechsle zu Arbeitsfläche 5"
+msgstr "Wechsle zu Arbeitsfläche 5 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2671
-#, fuzzy
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
-msgstr "Wechsle zu Arbeitsfläche 6"
+msgstr "Wechsle zu Arbeitsfläche 6 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2673
-#, fuzzy
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
-msgstr "Wechsle zu Arbeitsfläche 7"
+msgstr "Wechsle zu Arbeitsfläche 7 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2675
-#, fuzzy
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
-msgstr "Wechsle zu Arbeitsfläche 8"
+msgstr "Wechsle zu Arbeitsfläche 8 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2677
-#, fuzzy
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
-msgstr "Wechsle zu Arbeitsfläche 9"
+msgstr "Wechsle zu Arbeitsfläche 9 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2679
-#, fuzzy
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
-msgstr "Wechsle zu Arbeitsfläche 10"
+msgstr "Wechsle zu Arbeitsfläche 10 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2681
-#, fuzzy
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
-msgstr "Wechsle zu Arbeitsfläche 11"
+msgstr "Wechsle zu Arbeitsfläche 11 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2683
-#, fuzzy
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
-msgstr "Wechsle zu Arbeitsfläche..."
+msgstr "Wechsle zu Arbeitsfläche... (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -496,103 +471,114 @@ msgstr "Wechsle zu Arbeitsfläche..."
 msgid "Screen"
 msgstr "Bildschirm"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Verschiebe Maus auf Bildschirm 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Verschiebe Maus auf Bildschirm 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Verschiebe Maus auf Bildschirm..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Verschiebe Maus 1 Bildschirm weiter"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Verschiebe Maus 1 Bildschirm zurück"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Verschiebe Maus Bildschirme weiter/zurück..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Fenster : Bewegen"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "Zur nächsten Arbeitsfläche"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Zur vorhergehenden Arbeitsfläche"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "Von Arbeitsfläche #..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Zu Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Zeige Hauptmenü"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Zeige Favoritenmenü"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Zeige Anwendungsmenü"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Zeige Fensterlistenmenü"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Zeige Menü..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Befehl"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Anwendung"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Neustart"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/bin/e_actions.c:2789
-#, fuzzy
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
-msgstr "Beenden"
+msgstr "Sofort Beenden"
+
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment : Modus"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2808
+msgid "Presentation Mode Toggle"
+msgstr "Präsentationsmodus-Umschalter"
+
+#: src/bin/e_actions.c:2813
+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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -605,75 +591,70 @@ msgstr "Beenden"
 msgid "System"
 msgstr "System"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Abmelden"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr "Sofort abschalten"
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr "Abschalten"
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Neustarten"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Bereitschaftsmodus"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Ruhezustand"
 
-#: src/bin/e_actions.c:2821
-#, fuzzy
+#: src/bin/e_actions.c:2845
 msgid "Lock"
 msgstr "Sperren"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Fenster aufräumen"
 
-#: src/bin/e_actions.c:2831
-#, fuzzy
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
-msgstr "Fenster : Aktionen"
+msgstr "Allgemein: Aktionen"
 
-#: src/bin/e_actions.c:2831
-#, fuzzy
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
-msgstr "Modul-Aktionen"
+msgstr "Verzögerte Aktion"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Setzte als Hintergrund"
 
-#: src/bin/e_border.c:4881
-#, fuzzy
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
-msgstr ".desktop-Datei"
+msgstr "Suche nach Desktopdateien erledigt"
 
-#: src/bin/e_border.c:4893
-#, fuzzy
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
-msgstr ".desktop-Datei"
+msgstr "Suche nach Desktopdateien"
 
 #: src/bin/e_color_dialog.c:29
-#, fuzzy
 msgid "Color Selector"
-msgstr "Profilauswahl"
+msgstr "Farbwähler"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -688,7 +669,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -700,8 +681,7 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
-#, fuzzy
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 "
@@ -719,8 +699,7 @@ msgstr ""
 "nun eine Rekonfiguration vornehmen wenn<br>Sie möchten. Entschuldigen Sie "
 "die Unannehmlichkeiten.<br>"
 
-#: src/bin/e_config.c:746
-#, fuzzy
+#: src/bin/e_config.c:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -736,12 +715,12 @@ msgstr ""
 "Standardeinstellungen<br>benutzt. Bitte entschuldigen Sie etwaige "
 "Unannehmlichkeiten.<br>"
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
 msgstr "Einstellungen wurden aktualisiert"
 
-#: src/bin/e_config.c:1652
-#, fuzzy, c-format
+#: src/bin/e_config.c:1712
+#, 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>"
@@ -752,8 +731,8 @@ msgstr ""
 "betroffen:<br>%s<br><br>Diese Datei wurde entfernt um Datenverfälschung zu "
 "vermeiden.<br>"
 
-#: src/bin/e_config.c:1663
-#, fuzzy, c-format
+#: src/bin/e_config.c:1723
+#, 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 "
@@ -768,8 +747,8 @@ msgstr ""
 "betroffen:<br>%s<br><br>Diese Datei wurde entfernt um Datenverfälschung zu "
 "vermeiden.<br>"
 
-#: src/bin/e_config.c:1676
-#, fuzzy, c-format
+#: src/bin/e_config.c:1736
+#, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
 "Enlightenment. Your disk is having troubles<br>and possibly needs "
@@ -782,8 +761,8 @@ msgstr ""
 "betroffen:<br>%s<br><br>Diese Datei wurde entfernt um Datenverfälschung zu "
 "vermeiden.<br>"
 
-#: src/bin/e_config.c:1687
-#, fuzzy, c-format
+#: src/bin/e_config.c:1747
+#, 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 "
@@ -796,8 +775,8 @@ 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:1699
-#, fuzzy, c-format
+#: src/bin/e_config.c:1759
+#, 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>%"
@@ -808,12 +787,11 @@ msgstr ""
 "war betroffen:<br>%s<br><br>Diese Datei wurde entfernt um Datenverfälschung "
 "zu vermeiden.<br>"
 
-#: src/bin/e_config.c:1724
-#, fuzzy
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment Konfiguration Schreibprobleme"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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
@@ -839,7 +817,7 @@ msgid "Modules"
 msgstr "Module"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Erweiterungen"
 
@@ -848,22 +826,22 @@ msgstr "Erweiterungen"
 msgid "Container %d"
 msgstr "Container %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Fehler - keine PAM-Unterstützung"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 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:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Sperrung schlug fehl"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -872,15 +850,15 @@ msgstr ""
 "Tastatur oder Maus in Beschlag nimmt<br>und eine Aufhebung dessen nicht "
 "möglich ist."
 
-#: src/bin/e_desklock.c:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Bitte geben Sie ihr Kennwort zum Entsperren ein"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Fehler im Authentifizierungssystem"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -891,6 +869,28 @@ 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
+msgid "Activate Presentation Mode?"
+msgstr "Präsentationsmodus aktivieren?"
+
+#: src/bin/e_desklock.c:1040
+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 ""
+"Sie haben die Arbeitsfläche zu schnell entsperrt.<br><br>Wollen Sie den "
+"<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
+msgid "No, but increase timeout"
+msgstr "Nein, stattdessen Verzögerung erhöhen"
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr "Nein, und nicht mehr nachfragen"
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Unvollständige Fenstereigenscahften"
@@ -956,7 +956,6 @@ msgid "Categories"
 msgstr "Kategorien"
 
 #: src/bin/e_eap_editor.c:528
-#, fuzzy
 msgid "Mime Types"
 msgstr "Dateitypen"
 
@@ -992,23 +991,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:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Entfernen"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Einfügen"
 
@@ -1042,265 +1041,310 @@ msgstr ""
 "Enlightenment konnte die Anwendung nicht ausführen:<br><br>%s<br><br>Der "
 "Anwendungsstart schlug fehl."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Fehler beim Ausführen der Anwendung"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s wurde unerwartet beendet."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, 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:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s wurde durch ein Unterbrechungssignal unterbrochen."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s wurde durch ein Endesignal unterbrochen."
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s wurde durch ein Abbruchssignal unterbrochen."
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s wurde durch einen Fließkommafehler unterbrochen."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, 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:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s wurde durch einen Segmentierungsfehler unterbrochen."
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s wurde durch eine defekte Weiterleitung unterbrochen."
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s wurde durch ein Terminierungssignal unterbrochen."
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s wurde durch einen Bus-Fehler unterbrochen."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s wurde durch das Signal %i unterbrochen."
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 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:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Fehlerprotokolle"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Es gab keine Fehlermeldung."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Speichere diese Nachricht"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, 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:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Fehlerinformation"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Fehlersignalinformation"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Ausgabedaten"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Es gab keine Ausgabe."
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr "Nicht vorhandener Pfad"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s existiert nicht"
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+msgid "Mount Error"
+msgstr "Einhängefehler"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr "Gerät kann nicht eingehängt werden"
+
+#: src/bin/e_fm.c:3047
+msgid "Unmount Error"
+msgstr "Aushängefehler"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr "Gerät kann nicht ausgehängt werden"
+
+#: src/bin/e_fm.c:3062
+msgid "Eject Error"
+msgstr "Auswurffehler"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr "Gerät kann nicht ausgeworfen werden"
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i Dateien"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
-#, fuzzy
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
-msgstr "Linear"
+msgstr "Verknüpfung"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr "Abbruch"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
-#, fuzzy
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
-msgstr "Auswahleinstellungen"
+msgstr "Übergeordnete Einstellungen übernehmen"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Ansicht"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Aktualisiere die Anzeige"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Zeige versteckte Dateien"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "An Anordnung erinnern"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Jetzt sortieren"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Neues Verzeichnis"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr "Aushängen"
+
+#: src/bin/e_fm.c:8063
+msgid "Mount"
+msgstr "Einhängen"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr "Auswerfen"
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
 msgstr "Verwende Standard"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Raster-Icons"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Angepasste Icons"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Liste"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Icon-Größe (%d)"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+msgid "Set background..."
+msgstr "Hintergrundbild setzen..."
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+msgid "Set overlay..."
+msgstr "Überlagerung setzen..."
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Leeren"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Neues Verzeichnis erstellen"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Neuer Verzeichnisname:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Umbenennen von %s in:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Benenne Datei um"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
-#, fuzzy
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
-msgstr "Neustart"
+msgstr "Wiederholen"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Fehler"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr "Nein für alle"
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr "Ja für alle"
 
-#: src/bin/e_fm.c:8524
-#, fuzzy
+#: src/bin/e_fm.c:9014
 msgid "Warning"
-msgstr "Starte"
+msgstr "Warnung"
 
-#: src/bin/e_fm.c:8527
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9017
+#, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
-msgstr "Möchten Sie <hilight>%s</hilight> wirklich entfernen?"
+msgstr ""
+"Die datei existiert bereits, wirklich überschreiben?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr "Ignorieren"
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr "Ignoriere alles"
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, 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:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Löschung bestätigen"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, 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:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1361,8 +1405,8 @@ msgid "Preview"
 msgstr "Vorschau"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Standard"
 
@@ -1371,7 +1415,7 @@ msgid "Thumbnail"
 msgstr "Minibild"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
@@ -1387,70 +1431,70 @@ msgstr "Verknüpfungsinformation"
 msgid "Select an Image"
 msgstr "Wähle ein Bild aus"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:225
-#, fuzzy, c-format
+#: src/bin/e_fm_hal.c:228
+#, c-format
 msgid "Unknown Volume"
-msgstr "Unbekannt"
+msgstr "Unbekanntes Laufwerk"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "Entfernbare Geräte"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Flach"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Eingedrückt"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Erscheinungsbild"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Verschiebe Inhalte automatisch"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Ermögliche Größenänderung"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Starte Verschieben/Größenänderung dieses Helfers"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Entferne diesen Helfer"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "Beende Verschieben/Größenänderung dieses Helfers"
 
@@ -1502,8 +1546,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1511,7 +1555,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Ablage"
 
@@ -1611,14 +1655,12 @@ msgid "Keyboard Shortcut"
 msgstr "Tastaturkürzel"
 
 #: src/bin/e_int_border_menu.c:490
-#, fuzzy
 msgid "To Favorites Menu"
-msgstr "Favoritenmenü"
+msgstr "Zum Favoritenmenü"
 
 #: src/bin/e_int_border_menu.c:495
-#, fuzzy
 msgid "To Launcher"
-msgstr "Zum Schnellstartmenü hinzufügen"
+msgstr "Zum Schnellstartmenü"
 
 #: src/bin/e_int_border_menu.c:517 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
@@ -1691,19 +1733,18 @@ msgstr "Vollbild"
 msgid "Window List"
 msgstr "Fensterliste"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Arbeitsflächenumschalter"
 
 #: src/bin/e_int_border_menu.c:1059
-#, fuzzy
 msgid "Taskbar"
-msgstr "Fensterliste überspringen"
+msgstr "Fensterleiste"
 
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
@@ -1967,16 +2008,16 @@ msgstr "Starte dieses Programm beim Anmelden"
 
 #: src/bin/e_int_border_remember.c:550
 msgid "Always focus on start"
-msgstr ""
+msgstr "Immer beim start fokusieren"
 
 #: 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -2010,8 +2051,8 @@ msgstr "Geladene Module"
 msgid "Unload Module"
 msgstr "Entlade Module"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2022,9 +2063,8 @@ msgid "Shelf Contents"
 msgstr "Modulablageninhalte"
 
 #: src/bin/e_int_gadcon_config.c:38
-#, fuzzy
 msgid "Toolbar Contents"
-msgstr "Konfiguriere Modulablageninhalte"
+msgstr "Werkzeugleisteninhalte"
 
 #: src/bin/e_int_gadcon_config.c:93 src/modules/gadman/e_mod_config.c:106
 msgid "Available Gadgets"
@@ -2042,13 +2082,12 @@ msgstr "Ausgewählte Helfer"
 msgid "Remove Gadget"
 msgstr "Helfer entfernen"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
-#, fuzzy
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 msgid "Toolbar Settings"
-msgstr "Verschiebeeinstellungen"
+msgstr "Werkzeugleisteneinstellungen"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Ausführung"
 
@@ -2122,9 +2161,8 @@ msgid "(No Applications)"
 msgstr "(Keine Anwendung)"
 
 #: src/bin/e_int_menus.c:709
-#, fuzzy
 msgid "Set Virtual Desktops"
-msgstr "Arbeitsflächen"
+msgstr "Setze virtuelle Arbeitsflächen"
 
 #: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
 msgid "(No Windows)"
@@ -2134,122 +2172,121 @@ msgstr "(Keine Fenster)"
 msgid "No name!!"
 msgstr "Kein Name!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(Keine Modulablagen)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Modulablage #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Modulablage hinzufügen"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Modulablage entfernen"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Modulablageneinstellungen"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Winzig"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Mittel"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Groß"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Riesig"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 msgid "Set Contents..."
-msgstr "Modulablageninhalte"
+msgstr "Setze Inhalte..."
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Über allem"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Unter Fenstern"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Unter allem"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "Erlaube Fenstern diese Modulablage zu überdecken"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Schrumpfe auf Größe des Inhalts"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f Pixel"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Stile"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "Automatisches Verstecken"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "Modulablage automatisch verstecken"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "Zeige bei Mausberührung"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "Zeige bei Mausklick"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "Zeit bis zum Ausblenden"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f Sekunden"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "Ausblenddauer"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "Auf allen Arbeitsflächen anzeigen"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "Auf bestimmten Arbeitsflächen anzeigen"
 
@@ -2285,7 +2322,7 @@ msgstr ""
 "%s/enlightenment-%s\n"
 
 #: src/bin/e_main.c:326
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Options:\n"
 "\t-display DISPLAY\n"
@@ -2333,6 +2370,12 @@ msgstr ""
 "\t\tSei böse.\n"
 "\t-psychotic\n"
 "\t\tSei psychotisch.\n"
+"\t-locked\n"
+"\t\tStarte mit aktiver Bildschirmsperre, so dass das Passwort eingegeben "
+"werden muss.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tlfWenn Sie diese Hilfe benötigen brauchen sie diese Option definitiv "
+"nicht.\n"
 
 #: src/bin/e_main.c:389
 msgid ""
@@ -2448,7 +2491,8 @@ msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
 msgstr ""
-"Enlightenment kann keine Verzeichnisse in ihrem Home-Verzeichnis erstellen.\n"
+"Enlightenment kann keine Verzeichnisse in ihrem \"Home\"-Verzeichnis "
+"erstellen.\n"
 "Möglicherweise haben Sie kein Home-Verzeichnis, oder die Festplatte ist voll?"
 
 #: src/bin/e_main.c:572
@@ -2461,14 +2505,12 @@ msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment kann sein Konfigurations-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:595
-#, fuzzy
 msgid "Enlightenment cannot set up its scale system."
-msgstr "Enlightenment kann sein Modulablagen-Subsystem nicht initialisieren."
+msgstr "Enlightenment kann sein Skalierungs-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:603
-#, fuzzy
 msgid "Enlightenment cannot set up the pointer system."
-msgstr "Enlightenment kann sein intl-Subsystem nicht initialisieren."
+msgstr "Enlightenment kann sein Zeiger-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:612
 msgid ""
@@ -2488,7 +2530,7 @@ msgstr "Enlightenment kann sein Themen-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:646
 msgid "Starting International Support"
-msgstr ""
+msgstr "Starte Internationalisierungsunterstützung"
 
 #: src/bin/e_main.c:651
 msgid "Enlightenment cannot set up its intl system."
@@ -2504,7 +2546,7 @@ msgstr ""
 
 #: src/bin/e_main.c:674
 msgid "Testing Format Support"
-msgstr ""
+msgstr "Überprüfe Formatübestützung"
 
 #: src/bin/e_main.c:685
 msgid ""
@@ -2539,14 +2581,14 @@ msgstr ""
 "Bitte überprüfen Sie Evas auf EET-Loader-Unterstützung.\n"
 
 #: src/bin/e_main.c:725
-#, fuzzy
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
-"Enlightenment entdeckte, dass Evas keine PNG-Dateien laden kann.\n"
-"Bitte überprüfen Sie Evas auf PNG-Loader-Unterstützung.\n"
+"Enlightenment entdeckte, dass Evas die 'Sans'-Schriftart nicht laden kann.\n"
+"Bitte überprüfen Sie Evas auf 'fontconfig'-Unterstützung fontconfig darauf\n"
+"ob es eine 'Sans'-Schriftart definiert..\n"
 
 #: src/bin/e_main.c:735
 msgid "Setup Screens"
@@ -2569,9 +2611,8 @@ msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment kann den Dateimanager nicht initialisieren."
 
 #: src/bin/e_main.c:755
-#, fuzzy
 msgid "Setup Desklock"
-msgstr "Verschiebe auf Arbeitsfläche"
+msgstr "Richte Bildschirmsperre ein"
 
 #: src/bin/e_main.c:760
 msgid "Enlightenment cannot set up its desk locking system."
@@ -2579,13 +2620,12 @@ msgstr ""
 "Enlightenment kann sein Bildschirmsperre-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:773
-#, fuzzy
 msgid "Setting up Paths"
-msgstr "Nicht vorhandener Pfad"
+msgstr "Richte Pfade ein"
 
 #: src/bin/e_main.c:790
 msgid "Setup System Controls"
-msgstr ""
+msgstr "Richte Systemsteuerung ein"
 
 #: src/bin/e_main.c:795
 msgid "Enlightenment cannot initialize the System Command system.\n"
@@ -2593,36 +2633,32 @@ msgstr ""
 "Enlightenment kann das Systembefehls-Subsystem nicht intitialisieren.\n"
 
 #: src/bin/e_main.c:800
-#, fuzzy
 msgid "Setup Actions"
-msgstr "Autostartanwendungen"
+msgstr "Richte Aktionen ein"
 
 #: src/bin/e_main.c:805
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment kann sein Aktions-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:809
-#, fuzzy
 msgid "Setup Execution System"
-msgstr "Autostartanwendungen"
+msgstr "Richte Ausführungssystem ein"
 
 #: src/bin/e_main.c:814
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment kann sein Ausführungssystem nicht initialisieren."
 
 #: src/bin/e_main.c:818
-#, fuzzy
 msgid "Setup Remembers"
-msgstr "Erinnern"
+msgstr "Richte Erinnern ein"
 
 #: src/bin/e_main.c:823
 msgid "Enlightenment cannot setup remember settings."
 msgstr "Enlightenment kann die \"Merken\"-Einstellungen nicht initialisieren."
 
 #: src/bin/e_main.c:831
-#, fuzzy
 msgid "Setup FM"
-msgstr "Arbeitsflächenwechsel mit der Maus"
+msgstr "Richte FM ein"
 
 #: src/bin/e_main.c:836
 msgid "Enlightenment cannot initialize the File manager.\n"
@@ -2630,24 +2666,24 @@ msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
 
 #: src/bin/e_main.c:849
 msgid "Setup Message System"
-msgstr ""
+msgstr "Richte Nachrichtensystem ein"
 
 #: src/bin/e_main.c:854
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment kann sein msg-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:858
-#, fuzzy
 msgid "Setup DND"
-msgstr "Verschiebe auf Arbeitsfläche"
+msgstr "Richte DND ein"
 
 #: src/bin/e_main.c:863
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment kann sein dnd-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
-msgstr ""
+#, fuzzy
+msgid "Setup Grab Input Handling"
+msgstr "Richte Eingabeübernahmeverarbeitung ein"
 
 #: src/bin/e_main.c:872
 msgid "Enlightenment cannot set up its input grab handling system."
@@ -2655,27 +2691,24 @@ msgstr ""
 "Enlightenment kann sein Eingabeerkennungs-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:876
-#, fuzzy
 msgid "Setup Modules"
-msgstr "Module"
+msgstr "Richte Module ein"
 
 #: src/bin/e_main.c:881
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment kann sein Modul-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:885
-#, fuzzy
 msgid "Setup Color Classes"
-msgstr "Farbklassen"
+msgstr "Richte Farbklassen ein"
 
 #: src/bin/e_main.c:890
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment kann sein Farbklassen-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:894
-#, fuzzy
 msgid "Setup Gadcon"
-msgstr "Einrichtungsbefehl"
+msgstr "Richte Gadcon ein"
 
 #: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its gadget control system."
@@ -2683,23 +2716,20 @@ msgstr ""
 "Enlightenment kann sein Helfersteuerungs-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:904
-#, fuzzy
 msgid "Setup DPMS"
-msgstr "Arbeitsflächenwechsel mit der Maus"
+msgstr "Richte DPMS ein"
 
 #: src/bin/e_main.c:909
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment kann die DPMS-Einstellungen nicht initialisieren."
 
 #: src/bin/e_main.c:913
-#, fuzzy
 msgid "Set Up Powersave modes"
-msgstr "Leistungsrichtlinien einstellen"
+msgstr "Richte Energiesparmodi ein"
 
 #: src/bin/e_main.c:917
-#, fuzzy
 msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment kann sein Popup-Subsystem nicht initialisieren."
+msgstr "Enlightenment kann sein Energiespar-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:922
 msgid "Setup Wallpaper"
@@ -2715,14 +2745,12 @@ msgid "Setup Mouse"
 msgstr "Maus-einstellungen"
 
 #: src/bin/e_main.c:937
-#, fuzzy
 msgid "Enlightenment cannot configure the mouse settings."
-msgstr "Enlightenment kann die DPMS-Einstellungen nicht initialisieren."
+msgstr "Enlightenment kann die Maus-Einstellungen nicht initialisieren."
 
 #: src/bin/e_main.c:942
-#, fuzzy
 msgid "Setup Bindings"
-msgstr "Tastenbelegungen"
+msgstr "Richte Belegungen ein"
 
 #: src/bin/e_main.c:947
 msgid "Enlightenment cannot set up its bindings system."
@@ -2730,27 +2758,24 @@ msgstr ""
 "Enlightenment kann sein Tastenbelegungs-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:951
-#, fuzzy
 msgid "Setup Popups"
-msgstr "Arbeitsflächenwechsel mit der Maus"
+msgstr "Richte Popups ein"
 
 #: src/bin/e_main.c:956
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment kann sein Popup-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:961
-#, fuzzy
 msgid "Setup Shelves"
-msgstr "Modulablagen"
+msgstr "Richte Modulablagen ein"
 
 #: src/bin/e_main.c:966
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment kann sein Modulablagen-Subsystem nicht initialisieren."
 
 #: src/bin/e_main.c:971
-#, fuzzy
 msgid "Setup Thumbnailer"
-msgstr "Minibild"
+msgstr "Richte Vorschaubild-Generator ein"
 
 #: src/bin/e_main.c:976
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
@@ -2758,7 +2783,7 @@ msgstr "Enlightenment kann sein Vorschaubild-Subsystem nicht initialisieren.\n"
 
 #: src/bin/e_main.c:981
 msgid "Set Up File Ordering"
-msgstr ""
+msgstr "Richte Dateibeschaffung ein"
 
 #: src/bin/e_main.c:985
 msgid "Enlightenment cannot set up its order file system."
@@ -2797,9 +2822,8 @@ msgstr ""
 "sollten Sie die gewünschten<br>Module wieder auswählen können."
 
 #: src/bin/e_main.c:1044
-#, fuzzy
 msgid "Configure Shelves"
-msgstr "Konfigurierte Modulablagen"
+msgstr "Konfiguriere Modulablagen"
 
 #: src/bin/e_main.c:1054
 msgid "Almost Done"
@@ -2850,30 +2874,39 @@ msgstr "Enlightenment %s Modul"
 msgid "Would you like to unload this module?<br>"
 msgstr "Möchten Sie dieses Modul abschalten?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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 ""
+"Sie haben den Bildschirmschoner zu schnell deaktiviert.<br><br>Wollen Sie "
+"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
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Möchten Sie diese Modulablage wirklich entfernen?"
 
-#: src/bin/e_shelf.c:1259
+#: src/bin/e_shelf.c:1273
 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:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Stoppe Verschieben/-ändern von Gegenständen"
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Starte Verschieben/-ändern von Gegenständen"
 
-#: src/bin/e_shelf.c:1692
-#, fuzzy
+#: src/bin/e_shelf.c:1703
 msgid "Set Shelf Contents"
-msgstr "Modulablageninhalte"
+msgstr "Setze Modulablageninhalte"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Lösche diese Modulablage"
 
@@ -2883,12 +2916,12 @@ msgstr "Starte"
 
 #: src/bin/e_sys.c:170
 msgid "Checking System Permissions"
-msgstr ""
+msgstr "Überprüfe Systemrechte"
 
 #: 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 "Systemüberprüfung abgeschlossen"
 
 #: src/bin/e_sys.c:314
 msgid "Logout problems"
@@ -2921,58 +2954,52 @@ msgid "Logout in progress"
 msgstr "Abmeldevorgang im Gange"
 
 #: src/bin/e_sys.c:366
-#, fuzzy
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
-msgstr "Abmeldevorgang ist im Gange.<br><hilight>Bitte warten...</hilight>"
+msgstr "Abmeldung ist im Gange.<br><hilight>Bitte warten.</hilight>"
 
 #: src/bin/e_sys.c:395 src/bin/e_sys.c:456
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment ist mit einer anderen Nachfrage beschäftigt"
 
 #: src/bin/e_sys.c:401
-#, fuzzy
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
-"Abmeldevorgang ist im Gange.<br>Sie können erst dann andere Vorgänge "
-"ausführen<br>wenn der Vorgang abgeschlossen ist."
+"Melde ab.<br>Sie können keine anderen Systemaktionen ausführen<br>sobald mit "
+"der Abmeldung begonnen wurde."
 
 #: src/bin/e_sys.c:409
-#, fuzzy
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
-"Das System wird Heruntergefahren.<br>Sie können nun keine "
-"anderen<br>Vorgänge mehr ausführen."
+"Schalte ab.<br>Sie können keine anderen Systemaktionen ausführen<br>sobald "
+"das Herunterfahren begonnen hat."
 
 #: src/bin/e_sys.c:416
-#, fuzzy
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
-"Das System wird neugestartet.<br>Sie können erst nach dem Neustart<br>andere "
-"Vorgänge ausführen."
+"Starte neu.<br>Sie können keine anderen Systemaktionen ausführen<br>bis der "
+"Neustart abgeschlossen ist."
 
 #: src/bin/e_sys.c:423
-#, fuzzy
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 "Schlafmodus wird vorbereitet.<br>Erst nach dem Aufwachen können<br>weitere "
-"Vorgänge ausgeführt werden."
+"Systemaktionen ausgeführt werden."
 
 #: src/bin/e_sys.c:430
-#, fuzzy
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
-"Das System wird in den Ruhezustand heruntergefahren.<br>Erst nach dem "
-"Wiedereinschalten können<br>erneut Vorgänge ausgeführt werden."
+"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
 msgid "EEK! This should not happen"
@@ -2980,67 +3007,55 @@ msgstr "D'oh! Hier stimmt was nicht."
 
 #: src/bin/e_sys.c:463
 msgid "Power off failed."
-msgstr ""
+msgstr "Herunterfahren fehlgeschlagen."
 
 #: src/bin/e_sys.c:468
-#, fuzzy
 msgid "Reset failed."
-msgstr ".desktop-Datei"
+msgstr "Neustart fehlgeschlagen."
 
 #: src/bin/e_sys.c:473
-#, fuzzy
 msgid "Suspend failed."
-msgstr "Zeit zum Ruhezustand"
+msgstr "Einschlafen fehlgeschlagen."
 
 #: src/bin/e_sys.c:478
-#, fuzzy
 msgid "Hibernate failed."
-msgstr ""
-"Der Computer konnte nicht in den Ruhezustand<br>heruntergefahren werden."
+msgstr "Versetzen in den Ruhezustand fehlgeschlagen."
 
 #: src/bin/e_sys.c:535
 msgid "Power off"
 msgstr "Abschalten"
 
 #: src/bin/e_sys.c:538
-#, fuzzy
 msgid "Power off.<br><hilight>Please wait.</hilight>"
-msgstr "Ihr Computer wird neugestartet.<br><hilight>Bitte warten...</hilight>"
+msgstr "Schalte ab.<br><hilight>Bitte warten.</hilight>"
 
 #: src/bin/e_sys.c:562
-#, fuzzy
 msgid "Resetting"
-msgstr "Arbeitsflächen Einstellungen"
+msgstr "Starte neu"
 
 #: src/bin/e_sys.c:565
-#, fuzzy
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
-msgstr "Ihr Computer wird neugestartet.<br><hilight>Bitte warten...</hilight>"
+msgstr "Starte neu.<br><hilight>Bitte warten...</hilight>"
 
 #: src/bin/e_sys.c:588
 msgid "Suspending"
 msgstr "Versetze den Computer in den Schlafmodus."
 
 #: src/bin/e_sys.c:591
-#, fuzzy
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
-msgstr ""
-"Ihr Computer wird in den Schlafmodus versetzt.<br><hilight>Bitte warten...</"
-"hilight>"
+msgstr "Schlafmodus wird vorbereitet.<br><hilight>Bitte warten...</hilight>"
 
 #: src/bin/e_sys.c:614
 msgid "Hibernating"
 msgstr "Fahre den Computer in den Ruhezustand herunter."
 
 #: src/bin/e_sys.c:617
-#, fuzzy
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
-"Ihr Computer wird in den Ruhezustand heruntergefahren.<br><hilight>Bitte "
-"warten...</hilight>"
+"Das System wird in den Ruhezustand versetzt.<br><hilight>Bitte warten.</"
+"hilight>"
 
 #: src/bin/e_theme_about.c:17
-#, fuzzy
 msgid "About Theme"
 msgstr "Über dieses Theme"
 
@@ -3048,8 +3063,7 @@ msgstr "Über dieses Theme"
 msgid "Set As Theme"
 msgstr "Aktiviere als Thema"
 
-#: src/bin/e_toolbar.c:331
-#, fuzzy
+#: src/bin/e_toolbar.c:340
 msgid "Set Toolbar Contents"
 msgstr "Konfiguriere Modulablageninhalte"
 
@@ -3067,67 +3081,67 @@ 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:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KiB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MiB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GiB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "In der Zukunft"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "In der letzten Minute"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Jahre früher"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Monate früher"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Wochen früher"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Tage früher"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Stunden früher"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Minuten früher"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3139,7 +3153,7 @@ msgstr "Unbekannt"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -3162,7 +3176,7 @@ msgid "Add to Favorites"
 msgstr "Zu den Favoriten hinzufügen"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3218,60 +3232,54 @@ msgid "Show alert when battery is low"
 msgstr "Benachrichtigung bei niedrigem Akkustand"
 
 #: src/modules/battery/e_mod_config.c:136
-#, fuzzy
 msgid "Check every:"
-msgstr "Überprüfe Akku alle "
+msgstr "Überprüfe alle:"
 
 #: src/modules/battery/e_mod_config.c:138
 #: 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 Dateien"
+msgstr "%1.0f ticks"
 
 #: src/modules/battery/e_mod_config.c:140
-#, fuzzy
 msgid "Polling"
-msgstr "Flach"
+msgstr "Polling"
 
 #: src/modules/battery/e_mod_config.c:143
-#, fuzzy
 msgid "Show alert on low battery"
-msgstr "Benachrichtigung bei niedrigem Akkustand"
+msgstr "Alarm bei niedrigem Akkustand"
 
 #: src/modules/battery/e_mod_config.c:145
-#, fuzzy
 msgid "Alert when at:"
-msgstr "Benachrichtigen wenn Akku bei "
+msgstr "Alarm wenn Akku bei:"
 
 #: src/modules/battery/e_mod_config.c:147
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f min"
 msgstr "%1.0f Minute(n)"
 
 #: src/modules/battery/e_mod_config.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f %%"
-msgstr "%3.0f%%"
+msgstr "%1.0f %%"
 
 #: src/modules/battery/e_mod_config.c:151
 msgid "Auto dismiss in..."
-msgstr ""
+msgstr "Automatisch ablehnen in..."
 
 #: src/modules/battery/e_mod_config.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f sec"
-msgstr "%1.1f sek"
+msgstr "%1.1f Sekunde(n)"
 
 #: src/modules/battery/e_mod_config.c:155
-#, fuzzy
 msgid "Alert"
-msgstr "Beschleunigen"
+msgstr "Alarm"
 
 #: src/modules/battery/e_mod_config.c:160
-#, fuzzy
 msgid "Auto Detect"
-msgstr "Automatisches Verstecken"
+msgstr "Automatische Erkennen"
 
 #: src/modules/battery/e_mod_config.c:162
 #: src/modules/conf_applications/e_mod_main.c:39
@@ -3282,36 +3290,36 @@ msgid "Internal"
 msgstr "Intern"
 
 #: src/modules/battery/e_mod_config.c:164
-#, fuzzy
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
-msgstr "ALT"
+msgstr "HAL"
 
 #: src/modules/battery/e_mod_config.c:167
 msgid "Hardware"
-msgstr ""
+msgstr "Hardware"
 
 #: src/modules/battery/e_mod_main.c:135
 msgid "Battery"
 msgstr "Batterie"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr "Niedriger Akkustand"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr "Netzbetrieb empfohlen"
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr "Nicht verfügbar"
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr "Akkuzustand"
 
@@ -3320,10 +3328,21 @@ msgid "Clock"
 msgstr "Uhr"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
-msgstr "Arbeitsflächen Einstellungen"
+msgstr "Einstellungskonsole"
+
+#: src/modules/conf/e_mod_main.c:234
+msgid "Presentation"
+msgstr "Präsentation"
+
+#: src/modules/conf/e_mod_main.c:241
+msgid "Offline"
+msgstr "Offline"
+
+#: src/modules/conf/e_mod_main.c:269
+msgid "Modes"
+msgstr "Modi"
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
@@ -3347,7 +3366,7 @@ msgid "Restart Applications"
 msgstr "Neustartanwendungen"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "Alle Anwendungen"
 
@@ -3509,9 +3528,8 @@ msgid "Border Title"
 msgstr "Rahmennamen"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
-#, fuzzy
 msgid "Settings Dialog Title"
-msgstr "Über-Dialog-Titel"
+msgstr "Einstellungsdialog-Titel"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
 msgid "Error Text"
@@ -3626,9 +3644,8 @@ msgid "Colors"
 msgstr "Farben"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:251
-#, fuzzy
 msgid "Other"
-msgstr "IBar Andere"
+msgstr "Andere"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:435
 msgid "Window Manager Colors"
@@ -3697,50 +3714,60 @@ msgstr "Arbeitsflächen-Hintergrundbild"
 
 #: src/modules/conf_desk/e_int_config_desk.c:162
 #: src/modules/conf_mime/e_int_config_mime.c:193
-#, fuzzy
 msgid "Set"
-msgstr "Aktivieren"
+msgstr "Einstellen"
 
 #: src/modules/conf_desk/e_mod_main.c:35
 msgid "Desk"
 msgstr "Arbeitsfläche"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "Bildschirmsperre konfigurieren"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Automatische Sperre"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
-#, fuzzy
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 msgid "Lock when Enlightenment starts"
-msgstr "Benutze Enlightenment Mauszeiger"
+msgstr "Sperre wenn Enlightenment startet"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
 msgstr "Sperre bei Start des Bildschirmschoners"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+msgid "Time after screensaver activated"
+msgstr "Zeitspanne nach Aktivierung des Bildschirmschoners"
+
+#: 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 Sekunden"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
 msgid "Lock when idle time exceeded"
 msgstr "Sperre mit Ablauf der Leerlaufzeit"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:184
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
 msgid "Idle time to exceed"
 msgstr "Leerlaufzeit läuft ab in"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 Minute(n)"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3751,27 +3778,27 @@ msgstr "%1.0f Minute(n)"
 msgid "Personal"
 msgstr "Persönlich"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Anmeldefenster-Einstellungen"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
 msgstr "Zeige alle Bildschirmbereiche"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr "Zeige auf aktuellem Bildschirmbereich"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
 msgstr "Zeige auf Bildschirmbereich #:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3780,29 +3807,48 @@ msgstr "Zeige auf Bildschirmbereich #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Hintergrundbildmodus"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
 #: src/modules/gadman/e_mod_config.c:149
 msgid "Theme Defined"
 msgstr "Themenspezifisch"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Themenhintergrundbild"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+msgid "User Wallpaper"
+msgstr "Benutzer Hintergrundbild"
+
+#: 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 "Präsentationsmodus eingeben"
+
+#: 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 "Vorschlagen in den Präsentationsmodus zu wechseln"
+
+#: 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 "Falls zuvor aktiviert"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:457
 msgid "Custom Screenlock"
 msgstr "Angepasste Bildschirmsperre"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "Verwende angepasste Bildschirmsperre"
 
@@ -3810,59 +3856,73 @@ msgstr "Verwende angepasste Bildschirmsperre"
 msgid "Screen Lock"
 msgstr "Bildschirmsperre"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "Arbeitsflächeneinstellungen"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Anzahl der Arbeitsflächen"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Arbeitsflächenwechsel mit der Maus"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "Animierter Wechsel"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Arbeitsflächen"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Wechsle beim Ziehen von Objekten an Bildschirmkante"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: src/modules/conf_desks/e_int_config_desks.c:298
 msgid "Wrap desktops around when flipping"
 msgstr "Durchlaufende ringförmige Anordnung der Arbeitsflächen"
 
-#: src/modules/conf_desks/e_int_config_desks.c:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "Animation beim Wechsel"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Aus"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "Verschieben"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Vergrößerung"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 sek"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+msgid "Background panning"
+msgstr "Hintergrund schwenken"
+
+#: src/modules/conf_desks/e_int_config_desks.c:321
+#, c-format
+msgid "%.2f X-axis pan factor"
+msgstr "%.2f X-Achsen Schwenkfaktor"
+
+#: src/modules/conf_desks/e_int_config_desks.c:325
+#, c-format
+msgid "%.2f Y-axis pan factor"
+msgstr "%.2f Y-Achsen Schwenkfaktor"
+
 #: src/modules/conf_desks/e_mod_main.c:35
 msgid "Virtual Desktops"
 msgstr "Arbeitsflächen"
@@ -3878,8 +3938,8 @@ msgstr "Dialogeinstellungen"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -3893,9 +3953,8 @@ msgid "Normal Windows"
 msgstr "Normale Fenster"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:98
-#, fuzzy
 msgid "Default Settings Dialogs Mode"
-msgstr "Standard Dialogmodus"
+msgstr "Standard Einstellungsdialog-Modus"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:101
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:140
@@ -3916,62 +3975,61 @@ msgid "Dialogs"
 msgstr "Dialoge"
 
 #: 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 ""
-"Ist das so OK? Drücken Sie <hilight>Ja</hilight> oder <hilight>Nein</"
-"hilight>.<br> Wenn Sie nichts tun wird die ursprüngliche Auflösung<br>%dx%d "
-"@ %d Hz in %d Sekunden wiederhergestellt."
+"Sieht das OK aus? <hilight>Speichern</hilight> wenn ja, ansonsten "
+"<hilight>Wiederherstellen</hilight>.<br> Wenn Sie nichts tun wird die "
+"ursprüngliche Auflösung<br>%dx%d bei %d Hz in %d Sekunden wiederhergestellt."
 
 #: src/modules/conf_display/e_int_config_display.c: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 ""
-"Ist das so OK? Drücken Sie <hilight>Ja</hilight> oder <hilight>Nein</"
-"hilight>.<br> Wenn Sie nichts tun wird die ursprüngliche Auflösung<br>%dx%d "
-"in %d Sekunden wiederhergestellt."
+"Sieht das OK aus? <hilight>Speichern</hilight> wenn ja, ansonsten "
+"<hilight>Wiederherstellen</hilight>.<br> Wenn Sie nichts tun wird die "
+"ursprüngliche Auflösung<br>%dx%d in %d Sekunden wiederhergestellt."
 
 #: src/modules/conf_display/e_int_config_display.c: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 ""
-"Ist das so OK? Drücken Sie <hilight>Ja</hilight> oder <hilight>Nein</"
-"hilight>.<br> Wenn Sie nichts tun wird die ursprüngliche Auflösung<br>%dx%d "
-"@ %d Hz <hilight>SOFORT</hilight> wiederhergestellt."
+"Sieht das OK aus? <hilight>Speichern</hilight> wenn ja, ansonsten "
+"<hilight>Wiederherstellen</hilight>.<br> Wenn Sie nichts tun wird die "
+"ursprüngliche Auflösung<br>%dx%d bei %d Hz <hilight>SOFORT</hilight> "
+"wiederhergestellt."
 
 #: 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 ""
-"Ist das so OK? Drücken Sie <hilight>Ja</hilight> oder <hilight>Nein</"
-"hilight>.<br> Wenn Sie nichts tun wird die ursprüngliche Auflösung<br>%dx%d "
-"<hilight>SOFORT</hilight> wiederhergestellt."
+"Sieht das OK aus? <hilight>Speichern</hilight> wenn ja, ansonsten "
+"<hilight>Wiederherstellen</hilight>.<br>Wenn Sie nichts tun wird die "
+"ursprüngliche Auflösung<br>%dx%d <hilight>SOFORT</hilight> wiederhergestellt."
 
 #: src/modules/conf_display/e_int_config_display.c:190
 msgid "Resolution change"
 msgstr "Auflösungsänderung"
 
 #: src/modules/conf_display/e_int_config_display.c:194
-#, fuzzy
 msgid "Save"
-msgstr "Status"
+msgstr "Speichern"
 
 #: src/modules/conf_display/e_int_config_display.c:195
-#, fuzzy
 msgid "Restore"
-msgstr "Neustart"
+msgstr "Wiederherstellen"
 
 #: src/modules/conf_display/e_int_config_display.c:228
 msgid "Screen Resolution Settings"
@@ -4002,7 +4060,6 @@ msgid "Missing Features"
 msgstr "Fehlende Funktionen"
 
 #: src/modules/conf_display/e_int_config_display.c:642
-#, fuzzy
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4011,7 +4068,7 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 "Ihrem X-Display-Server fehlt unterstützung<br>für die <hilight>XRandR</"
-"hilight> (X Resize and Rotate) -Erweiterung.<br>Sie können ihre Auflösung "
+"hilight> (X Resize and Rotate) Erweiterung.<br>Sie können ihre Auflösung "
 "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."
 
@@ -4054,24 +4111,23 @@ msgstr "Auf dem aktuellen X-Server ist keine <br>DPMS-Erweiterung aktiv."
 msgid "Display Power Management Settings"
 msgstr "Zeige Energiemanagementeinstellungen an"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
 msgid "Enable Display Power Management"
 msgstr "Aktiviere Anzeigenenergiemanagement"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:203
-#, fuzzy
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
-msgstr "Zeitschaltuhr(en)"
+msgstr "Zeitschaltuhren"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "Zeit zum Bereitschaftsmodus"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "Zeit zum Ruhezustand"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "Abschaltzeit"
 
@@ -4092,32 +4148,30 @@ 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:"
 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
-#, fuzzy
 msgid "Edge Binding Settings"
-msgstr "Tastenbelegungseinstellungen"
+msgstr "Kantenbelegungseinstellungen"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
 #: src/modules/conf_edgebindings/e_mod_main.c:35
-#, fuzzy
 msgid "Edge Bindings"
-msgstr "Tastenbelegungen"
+msgstr "Kantenbelegungen"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
-#, fuzzy
 msgid "Add Edge"
-msgstr "Helfer hinzufügen"
+msgstr "Kante hinzufügen"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
-#, fuzzy
 msgid "Delete Edge"
-msgstr "Entferne Taste"
+msgstr "Entferne Kante"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
-#, fuzzy
 msgid "Modify Edge"
-msgstr "Ändere Taste"
+msgstr "Ändere Kante"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
@@ -4143,38 +4197,34 @@ msgid "Action Params"
 msgstr "Aktionsparameter"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#, fuzzy
 msgid "General Options"
 msgstr "Allgemeine Einstellungen"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
-#, fuzzy
 msgid "Allow binding activation with fullscreen windows"
-msgstr "Erlaube Fenstern über Vollbildfenstern zu liegen"
+msgstr "Erlaube Aktivierung der Belegungen bei Vollbildfenstern"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
-#, fuzzy
 msgid "Edge Binding Sequence"
-msgstr "Tastenbelegungsabfolge"
+msgstr "Kantenbelegungsabfolge"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
-#, fuzzy, c-format
+#, c-format
 msgid "%.2f seconds"
-msgstr "%2.2f Sekunden"
+msgstr "%.2f Sekunden"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
-#, fuzzy
 msgid "Binding Edge Error"
-msgstr "Tastenbelegungsfehler"
+msgstr "Kantenbelegungsfehler"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
-"Die Tastenbelegungsabfolge die Sie wählten wird bereits von der <br><hilight>"
-"%s</hilight>-Aktion verwendet.<br>Bitte wählen Sie eine andere Abfolge."
+"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_keybindings/e_int_config_keybindings.c:1276
@@ -4222,9 +4272,8 @@ msgid "Default Engine"
 msgstr "Standard-Engine"
 
 #: src/modules/conf_engine/e_int_config_engine.c:131
-#, fuzzy
 msgid "Enable Composite Support ?"
-msgstr "Aktiviere Composite-Manager"
+msgstr "Composite-Unterstützung aktivieren?"
 
 #: src/modules/conf_engine/e_int_config_engine.c:133
 msgid ""
@@ -4232,6 +4281,9 @@ msgid ""
 "not support composite.<br><br>Are you sure you wish to enable composite "
 "support ?"
 msgstr ""
+"Sie haben sich entschieden \"Composite\"-Unterstützung zu aktivieren,"
+"<br><br>aber ihr Bildschirm unterstützt es nicht.<br><br>Sind Sie sicher, "
+"dass sie \"Composite\"-Unterstützung aktivieren wollen?"
 
 #: src/modules/conf_engine/e_mod_main.c:35
 msgid "Engine"
@@ -4372,9 +4424,8 @@ msgid "Textblock Big"
 msgstr "großer Textblock"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:70
-#, fuzzy
 msgid "Settings Heading"
-msgstr "Arbeitsflächen Einstellungen"
+msgstr "Einstellungstitel"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
@@ -4461,9 +4512,8 @@ msgid "Typebuf"
 msgstr "Typebuf"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:97
-#, fuzzy
 msgid "Desktop Icon"
-msgstr "Zeige Arbeitsflächenicons"
+msgstr "Arbeitsflächenicons"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
@@ -4556,7 +4606,7 @@ msgstr "Icon-Erscheinungsbild"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:198
 msgid "Icon theme overrides general theme"
-msgstr ""
+msgstr "Icon-Thema überschreibt Haupt-Thema"
 
 #: src/modules/conf_icon_theme/e_mod_main.c:35
 msgid "Icon Theme"
@@ -4606,7 +4656,6 @@ msgid "Exported Environment Variables"
 msgstr "Exportierte Umgebungsvariablen"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:66
-#, fuzzy
 msgid "Select an Input Method Settings..."
 msgstr "Wählen Sie eine Eingabemethodenkonfiguration aus..."
 
@@ -4636,22 +4685,20 @@ msgid "Language"
 msgstr "Sprache"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:37
-#, fuzzy
 msgid "Interaction Settings"
-msgstr "Auswahleinstellungen"
+msgstr "Interaktionseinstellungen"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:94
-#, fuzzy
 msgid "Thumbscroll"
-msgstr "Minibild"
+msgstr "Fingerscrolling"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:96
 msgid "Enable Thumbscroll"
-msgstr ""
+msgstr "Fingerscrolling aktivieren"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:100
 msgid "Threshold for a thumb drag"
-msgstr ""
+msgstr "Grenzbereich für Ziehen per Finger"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:103
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:228
@@ -4660,27 +4707,27 @@ msgid "%1.0f pixels"
 msgstr "%1.0f Pixel"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
-msgstr ""
+#, fuzzy
+msgid "Threshold for applying drag momentum"
+msgstr "Grenzbereich für übernehmen des Zugmoments"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f pixels/sec"
-msgstr "%5.0f Pixel/Sek"
+msgstr "%1.0f Pixel/Sekunde"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:114
 msgid "Friction slowdown"
-msgstr ""
+msgstr "Verlangsamung durch Reibung"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "%1.2f sec"
-msgstr "%1.1f sek"
+msgstr "%1.2f Sekunde(n)"
 
 #: src/modules/conf_interaction/e_mod_main.c:35
-#, fuzzy
 msgid "Interaction"
-msgstr "Interlingua"
+msgstr "Interaktion"
 
 #: src/modules/conf_intl/e_int_config_intl.c:583
 #: src/modules/conf_intl/e_mod_main.c:35
@@ -4882,7 +4929,7 @@ msgid "Select an Edj File"
 msgstr "Wähle eine .edj-Datei aus"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Dateien"
 
@@ -4961,20 +5008,18 @@ msgstr "Mauszeiger-Einstellungen"
 
 #: 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 "Schattenfarbe"
+msgstr "Zeige Mauszeiger"
 
 #: 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 "Verwende X-Mauszeiger"
+msgstr "Inaktiver Mauszeiger"
 
 #: 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 "Benutze Enlightenment Mauszeiger"
+msgstr "Verwende Enlightenment Mauszeiger"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:143
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:223
@@ -4992,12 +5037,11 @@ msgstr "Mauszeiger"
 #: src/modules/conf_mouse/e_int_config_mouse.c:36
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
-msgstr "Maus Einstellungen"
+msgstr "Maus-Einstellungen"
 
 #: src/modules/conf_mouse/e_int_config_mouse.c:97
-#, fuzzy
 msgid "Mouse Hand"
-msgstr "Maustastenbelegungen"
+msgstr "Maushand"
 
 #: src/modules/conf_mouse/e_int_config_mouse.c:105
 msgid "Mouse Acceleration"
@@ -5073,9 +5117,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 "Anwendungslaufzeitfehler"
+msgstr "Anwendungspriorität"
 
 #: src/modules/conf_performance/e_int_config_performance.c:146
 msgid "Cache Settings"
@@ -5143,14 +5186,13 @@ msgid "Reset"
 msgstr "Rücksetzen"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:281
-#, fuzzy, c-format
+#, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
-msgstr "Sie wollen diese Modulablage entfernen.<br><br>Sind Sie sicher?"
+msgstr "Sie wollen das Profil \"%s\" entfernen.<br><br>Sind Sie sicher?"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:285
-#, fuzzy
 msgid "Delete OK?"
-msgstr "Entferne Taste"
+msgstr "Enternen OK?"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:350
 msgid "Add New Profile"
@@ -5161,133 +5203,120 @@ msgid "Profiles"
 msgstr "Profile"
 
 #: src/modules/conf_scale/e_int_config_scale.c:61
-#, fuzzy
 msgid "Scaling Settings"
-msgstr "Dialogeinstellungen"
+msgstr "Skalierungseinstellungen"
 
 #: src/modules/conf_scale/e_int_config_scale.c:140
 msgid "Scale with DPI"
-msgstr ""
+msgstr "Mit DPI skalieren"
 
 #: src/modules/conf_scale/e_int_config_scale.c:144
-#, fuzzy
 msgid "Relative"
-msgstr "nach oben"
+msgstr "Bezugspunkt"
 
 #: src/modules/conf_scale/e_int_config_scale.c:145
 msgid "Base DPI to scale relative to"
-msgstr ""
+msgstr "Basis-DPI der Skalierung relativ zu"
 
 #: 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 "Momentan %i DPI"
 
 #: src/modules/conf_scale/e_int_config_scale.c:245
-#, fuzzy
 msgid "Policy"
-msgstr "Polnisch"
+msgstr "Richtlinie"
 
 #: src/modules/conf_scale/e_int_config_scale.c:248
-#, fuzzy
 msgid "Don't Scale"
-msgstr "Nicht erlauben"
+msgstr "Nicht skalieren"
 
 #: src/modules/conf_scale/e_int_config_scale.c:252
 msgid "Scale relative to screen DPI"
-msgstr ""
+msgstr "Relativ zu Bildschirm-DPI skalieren"
 
 #: src/modules/conf_scale/e_int_config_scale.c:255
 #, c-format
 msgid "Base DPI (Currently %i DPI)"
-msgstr ""
+msgstr "Basis-DPI (Aktuell %i DPI)"
 
 #: src/modules/conf_scale/e_int_config_scale.c:263
 msgid "Custom scaling factor"
-msgstr ""
+msgstr "Eigenständiger Skalierungsfaktor"
 
 #: 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 Dateien"
+msgstr "%1.0f mal"
 
 #: src/modules/conf_scale/e_int_config_scale.c:272
-#, fuzzy
 msgid "Constraints"
-msgstr "Container"
+msgstr "Grenzen"
 
 #: src/modules/conf_scale/e_int_config_scale.c:273
-#, fuzzy
 msgid "Minimum"
-msgstr "Minimale Größe"
+msgstr "Minimal"
 
 #: src/modules/conf_scale/e_int_config_scale.c:279
-#, fuzzy
 msgid "Maximum"
-msgstr "Maximale Größe"
+msgstr "Maximal"
 
 #: src/modules/conf_scale/e_mod_main.c:35
-#, fuzzy
 msgid "Scaling"
-msgstr "Ablage"
+msgstr "Skalierung"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Bildschirmschonereinstellungen"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 "Aktiviere X-Bildschirmschoner"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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 "Bildschrimschoner-Zeitschaltuhr"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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 "Zeit bis zum Start des Bildschirmschoners"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
 msgstr "Zeit bis zum Wechsel des Bildschirmschoners"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f Sekunden"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "Abschalten"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Bevorzugt"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "Nicht bevorzugt"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr "Aufdeckungsereignisse"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Erlauben"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "Nicht erlauben"
 
@@ -5300,10 +5329,9 @@ msgid "Configured Shelves"
 msgstr "Konfigurierte Modulablagen"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
-#, fuzzy
+#: src/modules/ibar/e_mod_config.c:114
 msgid "Setup"
-msgstr "Arbeitsflächenwechsel mit der Maus"
+msgstr "Konfiguration"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:277
 #, c-format
@@ -5330,7 +5358,6 @@ msgid "Theme Selector"
 msgstr "Themenwähler"
 
 #: src/modules/conf_theme/e_int_config_theme.c:431
-#, fuzzy
 msgid " Import..."
 msgstr "Importiere..."
 
@@ -5346,10 +5373,6 @@ msgstr "Themenkategorien"
 msgid "Assign"
 msgstr "Zuweisen"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "Leeren"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "Alle leeren"
@@ -5378,9 +5401,8 @@ msgstr ""
 "zu importieren."
 
 #: src/modules/conf_theme/e_int_config_theme_web.c:127
-#, fuzzy
 msgid "Exchange themes"
-msgstr "Icon-Erscheinungsbild"
+msgstr "\"Exchange\"-Themen"
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:44
 msgid "Transition Settings"
@@ -5493,9 +5515,8 @@ msgstr ""
 "Aus irgendeinem Grund konnte Enlightenment keinen Gradienten erstellen."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
-#, fuzzy
 msgid "Wallpaper settings..."
-msgstr "Hintergrundeinstellungen"
+msgstr "Hintergrundeinstellungen..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
 msgid "Fill and Stretch Options"
@@ -5573,9 +5594,8 @@ msgstr ""
 "sicher, dass dies ein gültiges Hintergrundbild ist?"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:122
-#, fuzzy
 msgid "Exchange wallpapers"
-msgstr "Themenhintergrundbild"
+msgstr "\"Exchange\"-Hintergrundbilder"
 
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
@@ -5805,30 +5825,25 @@ msgid "Resistance to desktop gadgets:"
 msgstr "Widerstand zu Arbeitsflächenhelfern:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:160
-#, fuzzy
 msgid "Keyboard move and resize"
-msgstr "Tastatur & Maus"
+msgstr "Verschieben und Vergrößern per Tastatur"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:161
-#, fuzzy
 msgid "Automatically accept changes after:"
-msgstr "Verschiebe Inhalte automatisch"
+msgstr "Automatisch Herausforderungen annehmen nach:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:165
-#, fuzzy
 msgid "Move by:"
-msgstr "Verschieben"
+msgstr "Verschieben um:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:169
-#, fuzzy
 msgid "Resize by:"
-msgstr "Größe ändern"
+msgstr "Größe ändern um:"
 
 #: 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 "Maximierungsrichtlinien"
+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
@@ -5850,9 +5865,8 @@ msgid "Maximize Policy"
 msgstr "Maximierungsrichtlinien"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
-#, fuzzy
 msgid "Maximize Directions"
-msgstr "Maximiere horizontal"
+msgstr "Maximierungsrichtungen"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
 msgid "Both"
@@ -5869,9 +5883,8 @@ 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 "Fensterschattierung"
+msgstr "Fenster stapeln"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:140
@@ -5906,14 +5919,12 @@ 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_mod_main.c:17
-#, fuzzy
 msgid "Window Remembers"
-msgstr "Fenstereigenschaften merken"
+msgstr "Fenster merken"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:95
-#, fuzzy
 msgid "Delete Remember(s)"
-msgstr "Erinnern"
+msgstr "Entferne Erinnerung(en)"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:105
 msgid "Details"
@@ -5921,9 +5932,8 @@ msgstr "Details"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:108
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:269
-#, fuzzy
 msgid "<No Name>"
-msgstr "Icon-Name"
+msgstr "<kein Name>"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:111
 msgid "Class:"
@@ -5931,9 +5941,8 @@ msgstr "Klasse:"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:113
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:271
-#, fuzzy
 msgid "<No Class>"
-msgstr "Klasse"
+msgstr "<keine Klasse>"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:116
 msgid "Title:"
@@ -5941,20 +5950,17 @@ msgstr "Titel:"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:118
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:273
-#, fuzzy
 msgid "<No Title>"
-msgstr "Titel"
+msgstr "<kein Titel>"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:121
-#, fuzzy
 msgid "Role:"
-msgstr "Rolle"
+msgstr "Rolle:"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:123
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:275
-#, fuzzy
 msgid "<No Role>"
-msgstr "<Nichts>"
+msgstr "<keine Rolle>"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:62
 msgid "Window List Settings"
@@ -6029,29 +6035,24 @@ msgid "Cpufreq"
 msgstr "CpuFreq"
 
 #: src/modules/cpufreq/e_mod_main.c:182
-#, fuzzy
 msgid "Fast (4 ticks)"
-msgstr "Sehr schnell (0,5s)"
+msgstr "Schnell (4 ticks)"
 
 #: src/modules/cpufreq/e_mod_main.c:189
-#, fuzzy
 msgid "Medium (8 ticks)"
-msgstr "Schnell (1s)"
+msgstr "Mittel (8 ticks)"
 
 #: src/modules/cpufreq/e_mod_main.c:196
-#, fuzzy
 msgid "Normal (32 ticks)"
-msgstr "Normal (2s)"
+msgstr "Normal (32 ticks)"
 
 #: src/modules/cpufreq/e_mod_main.c:203
-#, fuzzy
 msgid "Slow (64 ticks)"
-msgstr "Langsam (5s)"
+msgstr "Langsam (64 ticks)"
 
 #: src/modules/cpufreq/e_mod_main.c:210
-#, fuzzy
 msgid "Very Slow (256 ticks)"
-msgstr "Sehr langsam (30s)"
+msgstr "Sehr langsam (256 ticks)"
 
 #: src/modules/cpufreq/e_mod_main.c:225
 msgid "Manual"
@@ -6075,7 +6076,7 @@ msgstr "Leistungsrichtlinien wiederherstellen"
 
 #: src/modules/cpufreq/e_mod_main.c:252
 msgid "Powersaving policy"
-msgstr ""
+msgstr "Energiesparrichtlinie"
 
 #: src/modules/cpufreq/e_mod_main.c:280
 msgid "Automatic powersaving"
@@ -6105,7 +6106,7 @@ msgstr "Geschwindigkeit einstellen"
 
 #: src/modules/cpufreq/e_mod_main.c:337
 msgid "Powersaving behavior"
-msgstr ""
+msgstr "Energiesparverhalten"
 
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid ""
@@ -6229,31 +6230,19 @@ msgstr "Schlagschatten"
 msgid "Run Command Dialog"
 msgstr "\"Befehl ausführen\"-Dialog"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "Laufzeitfehler"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
-#: src/modules/fileman/e_mod_main.c:332
-#, fuzzy
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
-msgstr "Favoritenmenü"
+msgstr "Favoriten"
 
-#: src/modules/fileman/e_mod_main.c:344
-#, fuzzy
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
-msgstr "Neustarten"
+msgstr "Root"
 
-#: src/modules/fileman/e_mod_main.c:441
-#, fuzzy
+#: 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 "
@@ -6263,15 +6252,15 @@ msgid ""
 "defaults will fix<br>that by adding it in. You can re-configure things now "
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
-"Die Konfigurationsdaten müssen auf den neusten Stand gebracht werden."
-"<br>Ihre alte Konfiguration wurde zugunsten neuer Standardeinstellungen "
-"entfernt.<br>In der Entwicklungsphase wird dies regelmäßig vorkommen, "
-"weswegen Sie keine<br>Programmfehler melden sollten. Dies ist nötig um in "
-"der alten Konfiguration fehlende<br>Funktionalität nachzurüsten. Sie können "
-"nun eine Rekonfiguration vornehmen wenn<br>Sie möchten. Entschuldigen Sie "
-"die Unannehmlichkeiten.<br>"
+"Die Einstellungen des Dateimanagermoduls mussten aktualisiert werden."
+"<br>Ihre alte Konfiguration wurde durch Standardeinstellungen ersetzt.<br>Da "
+"dies während der Entwicklung regelmäßig passiert handelt es sich nicht um "
+"einen Fehler.<br>Der Dateimanager brauchte neue Konfigurationsdaten die in "
+"der<br>alten Konfiguration schlichtweg nicht enthalten waren.<br>Durch die "
+"aktualisierung wird dies behoben. Sie können die Einstellungen wieder ihren "
+"Wünschen anpassen.<br>Entschuldigen Sie die Unannehmlichkeiten.<br>"
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -6288,136 +6277,132 @@ msgstr ""
 "Standardeinstellungen<br>benutzt. Bitte entschuldigen Sie etwaige "
 "Unannehmlichkeiten.<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
-#, fuzzy
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
-msgstr "Datei-Manager-Einstellungen"
+msgstr "Dateimanager-Einstellungen aktualisiert"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr "Datei-Manager-Einstellungen"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Icon-Größe"
 
-#: src/modules/fileman/e_mod_config.c:224
-#, fuzzy
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
 msgstr "Ansicht"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr "Öffne Verzeichnisse in aktuellem Fenster"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "Ordne Verzeichnisse zuerst an"
 
-#: src/modules/fileman/e_mod_config.c:234
-#, fuzzy
+#: src/modules/fileman/e_mod_config.c:243
 msgid "Case Sensitive"
-msgstr "Grundgröße"
+msgstr "Groß-/Kleinschreibung beachten"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "Verwende einfachen Klick"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
-msgstr ""
+msgstr "Verwende alternative Auswahlmodifikatoren"
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr "Zeige Icon-Erweiterung"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "Zeige kompletten Pfad"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr "Zeige Arbeitsflächenicons"
 
-#: src/modules/fileman/e_mod_config.c:254
-#, fuzzy
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
-msgstr "Schattenfarbe"
-
-#: src/modules/fileman/e_mod_config.c:257
-#, fuzzy
-msgid "Show HAL icons on desktop"
-msgstr "Zeige die Arbeitsfläche"
+msgstr "Zeige Werkzeugleiste"
 
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
 msgstr "Verhalten"
 
-#: src/modules/fileman/e_fwin.c:1187
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr "Zeige HAL-Icons auf der Arbeitsfläche"
+
+#: src/modules/fileman/e_mod_config.c:273
+msgid "Mount volumes on insert"
+msgstr "Hänge Medien beim einlegen ein"
+
+#: src/modules/fileman/e_mod_config.c:276
+msgid "Open filemanager on mount"
+msgstr "Öffne Dateimanager beim einhängen"
+
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr "Gehe zum übergeordneten Verzeichnis"
 
-#: src/modules/fileman/e_fwin.c:1249
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1524
 msgid "Other application..."
-msgstr "Anwendung hinzufügen..."
+msgstr "Andere Anwendung..."
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Öffnen"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Öffnen mit..."
 
-#: src/modules/fileman/e_fwin.c:1628
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1892
 msgid "Known Applications"
-msgstr "Anwendungen"
+msgstr "Bekannte Anwendungen"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Bestimmte Anwendungen"
 
-#: src/modules/fileman/e_fwin.c:1680
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
-msgstr "Befehl ausführen ..."
+msgstr "Individueller Befehl"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:53
-#, fuzzy, c-format
+#, c-format
 msgid "%d operations"
-msgstr "Ausblenddauer"
+msgstr "%d Operationen"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:55
-#, fuzzy, c-format
+#, c-format
 msgid "idle"
-msgstr "Kacheln"
+msgstr "inaktiv"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:139
 msgid "EFM Operation Info"
-msgstr ""
+msgstr "EFM Operationsinformation"
 
 #: src/modules/gadman/e_mod_config.c:58
-#, fuzzy
 msgid "Gadgets Manager"
-msgstr "Datei-Manager"
+msgstr "Helfer-Verwaltung"
 
 #: src/modules/gadman/e_mod_config.c:147
-#, fuzzy
 msgid "Background Mode"
-msgstr "Hintergründe"
+msgstr "Hintergrundmodus"
 
 #: src/modules/gadman/e_mod_config.c:152 src/modules/gadman/e_mod_config.c:184
-#, fuzzy
 msgid "Custom Image"
-msgstr "Befehl ausführen ..."
+msgstr "Individuelles Bild"
 
 #: src/modules/gadman/e_mod_config.c:156 src/modules/gadman/e_mod_config.c:177
-#, fuzzy
 msgid "Custom Color"
-msgstr "Befehl ausführen ..."
+msgstr "Individuelle Farbe"
 
 #: src/modules/gadman/e_mod_config.c:160
 msgid "Transparent"
@@ -6428,40 +6413,34 @@ msgid "Animations"
 msgstr "Animationen"
 
 #: src/modules/gadman/e_mod_config.c:168
-#, fuzzy
 msgid "Background"
-msgstr "Hintergründe"
+msgstr "Hintergrund"
 
 #: 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 "Grafikobjekte"
+msgstr "Helfer"
 
 #: src/modules/gadman/e_mod_gadman.c:677
-#, fuzzy
 msgid "Free"
-msgstr "F"
+msgstr "Frei"
 
 #: src/modules/gadman/e_mod_gadman.c:709
-#, fuzzy
 msgid "Always on desktop"
-msgstr "Immer im Vordergrund"
+msgstr "Immer auf der Arbeitsfläche"
 
 #: src/modules/gadman/e_mod_gadman.c:719
 msgid "On top pressing"
-msgstr ""
+msgstr "Nach oben durch drücken von"
 
 #: src/modules/gadman/e_mod_gadman.c:748
-#, fuzzy
 msgid "Add other gadgets"
-msgstr "Helfer hinzufügen"
+msgstr "Andere Helfer hinzufügen"
 
 #: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
-#, fuzzy
 msgid "Show/hide gadgets"
-msgstr "Helfer nicht verstecken"
+msgstr "Helfer ein-/ausblenden"
 
 #: 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
@@ -6480,40 +6459,39 @@ msgstr "Vorheriges Fenster"
 msgid "Select a window"
 msgstr "Wähle ein Fenster aus"
 
-#: src/modules/ibar/e_mod_config.c:55
-#, fuzzy
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
-msgstr "Verschiebeeinstellungen"
+msgstr "IBar-Einstellungen"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Ausgewählte IBar-Quelle"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Icon-Beschriftungen"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Zeige Icon-Beschriftung"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "Zeige Programmnamen"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "Zeige Programmkommentar"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "Zeige Programm allgemein"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "Erstelle neue IBar-Quelle"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "Geben Sie einen Namen für die neue Quelle ein:"
 
@@ -6530,34 +6508,33 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Sind Sie sicher, dass Sie diese IBar-Quelle löschen möchten?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Ändere Icon-Eigenschaften"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Icon entfernen"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr "Anwendung hinzufügen"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr "Anwendung erstellen"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Anwendung hinzufügen"
 
 #: src/modules/ibox/e_mod_config.c:52
-#, fuzzy
 msgid "IBox Settings"
-msgstr "Anmeldefenster-Einstellungen"
+msgstr "IBox-Einstellungen"
 
 #: src/modules/ibox/e_mod_config.c:105
 msgid "Display Name"
@@ -6576,9 +6553,8 @@ msgid "Display Icon Name"
 msgstr "Iconnamen anzeigen"
 
 #: src/modules/ibox/e_mod_config.c:125
-#, fuzzy
 msgid "Display Border Caption"
-msgstr "Anzeigeinformationen"
+msgstr "Zeige Randbeschriftung an"
 
 #: src/modules/ibox/e_mod_config.c:155
 msgid "Show windows from all screens"
@@ -6604,98 +6580,89 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr "Arbeitsflächenumschaltereinstellungen"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 msgid "Flip desktop on mouse wheel"
 msgstr "Arbeitsfläche mit Mausrad wechseln"
 
-#: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:164
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 msgid "Show desktop names"
-msgstr "Zeige Popup beim Arbeitsflächenwechsel"
+msgstr "Zeige Arbeitsflächennamen"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
-msgstr "Arbeitsflächenumschalter-Popup-Einstellungen"
+msgstr "Popup-Einstellungen"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr "Zeige Popup beim Arbeitsflächenwechsel"
 
-#: src/modules/pager/e_mod_config.c:133
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
-msgstr "Zeige Popup auf wichtigem Fenster"
+msgstr "Zeige Popup bei wichtigen Fenstern"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr "Auswahl- und Verschiebeschaltfläche"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "Klicken zum Aktivieren"
 
-#: src/modules/pager/e_mod_config.c:175
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
-msgstr "\"Drag and Drop\"-Schaltfläche (behält rel. Plazierung)"
+msgstr "\"Drag and Drop\"-Schaltfläche"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr "Ziehe gesamte Arbeitsfläche"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
-msgstr ""
+msgstr "Höhe des Tastenaktions-Popup"
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "Widerstand bis das Fenster verschoben wird:"
 
-#: src/modules/pager/e_mod_config.c:208
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
-msgstr "Popup-Geschwindigkeit"
+msgstr "Höhe des Arbeitsflächenumschalter-Popups"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr "Popup-Geschwindigkeit"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f Sekunden"
 
-#: src/modules/pager/e_mod_config.c:230
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
-msgstr "Fensterlisten-Einstellungen"
+msgstr "Einstellungen für wichtige Fenster"
 
-#: src/modules/pager/e_mod_config.c:231
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr "Zeige Popup bei wichtigen Fenstern"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 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:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr "Arbeitsflächenumschalter-Taste abgreifen"
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6703,64 +6670,57 @@ 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:344
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
-msgstr "Aktion"
+msgstr "Achtung"
 
-#: src/modules/pager/e_mod_config.c:345
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:344
 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 ""
-"Sie können die rechte Maustaste nicht<br>dafür verwenden, da sie bereits "
-"intern<br>für Kontextmenüs verwendet wird."
+"Sie können die rechte Maustaste nicht in der<br>Modulablage verwenden, da "
+"sie bereits intern<br>für Kontextmenüs vergeben ist.<br>Diese Maustaste "
+"funktioniert nur im Popup."
 
-#: src/modules/pager/e_mod_config.c:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Schaltfläche %i"
 
-#: src/modules/pager/e_mod_main.c:2808
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
-msgstr "Arbeitsflächenumschalter-Popup-Einstellungen"
+msgstr "Zeige Arbeitsflächenumschalter-Popup"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
-msgstr "Klappe Arbeitsfläche nach oben"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
-msgstr "Wechsle zu linker Arbeitsfläche"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
-msgstr "Popup-Geschwindigkeit"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
-msgstr "Klappe Arbeitsfläche nach unten"
+msgstr ""
 
 #: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "Start"
 
 #: src/modules/syscon/e_mod_main.c:34
-#, fuzzy
 msgid "System Control"
-msgstr "System"
+msgstr "Systemsteuerung"
 
 #: src/modules/syscon/e_mod_main.c:55
 msgid "System Controls"
-msgstr ""
+msgstr "Systemeinstellungen"
 
 #: src/modules/temperature/e_mod_config.c:63
 msgid "Temperature Settings"
@@ -6879,19 +6839,16 @@ msgid "Next"
 msgstr "Weiter"
 
 #: src/modules/wizard/e_wizard.c:281
-#, fuzzy
 msgid "Welcome to Enlightenment"
 msgstr "Herzlich Willkommen in Enlightenment"
 
 #: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
-#, fuzzy
 msgid "Select one"
-msgstr "Wählen Sie ein Icon"
+msgstr "Wählen Sie"
 
 #: src/modules/wizard/page_020.c:55
-#, fuzzy
 msgid "Profile"
-msgstr "Profile"
+msgstr "Profil"
 
 #: src/modules/wizard/page_030.c:89
 msgid ""
@@ -6899,29 +6856,29 @@ msgid ""
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
 "on<br>how to get your<br>application menus<br>working."
 msgstr ""
+"Keine Menüdateien wurden<br>auf Ihrem System gefunden.<br>Bitte sehen Sie "
+"die<br>Dokumentation auf<br>www.enlightenment.org<br>für mehr Details "
+"zur<br>Einrichtung Ihrer<br>Anwendungsmenüs ein."
 
 #: src/modules/wizard/page_030.c:107
-#, fuzzy
 msgid "Select application menu"
-msgstr "Bestimmte Anwendungen"
+msgstr "Wählen Sie ein Anwendungsmenü aus"
 
 #: src/modules/wizard/page_030.c:124
 msgid "System Default"
 msgstr "Systemstandard"
 
 #: src/modules/wizard/page_040.c:25
-#, fuzzy
 msgid "Launcher Bar"
-msgstr "Zum Schnellstartmenü hinzufügen"
+msgstr "Programmstartleiste"
 
 #: src/modules/wizard/page_040.c:27
 msgid "Select applications"
 msgstr "Wähle Anwendungen"
 
 #: src/modules/wizard/page_050.c:28
-#, fuzzy
 msgid "Desktop Files"
-msgstr ".desktop-Datei"
+msgstr "Arbeitsflächendateien"
 
 #: src/modules/wizard/page_050.c:32
 msgid "No icons on desktop"
@@ -6944,32 +6901,28 @@ msgid "Mouse over focuses windows"
 msgstr "Mauszeigerberührung aktiviert Fenster"
 
 #: src/modules/wizard/page_070.c:200
-#, fuzzy
 msgid "Select Icons to Add"
-msgstr "Wählen Sie ein Icon"
+msgstr "Wählen Sie hinzuzufügende Icons aus"
 
 #: src/modules/wizard/page_080.c:62
-#, fuzzy
 msgid "Quick Launch"
-msgstr "Führe aus"
+msgstr "Schnellstart"
 
 #: src/modules/wizard/page_080.c:64
 msgid "Select Applications"
 msgstr "Wähle Anwendungen"
 
 #: src/modules/mixer/app_mixer.c:165
-#, fuzzy
 msgid "Capture"
-msgstr "CpuFreq"
+msgstr "Aufnahme"
 
 #: src/modules/mixer/app_mixer.c:167
 msgid "Playback"
 msgstr "Wiedergabe"
 
 #: src/modules/mixer/app_mixer.c:289
-#, fuzzy
 msgid "Output"
-msgstr "Ausgabedaten"
+msgstr "Ausgabe"
 
 #: src/modules/mixer/app_mixer.c:363
 msgid "Cards"
@@ -6988,9 +6941,8 @@ msgid "Channel:"
 msgstr "Kanal:"
 
 #: src/modules/mixer/app_mixer.c:398
-#, fuzzy
 msgid "Type:"
-msgstr "Dateitype:"
+msgstr "Typ:"
 
 #: src/modules/mixer/app_mixer.c:402
 msgid "Left:"
@@ -7000,7 +6952,7 @@ msgstr "Links:"
 msgid "Right:"
 msgstr "Rechts:"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr "Stumm"
 
@@ -7014,7 +6966,7 @@ msgstr "Bearbeiten"
 
 #: src/modules/mixer/conf_gadget.c:202
 msgid "Show both sliders when locked"
-msgstr ""
+msgstr "Zeige beide Schieberegler wenn gesperrt"
 
 #: src/modules/mixer/conf_gadget.c:322
 msgid "Sound Cards"
@@ -7026,32 +6978,32 @@ msgstr "Klang-Einstellungen"
 
 #: src/modules/mixer/conf_module.c:98
 msgid "Mixer to use for global actions:"
-msgstr ""
+msgstr "Zu nutzendes Mischpult für globale Aktionen:"
 
 #: src/modules/mixer/conf_module.c:152
 msgid "Launch mixer..."
 msgstr "Mischpult starten..."
 
 #: src/modules/mixer/conf_module.c:187
-#, fuzzy
 msgid "Mixer Module Settings"
-msgstr "Modul-Einstellungen"
+msgstr "Mischpultmoduleinstellungen"
 
 #: src/modules/mixer/e_mod_main.c:123
-#, fuzzy
 msgid "Mixer Settings Updated"
-msgstr "Dateimanagerkonfiguration aktualisiert"
+msgstr "Mischpulteinstellungen aktualisiert"
 
-#: src/modules/mixer/e_mod_main.c:613
-#, fuzzy
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
-msgstr "Komoren"
+msgstr "Schieberegler"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
 msgstr ""
+"Mischpult-Moduleinstellungsdaten geändert.<br>Ihre alte Konfiguration wurde "
+"mit der neuen Standardkonfiguration ersetzt.<br>Entschuldigen Sie die "
+"Umstände."
 
 #: src/modules/connman/e_mod_main.c:213
 msgid "Connection Manager"
@@ -7074,14 +7026,27 @@ msgid "LAN"
 msgstr "LAN"
 
 #: src/modules/connman/e_mod_main.c:747
-#, fuzzy
 msgid "Specific Device"
-msgstr "Bestimmte Anwendungen"
+msgstr "Bestimmtes Gerät"
 
 #: src/modules/connman/e_mod_main.c:768
 msgid "Networks"
 msgstr "Netzwerke"
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr "Es existiert ein anderer Infobereich"
+
+#: src/modules/systray/e_mod_main.c:872
+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:1070
+msgid "Systray"
+msgstr "Infobereich"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Arbeitsflächen konfigurieren"
 
diff --git a/po/el.gmo b/po/el.gmo
index 780025e..0798b68 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index cbdd54e..06e92d3 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
-"PO-Revision-Date: 2009-02-24 11:11+0000\n"
-"Last-Translator: Geo Kou <Unknown>\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
+"PO-Revision-Date: 2009-05-02 15:43+0200\n"
+"Last-Translator: Giorgos Koutsikos <ragecryx at yahoo.gr>\n"
 "Language-Team: Ελληνικά\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,20 +23,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Σχετικά με το Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -82,69 +82,71 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Είστε σίγουροι ότι θέλετε να σκοτώσετε αυτό το παράθυρο?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Ναι"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Όχι"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Επιθυμείτε σίγουρα την έξοδο?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Αιτήθηκε έξοδος από το Enlightenment.<br><br>Επιθυμείτε σίγουρα την έξοδο?"
 
-#: src/bin/e_actions.c:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Επιθυμείτε σίγουρα να αποσυνδεθείτε?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Επιθυμείτε σίγουρα το κλείσιμο του συστήματος?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Είστε σίγουροι ότι θέλετε να κάνετε επανεκκίνηση?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 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:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "Αιτήθηκε αναστολή Η/Υ.<br><br>Είστε σίγουροι για την αναστολή?"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Είστε σίγουροι οτι θέλετε να κάνετε αδρανοποίηση;"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -152,316 +154,316 @@ msgstr ""
 "Ζητήσατε να αδρανοποίησετε τον Υπολογιστή.<br><br>Είστε σίγουροι οτι θέλετε "
 "να αναστείλετε τις εργασίες στον δίσκο;"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Παράθυρο : Ενέργειες"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Μετακίνηση"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Αλλαγή μεγέθους"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Μενού"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
-msgstr "Μενού Παραθύρου"
+msgstr "Μενού παραθύρου"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Ανύψωση"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Βύθιση"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Σκότωμα"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Παράθυρο : Κατάσταση"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
-msgstr "Εναλλαγή σε Κολλημένη Λειτουργία"
+msgstr "Εναλλαγή σε κολλημένη λειτουργία"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
-msgstr "Εναλλαγή σε Εικονιδιοποιημένη Λειτουργία"
+msgstr "Εναλλαγή σε εικονιδιοποιημένη λειτουργία"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
-msgstr "Εναλλαγή σε Λειτουργία Πλήρους Οθόνης"
+msgstr "Εναλλαγή σε λειτουργία πλήρους οθόνης"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Μεγιστοποίηση"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
-msgstr "Μεγιστοποίηση Κάθετα"
+msgstr "Μεγιστοποίηση κάθετα"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
-msgstr "Μεγιστοποίηση Οριζόντια"
+msgstr "Μεγιστοποίηση οριζόντια"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
-msgstr "Μεγιστοποίηση σε Πλήρη Οθόνη"
+msgstr "Μεγιστοποίηση σε πλήρη οθόνη"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
-msgstr "Κατάσταση Μεγιστοποίησης \"Έξυπνη\""
+msgstr "Κατάσταση μεγιστοποίησης \"έξυπνη\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
-msgstr "Κατάσταση Μεγιστοποίησης \"Επέκταση\""
+msgstr "Κατάσταση μεγιστοποίησης \"επέκταση\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
-msgstr "Κατάσταση Μεγιστοποίησης \"Γέμισμα\""
+msgstr "Κατάσταση μεγιστοποίησης \"γέμισμα\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
-msgstr "Εναλλαγή σε Κατάσταση χωρίς Περίγραμμα"
+msgstr "Εναλλαγή σε Κατάσταση χωρίς περίγραμμα"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
-msgstr "Εναλλαγή σε Κατάσταση Ακινητοποίησης"
-
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
-msgstr "Επιφάνεια Εργασίας"
+msgstr "Επιφάνεια εργασίας"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
-msgstr "Γύρισμα Επιφάνειας Εργασίας Αριστερά"
+msgstr "Γύρισμα επιφάνειας εργασίας αριστερά"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
-msgstr "Γύρισμα Επιφάνειας Εργασίας Δεξιά"
+msgstr "Γύρισμα επιφάνειας εργασίας δεξιά"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
-msgstr "Γύρισμα Επιφάνειας Εργασίας Επάνω"
+msgstr "Γύρισμα επιφάνειας εργασίας επάνω"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
-msgstr "Γύρισμα Επιφάνειας Εργασίας Κάτω"
+msgstr "Γύρισμα επιφάνειας εργασίας κάτω"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
-msgstr "Γύρισμα Επιφάνειας Εργασίας κατα..."
+msgstr "Γύρισμα επιφάνειας εργασίας κατά..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
-msgstr "Εμφάνιση Επιφάνειας Εργασίας"
+msgstr "Εμφάνιση επιφάνειας εργασίας"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
-msgstr ""
+msgstr "Εμφάνισε το ράφι"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
-msgstr "Γύρισμα Επιφάνειας Εργασίας σε..."
+msgstr "Γύρισμα επιφάνειας εργασίας σε..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
-msgstr "Γύρισμα Επιφάνειας Εργασίας γραμμικά"
+msgstr "Γύρισμα επιφάνειας εργασίας γραμμικά"
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
-msgstr "Ενναλαγή στην Επιφάνεια Εργασίας 0"
+msgstr "Εναλλαγή στην επιφάνεια εργασίας 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
-msgstr "Ενναλαγή στην Επιφάνεια Εργασίας 1"
+msgstr "Εναλλαγή στην επιφάνεια εργασίας 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
-msgstr "Ενναλαγή στην Επιφάνεια Εργασίας 2"
+msgstr "Εναλλαγή στην επιφάνεια εργασίας 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
-msgstr "Ενναλαγή στην Επιφάνεια Εργασίας 3"
+msgstr "Εναλλαγή στην επιφάνεια εργασίας 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
-msgstr "Ενναλαγή στην Επιφάνεια Εργασίας 4"
+msgstr "Εναλλαγή στην επιφάνεια εργασίας 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
-msgstr "Ενναλαγή στην Επιφάνεια Εργασίας 5"
+msgstr "Εναλλαγή στην επιφάνεια εργασίας 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
-msgstr "Ενναλαγή στην Επιφάνεια Εργασίας 6"
+msgstr "Εναλλαγή στην επιφάνεια εργασίας 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
-msgstr "Ενναλαγή στην Επιφάνεια Εργασίας 7"
+msgstr "Εναλλαγή στην επιφάνεια εργασίας 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
-msgstr "Ενναλαγή στην Επιφάνεια Εργασίας 8"
+msgstr "Εναλλαγή στην επιφάνεια εργασίας 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
-msgstr "Ενναλαγή στην Επιφάνεια Εργασίας 9"
+msgstr "Εναλλαγή στην επιφάνεια εργασίας 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
-msgstr "Ενναλαγή στην Επιφάνεια Εργασίας 10"
+msgstr "Εναλλαγή στην επιφάνεια εργασίας 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
-msgstr "Ενναλαγή στην Επιφάνεια Εργασίας 11"
+msgstr "Εναλλαγή στην επιφάνεια εργασίας 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
-msgstr "Ενναλαγή στην Επιφάνεια Εργασίας..."
+msgstr "Εναλλαγή στην επιφάνεια εργασίας..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
-msgstr "Γύρισμα Επιφάνειας Εργασίας Αριστερά (Σε όλες τις Οθόνες)"
+msgstr "Γύρισμα επιφάνειας εργασίας αριστερά (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
-msgstr "Γύρισμα Επιφάνειας Εργασίας Δεξιά(Σε όλες τις Οθόνες)"
+msgstr "Γύρισμα επιφάνειας εργασίας δεξιά(Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
-msgstr "Γύρισμα Επιφάνειας Εργασίας Επάνω (Σε όλες τις Οθόνες)"
+msgstr "Γύρισμα επιφάνειας εργασίας επάνω (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
-msgstr "Γύρισμα Επιφάνειας Εργασίας Κάτω (Σε όλες τις Οθόνες)"
+msgstr "Γύρισμα επιφάνειας εργασίας κάτω (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
-msgstr "Γύρισμα Επιφάνειας Εργασίας κατα... (Σε όλες τις Οθόνες)"
+msgstr "Γύρισμα επιφάνειας εργασίας κατά... (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
-msgstr "Γύρισμα Επιφάνειας Εργασίας σε... (Σε όλες τις Οθόνες)"
+msgstr "Γύρισμα επιφάνειας εργασίας σε... (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
-msgstr "Γύρισμα Επιφάνειας Εργασίας Γραμμικά... (Σε όλες τις Οθόνες)"
+msgstr "Γύρισμα επιφάνειας εργασίας γραμμικά... (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
-msgstr ""
+msgstr "Εναλλαγή επιφάνειας εργασίας σε κατεύθυνση..."
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
-msgstr "Αλλαγή στην Επιφάνεια Εργασίας 0 (Όλες Οθόνες)"
+msgstr "Αλλαγή στην επιφάνεια εργασίας 0 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
-msgstr "Αλλαγή στην Επιφάνεια Εργασίας 1 (Όλες Οθόνες)"
+msgstr "Αλλαγή στην επιφάνεια εργασίας 1 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
-msgstr "Αλλαγή στην Επιφάνεια Εργασίας 2 (Όλες Οθόνες)"
+msgstr "Αλλαγή στην επιφάνεια εργασίας 2 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
-msgstr "Αλλαγή στην Επιφάνεια Εργασίας 3 (Όλες Οθόνες)"
+msgstr "Αλλαγή στην επιφάνεια εργασίας 3 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
-msgstr "Αλλαγή στην Επιφάνεια Εργασίας 4 (Όλες Οθόνες)"
+msgstr "Αλλαγή στην επιφάνεια εργασίας 4 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
-msgstr "Αλλαγή στην Επιφάνεια Εργασίας 5 (Όλες Οθόνες)"
+msgstr "Αλλαγή στην επιφάνεια εργασίας 5 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
-msgstr "Αλλαγή στην Επιφάνεια Εργασίας 6 (Όλες Οθόνες)"
+msgstr "Αλλαγή στην επιφάνεια εργασίας 6 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
-msgstr "Αλλαγή στην Επιφάνεια Εργασίας 7 (Όλες Οθόνες)"
+msgstr "Αλλαγή στην επιφάνεια εργασίας 7 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
-msgstr "Αλλαγή στην Επιφάνεια Εργασίας 8 (Όλες Οθόνες)"
+msgstr "Αλλαγή στην επιφάνεια εργασίας 8 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
-msgstr "Αλλαγή στην Επιφάνεια Εργασίας 9 (Όλες Οθόνες)"
+msgstr "Αλλαγή στην επιφάνεια εργασίας 9 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
-msgstr "Αλλαγή στην Επιφάνεια Εργασίας 10 (Όλες Οθόνες)"
+msgstr "Αλλαγή στην επιφάνεια εργασίας 10 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
-msgstr "Αλλαγή στην Επιφάνεια Εργασίας 11 (Όλες Οθόνες)"
+msgstr "Αλλαγή στην επιφάνεια εργασίας 11 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
-msgstr "Αλλαγή στην Επιφάνεια Εργασίας... (Όλες Οθόνες)"
+msgstr "Αλλαγή στην επιφάνεια εργασίας... (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -471,102 +473,117 @@ msgstr "Αλλαγή στην Επιφάνεια Εργασίας... (Όλες 
 msgid "Screen"
 msgstr "Οθόνη"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
-msgstr "Αποστολή Ποντικιού στη Οθόνη 0"
+msgstr "Αποστολή ποντικιού στη οθόνη 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
-msgstr "Αποστολή Ποντικιού στη Οθόνη 1"
+msgstr "Αποστολή ποντικιού στη οθόνη 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
-msgstr "Αποστολή Ποντικιού στη Οθόνη..."
+msgstr "Αποστολή ποντικιού στη οθόνη..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
-msgstr "Προώθηση Ποντικιού κατά 1 Οθόνη Μπροστά"
+msgstr "Προώθηση ποντικιού κατά 1 οθόνη μπροστά"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
-msgstr "Προώθηση Ποντικιού κατά 1 Οθόνη Πίσω"
+msgstr "Προώθηση ποντικιού κατά 1 οθόνη πίσω"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
-msgstr "Προώθηση Ποντικιού κατά ... Οθόνες"
+msgstr "Προώθηση ποντικιού κατά ... οθόνες"
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Παράθυρο : Μετακίνηση"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
-msgstr "Στην Επόμενη Επιφάνεια Εργασίας"
+msgstr "Στην επόμενη επιφάνεια εργασίας"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
-msgstr "Στην Προηγούμενη Επιφάνεια Εργασίας"
+msgstr "Στην προηγούμενη επιφάνεια εργασίας"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
-msgstr "Κατά Επιφάνεια Εργασίας #..."
+msgstr "Κατά επιφάνεια εργασίας #..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
-msgstr "Στην Επιφάνεια Εργασίας..."
+msgstr "Στην επιφάνεια εργασίας..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
-msgstr "Εμφάνιση Κεντρικού Μενού"
+msgstr "Εμφάνιση κεντρικού μενού"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
-msgstr "Εμφάνιση Μενού Αγαπημένων"
+msgstr "Εμφάνιση μενού αγαπημένων"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
-msgstr "Εμφάνιση Μενού Όλων των Εφαρμογών"
+msgstr "Εμφάνιση μενού όλων των εφαρμογών"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
-msgstr "Εμφάνιση Μενού Πελατων"
+msgstr "Εμφάνιση μενού πελατών"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
-msgstr "Εμφάνιση Μενού..."
+msgstr "Εμφάνιση μενού..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Εντολή"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Εφαρμογή"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Επανεκκίνηση"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
-msgstr ""
+msgstr "Έξοδος τώρα"
+
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment %s άρθρωμα"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Εναλλαγή σε λειτουργία πλήρους οθόνης"
+
+#: src/bin/e_actions.c:2813
+#, fuzzy
+msgid "Offline Mode Toggle"
+msgstr "Εναλλαγή σε κολλημένη λειτουργία"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -579,69 +596,70 @@ msgstr ""
 msgid "System"
 msgstr "Σύστημα"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Αποσύνδεση"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
-msgstr ""
+msgstr "Κλείσιμο τώρα"
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
-msgstr ""
+msgstr "Κλείσιμο"
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Επανεκκίνηση"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Αναστολή"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Αδρανοποίηση"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 msgid "Lock"
-msgstr ""
+msgstr "Κλείδωμα"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
-msgstr "Καθαρισμός Παραθύρων"
+msgstr "Καθαρισμός παραθύρων"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr "Γενικά : Ενέργειες"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
-msgstr "Καθυστερημένη Ενέργεια"
+msgstr "Καθυστερημένη ενέργεια"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
-msgstr "Ορισμός ως Ταπετσαρία"
+msgstr "Ορισμός ως ταπετσαρία"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
-msgstr "Σάρωση αρχείων Επιφάνειας Εργασίας ολοκληρώθηκε"
+msgstr "Σάρωση αρχείων επιφάνειας εργασίας ολοκληρώθηκε"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
-msgstr "Σάρωση αρχείων Επιφάνειας Εργασίας"
+msgstr "Σάρωση αρχείων επιφάνειας εργασίας"
 
 #: src/bin/e_color_dialog.c:29
 msgid "Color Selector"
-msgstr ""
+msgstr "Επιλογή χρώματος"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -653,10 +671,10 @@ msgstr ""
 #: 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:777
 msgid "OK"
-msgstr "Οκ"
+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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -668,7 +686,7 @@ msgstr "Οκ"
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 "
@@ -679,7 +697,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -688,11 +706,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
-msgstr "Ρυθμίσεις Αναβαθμίστηκαν"
+msgstr "Ρυθμίσεις αναβαθμίστηκαν"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -704,7 +722,7 @@ msgstr ""
 "<br><br>Το αρχείο που παρουσιάστηκε το σφάλμα ήταν:<br>%s<br><br>Αυτό το "
 "αρχείο διαγράφηκε για να αποφευχθούν φθαρμένα δεδομένα. <br>"
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -714,7 +732,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -723,7 +741,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -732,7 +750,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -740,11 +758,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
-msgstr "Προβλήματα Εγγραφής Ρυθμίσεων του Enlightenment"
+msgstr "Προβλήματα εγγραφής ρυθμίσεων του Enlightenment"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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,7 +788,7 @@ 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Επεκτάσεις"
 
@@ -779,22 +797,22 @@ msgstr "Επεκτάσεις"
 msgid "Container %d"
 msgstr "Υποδοχέας %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Σφάλμα - δεν υπάρχει PAM υποστήριξη"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Δεν έχει υλοποιηθεί υποστήριξη PAM στο Enlightenment, έτσι<br>το κλείδωμα "
 "του desk είναι απενεργοποιημένο."
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
-msgstr "Κλείδωμα Απέτυχε"
+msgstr "Κλείδωμα απέτυχε"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -803,15 +821,15 @@ msgstr ""
 "είτε το πληκτρολόγιο είτε το ποντίκι ή και τα δύο<br>και η αρπαγή δεν είναι "
 "δυνατόν να σπάσει."
 
-#: src/bin/e_desklock.c:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Παρακαλώ εισάγετε τον κωδικό ξεκλειδώματος"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
-msgstr "Σφάλμα Συστήματος Ταυτοποίησης"
+msgstr "Σφάλμα συστήματος ταυτοποίησης"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -822,9 +840,28 @@ msgstr ""
 "περίοδο. Ο κωδικός σφάλματος ήταν  <hilight>%i</hilight>.<br>Αυτό είναι "
 "άσχημο και δεν θα έπρεπε να συμβαίνει. Παρακαλώ αναφέρετε αυτό το σφάλμα."
 
+#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
-msgstr "Ελλιπείς Ιδιότητες Παραθύρου"
+msgstr "Ελλιπείς ιδιότητες παραθύρου"
 
 #: src/bin/e_eap_editor.c:159
 msgid ""
@@ -837,7 +874,7 @@ msgstr ""
 
 #: 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/modules/conf_fonts/e_int_config_fonts.c:96
@@ -848,7 +885,7 @@ msgstr "Εικονίδιο"
 #: src/bin/e_eap_editor.c:472
 #: src/modules/conf_mime/e_int_config_mime_edit.c:136
 msgid "Basic Info"
-msgstr "Βασικές Πληροφορίες"
+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
@@ -869,12 +906,12 @@ 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"
@@ -882,7 +919,7 @@ msgstr "Κατηγορίες"
 
 #: src/bin/e_eap_editor.c:528
 msgid "Mime Types"
-msgstr "Τύποι Mime"
+msgstr "Τύποι mime"
 
 #: src/bin/e_eap_editor.c:534
 msgid "Options"
@@ -890,61 +927,61 @@ 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 "Αρχείο επιφάνειας εργασίας"
 
 #: 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:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Επικόλληση"
 
 #: src/bin/e_entry.c:529
 msgid "Select All"
-msgstr "Επιλογή Όλων"
+msgstr "Επιλογή όλων"
 
 #: src/bin/e_exec.c:220 src/bin/e_utils.c:201
 #: 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:221 src/bin/e_utils.c:202
 #: src/modules/conf_imc/e_int_config_imc.c:279
@@ -967,260 +1004,313 @@ msgstr ""
 "Το Enlightenment δεν κατάφερε να τρέξει την εφαρμογή:<br><br>%s<br><br>Η "
 "εφαρμογή απέτυχε να ξεκινήσει."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
-msgstr "Σφάλμα Εκτέλεσης Εφαρμογής"
+msgstr "Σφάλμα εκτέλεσης εφαρμογής"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "Η εκτέλεση του %s διακόπηκε απρόοπτα."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Ένας κωδικός εξόδου απο %i επιστράφηκε απο %s."
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
-msgstr "%s διακόπηκε απο ένα Σήμα Διακοπής."
+msgstr "%s διακόπηκε από ένα σήμα διακοπής."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
-msgstr "%s διακόπηκε απο ένα Σήμα Εξόδου."
+msgstr "%s διακόπηκε από ένα σήμα εξόδου."
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
-msgstr "%s διακόπηκε απο ένα Σήμα Ματαίωσης."
+msgstr "%s διακόπηκε από ένα σήμα ματαίωσης."
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
-msgstr "%s διακόπηκε απο ένα Σήμα Τερματισμού."
+msgstr "%s διακόπηκε από ένα σήμα τερματισμού."
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s διακόπηκε απο το σήμα με αριθμό %i."
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
-msgstr "Καταγραφές Σφαλμάτων"
+msgstr "Καταγραφές σφαλμάτων"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Δεν υπήρξε μήνυμα σφάλματος."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
-msgstr "Αποθήκευση αυτού του Μηνύματος"
+msgstr "Αποθήκευση αυτού του μηνύματος"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Αυτή η καταγραφή σφάλματος θα αποθηκευτεί ως %s/%s.log"
 
-#: src/bin/e_exec.c:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
-msgstr "Πληροφορίες Σφάλματος"
+msgstr "Πληροφορίες σφάλματος"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
-msgstr "Πληροφορίες Σήματος Σφάλματος"
+msgstr "Πληροφορίες σήματος σφάλματος"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
-msgstr "Δεδομένα Εξόδου"
+msgstr "Δεδομένα εξόδου"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Δεν υπήρξε έξοδος."
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr "Ανύπαρκτη διαδρομή"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s δεν υπάρχει."
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Σφάλμα προσάρτησης"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Σφάλμα προσάρτησης"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Σφάλμα"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i Αρχεία"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
-msgstr ""
+msgstr "Σύνδεσμος"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr "Ακύρωση"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
-msgstr ""
+msgstr "Κληρονόμησε τις ρυθμίσεις γονέα"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
-msgstr "Λειτουργία Προβολής"
+msgstr "Λειτουργία προβολής"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
-msgstr "Ανανέωση Προβολής"
+msgstr "Ανανέωση προβολής"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
-msgstr "Εμφάνιση Κρυφών Αρχείων"
+msgstr "Εμφάνιση κρυφών αρχείων"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
-msgstr "Απομνημόνευση Σειράς"
+msgstr "Απομνημόνευση σειράς"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
-msgstr "Ταξινόμηση Τώρα"
+msgstr "Ταξινόμηση τώρα"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
-msgstr "Νέος Κατάλογος"
+msgstr "Νέος κατάλογος"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Σίγαση"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
-msgstr "Χρήση Προκαθορισμένων"
+msgstr "Χρήση προκαθορισμένων"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
-msgstr "Εικονίδια Πλέγματος"
+msgstr "Εικονίδια πλέγματος"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
-msgstr "Προσαρμοσμένα Εικονίδια"
+msgstr "Προσαρμοσμένα εικονίδια"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Λίστα"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
-msgstr "Μέγεθος Εικονιδίου (%d)"
+msgstr "Μέγεθος εικονιδίου (%d)"
+
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Ορισμός ως ταπετσαρία"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "Όρισε περιεχόμενο..."
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Καθαρισμός"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
-msgstr "Δημιουργία νέου Καταλόγου"
+msgstr "Δημιουργία νέου καταλόγου"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
-msgstr "Όνομα Νέου Καταλόγου:"
+msgstr "Όνομα νέου καταλόγου:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Μετονομασία %s σε:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
-msgstr "Μετονομασία Αρχείου"
+msgstr "Μετονομασία αρχείου"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr "Προσπάθεια ξανά"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr "Όχι σε ολα"
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr "Ναί σε όλα"
 
-#: src/bin/e_fm.c:8524
-#, fuzzy
+#: src/bin/e_fm.c:9014
 msgid "Warning"
-msgstr "Εκκινεί"
+msgstr "Προειδοποίηση"
 
-#: src/bin/e_fm.c:8527
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9017
+#, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
-msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε<br><hilight>%s</hilight> ?"
+msgstr ""
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr "Παράβλεψη αυτού"
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr "Παράβλεψη όλων"
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "Ένα σφάλμα προέκυψε κατα την εκτέλεση μιας λειτουργίας.<br>%s"
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
-msgstr "Επιβεβαίωση Διαγραφής"
+msgstr "Επιβεβαίωση διαγραφής"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1231,7 +1321,7 @@ msgstr ""
 
 #: src/bin/e_fm_prop.c:108
 msgid "File Properties"
-msgstr "Ιδιότητες Αρχείου"
+msgstr "Ιδιότητες αρχείου"
 
 #: src/bin/e_fm_prop.c:338
 msgid "File:"
@@ -1243,11 +1333,11 @@ msgstr "Μέγεθος:"
 
 #: src/bin/e_fm_prop.c:352
 msgid "Last Modified:"
-msgstr "Τελευταία Τροποποίηση:"
+msgstr "Τελευταία τΤροποποίηση:"
 
 #: src/bin/e_fm_prop.c:359
 msgid "File Type:"
-msgstr "Τύπος Αρχείου:"
+msgstr "Τύπος αρχείου:"
 
 #: src/bin/e_fm_prop.c:366
 msgid "Permissions"
@@ -1281,17 +1371,17 @@ msgid "Preview"
 msgstr "Προεπισκόπηση"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: 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
 msgid "Thumbnail"
-msgstr "Εικόνα Επισκόπησης"
+msgstr "Εικόνα επισκόπησης"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Προσαρμοσμένο"
 
@@ -1301,76 +1391,76 @@ msgstr "Χρησιμοποίησε αυτό το εικονίδιο για αυ
 
 #: src/bin/e_fm_prop.c:456
 msgid "Link Information"
-msgstr "Πληροφορίες Συνδέσμου"
+msgstr "Πληροφορίες συνδέσμου"
 
 #: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
-msgstr "Επιλογή Εικόνας"
+msgstr "Επιλογή εικόνας"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
-msgstr "'Αγνωστος Όγκος"
+msgstr "'Άγνωστος όγκος"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
-msgstr "Αφαιρούμενη Συσκευή"
+msgstr "Αφαιρούμενη συσκευή"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Απλό"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Ένθεμα"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Εμφάνιση"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Αυτόματη κύλιση περιεχομένων"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Δυνατότητα αλλαγής μεγέθους"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Έναρξη μετακίνησης/αλλαγής μεγέθους αυτού του Συστατικού"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
-msgstr "Αφαίρεση αυτού του Συστατικού"
+msgstr "Αφαίρεση αυτού του συστατικού"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "Τέλος μετακίνησης/αλλαγής μεγέθους αυτού του Συστατικού"
 
@@ -1384,15 +1474,15 @@ msgstr ""
 
 #: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:564
 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"
@@ -1410,7 +1500,7 @@ 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
@@ -1423,8 +1513,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1432,7 +1522,7 @@ msgstr "Μέγεθος"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
 #: src/bin/e_int_border_menu.c:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Στοίβαγμα"
 
@@ -1457,7 +1547,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
 msgid "Fullscreen state"
-msgstr "Stato a tutto schermo"
+msgstr "Κατάσταση πλήρους οθόνης"
 
 #: src/bin/e_int_border_locks.c:327
 msgid "Lock me from changing:"
@@ -1465,7 +1555,7 @@ msgstr "Κλείδωσε με από το να αλλάξω:"
 
 #: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
 msgid "Border style"
-msgstr "Στυλ Περιγράμματος"
+msgstr "Στυλ περιγράμματος"
 
 #: src/bin/e_int_border_locks.c:348
 msgid "Stop me from:"
@@ -1481,31 +1571,31 @@ msgstr "Έξοδος από τη συνεδρία με αυτό το παράθ
 
 #: src/bin/e_int_border_locks.c:355
 msgid "Remember these Locks"
-msgstr "Απομνημόνευση των Κελιδωμάτων"
+msgstr "Απομνημόνευση των κλειδαριών"
 
 #: src/bin/e_int_border_menu.c:72
 msgid "Edit Icon"
-msgstr "Επεξεργασία Εικονιδίου"
+msgstr "Επεξεργασία εικονιδίου"
 
 #: src/bin/e_int_border_menu.c:77
 msgid "Add Application..."
-msgstr "Προσθήκη Εφαρμογής..."
+msgstr "Προσθήκη εφαρμογής..."
 
 #: src/bin/e_int_border_menu.c:88
 msgid "Create Icon"
-msgstr "Δημιουργία Εικονιδίου"
+msgstr "Δημιουργία εικονιδίου"
 
 #: src/bin/e_int_border_menu.c:98
 msgid "Send to Desktop"
-msgstr "Αποστολή στην Επιφάνεια Εργασίας"
+msgstr "Αποστολή στην επιφάνεια εργασίας"
 
 #: src/bin/e_int_border_menu.c:110
 msgid "Pin to Desktop"
-msgstr "Καρφίτσωμα στην Επιφάνεια Εργασίας"
+msgstr "Καρφίτσωμα στην επιφάνεια εργασίας"
 
 #: src/bin/e_int_border_menu.c:121
 msgid "Unpin from Desktop"
-msgstr "Ξεκαρφίτσωμα από την Επιφάνεια Εργασίας"
+msgstr "Ξεκαρφίτσωμα από την επιφάνεια εργασίας"
 
 #: src/bin/e_int_border_menu.c:130
 msgid "More..."
@@ -1529,15 +1619,15 @@ msgstr "Απο-μεγιστοποίηση"
 
 #: src/bin/e_int_border_menu.c:484
 msgid "Keyboard Shortcut"
-msgstr "Συντόμευση Πληκτρολογίου"
+msgstr "Συντόμευση πληκτρολογίου"
 
 #: src/bin/e_int_border_menu.c:490
 msgid "To Favorites Menu"
-msgstr "Στο Μενού Αγαπημένων"
+msgstr "Στο μενού αγαπημένων"
 
 #: src/bin/e_int_border_menu.c:495
 msgid "To Launcher"
-msgstr "Στον Εκκινητή"
+msgstr "Στον εκκινητή"
 
 #: src/bin/e_int_border_menu.c:517 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
@@ -1559,11 +1649,11 @@ msgstr "Ενθύμηση"
 
 #: src/bin/e_int_border_menu.c:572 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
-msgstr "Ιδιότητες Παραθύρου"
+msgstr "Ιδιότητες παραθύρου"
 
 #: src/bin/e_int_border_menu.c:784
 msgid "Always On Top"
-msgstr "Πάντα στην Κορυφή"
+msgstr "Πάντα στην κορυφή"
 
 #: src/bin/e_int_border_menu.c:795
 #: src/modules/conf_fonts/e_int_config_fonts.c:101
@@ -1574,11 +1664,11 @@ msgstr "Κανονικό"
 
 #: src/bin/e_int_border_menu.c:806
 msgid "Always Below"
-msgstr "Πάντα από Κάτω"
+msgstr "Πάντα από κάτω"
 
 #: src/bin/e_int_border_menu.c:898
 msgid "Select Border Style"
-msgstr "Επιλογή Στύλ Περιγράμματος"
+msgstr "Επιλογή στυλ περιγράμματος"
 
 #: src/bin/e_int_border_menu.c:910
 msgid "Use E17 Default Icon Preference"
@@ -1604,24 +1694,24 @@ msgstr ""
 #: 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:1039 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
-msgstr "Λίστα Παραθύρων"
-
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+msgstr "Λίστα παραθύρων"
+
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
-msgstr ""
+msgstr "Διαχειριστής επιφανειών"
 
 #: src/bin/e_int_border_menu.c:1059
 msgid "Taskbar"
-msgstr "Γραμμή Εργασιών"
+msgstr "Γραμμή εργασιών"
 
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
@@ -1645,7 +1735,7 @@ 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"
@@ -1657,35 +1747,35 @@ msgstr "Ρόλος"
 
 #: 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 "ID Παραθύρου"
+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"
@@ -1701,11 +1791,11 @@ 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"
@@ -1713,11 +1803,11 @@ 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"
@@ -1729,11 +1819,11 @@ msgstr ""
 
 #: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
 msgid "Skip Taskbar"
-msgstr "Παράλειψη Γραμμής Εργασιών"
+msgstr "Παράλειψη γραμμής εργασιών"
 
 #: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
 msgid "Skip Pager"
-msgstr "Παράλειψη Πίνακα Σελίδων"
+msgstr "Παράλειψη πίνακα σελίδων"
 
 #: src/bin/e_int_border_prop.c:476
 msgid "Hidden"
@@ -1741,7 +1831,7 @@ msgstr "Κρυφό"
 
 #: src/bin/e_int_border_remember.c:75
 msgid "Window Remember"
-msgstr "Ενθύμηση Παραθύρου"
+msgstr "Ενθύμηση παραθύρου"
 
 #: src/bin/e_int_border_remember.c:244
 msgid "Window properties are not a unique match"
@@ -1796,7 +1886,7 @@ msgstr "Τίποτα"
 
 #: src/bin/e_int_border_remember.c:445
 msgid "Size and Position"
-msgstr "Μέγεθος και Θέση"
+msgstr "Μέγεθος και θέση"
 
 #: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
 msgid "Locks"
@@ -1804,27 +1894,27 @@ msgstr "Κλειδώματα"
 
 #: src/bin/e_int_border_remember.c:449
 msgid "Size, Position and Locks"
-msgstr "Μέγεθος, Θέση και Κλειδώματα"
+msgstr "Μέγεθος, θέση και κλειδώματα"
 
 #: src/bin/e_int_border_remember.c:451
 msgid "Everything"
-msgstr "Τα Πάντα"
+msgstr "Τα πάντα"
 
 #: src/bin/e_int_border_remember.c:464
 msgid "Remember using"
-msgstr ""
+msgstr "Ενθύμηση χρήσης"
 
 #: src/bin/e_int_border_remember.c:470
 msgid "Window name and class"
-msgstr "Όνομα και κλάση Παραθύρου"
+msgstr "Όνομα και κλάση παραθύρου"
 
 #: src/bin/e_int_border_remember.c:490
 msgid "Window Role"
-msgstr "Ρόλος Παραθύρου"
+msgstr "Ρόλος παραθύρου"
 
 #: src/bin/e_int_border_remember.c:499
 msgid "Window type"
-msgstr "Τύπος Παραθύρου"
+msgstr "Τύπος παραθύρου"
 
 #: src/bin/e_int_border_remember.c:506
 msgid "Transience"
@@ -1836,19 +1926,19 @@ msgstr "Ρυθμίσεις για απομνημόνευση"
 
 #: src/bin/e_int_border_remember.c:521
 msgid "Icon Preference"
-msgstr "Ρύθμιση Εικονιδίου"
+msgstr "Ρύθμιση εικονιδίου"
 
 #: src/bin/e_int_border_remember.c:525
 msgid "Virtual Desktop"
-msgstr "Εικονικό Desktop"
+msgstr "Εικονική επιφάνεια εργασίας"
 
 #: src/bin/e_int_border_remember.c:531
 msgid "Current Screen"
-msgstr "Τρέχουσα Οθόνη"
+msgstr "Τρέχουσα οθόνη"
 
 #: src/bin/e_int_border_remember.c:533
 msgid "Skip Window List"
-msgstr ""
+msgstr "Παράκαμψη λίστας παραθύρων (%w)"
 
 #: src/bin/e_int_border_remember.c:541
 msgid "Match only one window"
@@ -1865,11 +1955,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
@@ -1877,7 +1967,7 @@ 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"
@@ -1885,67 +1975,67 @@ msgstr "Ράφι"
 
 #: src/bin/e_int_config_modules.c:120
 msgid "Module Settings"
-msgstr "Ρυθμίσεις Αρθρώματος"
+msgstr "Ρυθμίσεις αρθρώματος"
 
 #: src/bin/e_int_config_modules.c:181
 msgid "Available Modules"
-msgstr "Διαθέσιμα Αρθρώματα"
+msgstr "Διαθέσιμα αρθρώματα"
 
 #: src/bin/e_int_config_modules.c:188
 msgid "Load Module"
-msgstr "Φόρτωση Αρθρώματος"
+msgstr "Φόρτωση αρθρώματος"
 
 #: src/bin/e_int_config_modules.c:195
 msgid "Loaded Modules"
-msgstr "Φορτωμένα Αρθρώματα"
+msgstr "Φορτωμένα αρθρώματα"
 
 #: src/bin/e_int_config_modules.c:202
 msgid "Unload Module"
-msgstr "Αποφόρτωση Αρθρώματος"
+msgstr "Αποφόρτωση αρθρώματος"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
-msgstr "Περιγραφή: Μη Διαθέσιμη"
+msgstr "Περιγραφή: Μη διαθέσιμη"
 
 #: src/bin/e_int_gadcon_config.c:32
 msgid "Shelf Contents"
-msgstr "Περιεχόμενα Ραφιού"
+msgstr "Περιεχόμενα ραφιού"
 
 #: src/bin/e_int_gadcon_config.c:38
 msgid "Toolbar Contents"
-msgstr "Περιεχόμενα Γραμμής Εργαλείων"
+msgstr "Περιεχόμενα γραμμής εργαλείων"
 
 #: src/bin/e_int_gadcon_config.c:93 src/modules/gadman/e_mod_config.c:106
 msgid "Available Gadgets"
-msgstr "Διαθέσημα Συστατικά"
+msgstr "Διαθέσιμα συστατικά"
 
 #: src/bin/e_int_gadcon_config.c:100 src/modules/gadman/e_mod_config.c:117
 msgid "Add Gadget"
-msgstr "Προσθήκη Συστατικού"
+msgstr "Προσθήκη συστατικού"
 
 #: src/bin/e_int_gadcon_config.c:106
 msgid "Selected Gadgets"
-msgstr "Επιλεγμένα Συστατικά"
+msgstr "Επιλεγμένα συστατικά"
 
 #: src/bin/e_int_gadcon_config.c:113
 msgid "Remove Gadget"
-msgstr "Αφαίρεση Συστατικού"
+msgstr "Αφαίρεση συστατικού"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: 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:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Διάταξη"
 
 #: src/bin/e_intl.c:361
 msgid "Input Method Error"
-msgstr "Σφάλμα Μεθόδου Εισαγωγής"
+msgstr "Σφάλμα μεθόδου εισαγωγής"
 
 #: src/bin/e_intl.c:362
 msgid ""
@@ -1960,7 +2050,7 @@ msgstr "Κεντρικό"
 
 #: src/bin/e_int_menus.c:106
 msgid "Favorite Applications"
-msgstr "Αγαπημένες Εφαρμογές"
+msgstr "Αγαπημένες εφαρμογές"
 
 #: src/bin/e_int_menus.c:117
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:157
@@ -1979,7 +2069,7 @@ msgstr "Παράθυρα"
 
 #: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
 msgid "Lost Windows"
-msgstr "Χαμένα Παράθυρα"
+msgstr "Χαμένα παράθυρα"
 
 #: src/bin/e_int_menus.c:170
 msgid "About"
@@ -2003,143 +2093,141 @@ 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 "(Nessuna Applicazione)"
+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
 msgid "(No Windows)"
-msgstr "(Χωρίς Παράθυρα)"
+msgstr "(Χωρίς παράθυρα)"
 
 #: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
 msgid "No name!!"
-msgstr "Χωρίς Όνομα!!"
+msgstr "Χωρίς όνομα!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
-msgstr "(Χωρίς Ράφια)"
+msgstr "(Χωρίς ράφια)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Ράφι #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
-msgstr "Προσθήκη Ραφιού"
+msgstr "Προσθήκη ραφιού"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
-msgstr "Διαγραφή Ραφιού"
+msgstr "Διαγραφή ραφιού"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
-msgstr "Ρυθμίσεις Ραφιού"
+msgstr "Ρυθμίσεις ραφιού"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
-msgstr "Πολύ Μικρό"
+msgstr "Πολύ μικρό"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Μεσαίο"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Μεγάλο"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
-msgstr "Πολύ Μεγάλο"
+msgstr "Πολύ μεγάλο"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 msgid "Set Contents..."
-msgstr "Περιεχόμενα Ραφιού"
+msgstr "Όρισε περιεχόμενο..."
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Πάνω από όλα"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
-msgstr "Κάτω από τα Παράθυρα"
+msgstr "Κάτω από τα παράθυρα"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
-msgstr "Κάτω από τα Πάντα"
+msgstr "Κάτω από τα πάντα"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
-msgstr "Επέτρεψε στα παράθυρα να καλύπτουν το Ράφι"
+msgstr "Επέτρεψε στα παράθυρα να καλύπτουν το ράφι"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
-msgstr "Συρρίκνωση στο Μέγεθος Περιεχομένου"
+msgstr "Συρρίκνωση στο μέγεθος περιεχομένου"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Στυλ"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
-msgstr "Αυτόματη Απόκρυψη"
+msgstr "Αυτόματη απόκρυψη"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
-msgstr "Αυτόματη απόκρυψη του Ραφιού"
+msgstr "Αυτόματη απόκρυψη του ραφιού"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
-msgstr "Εμφάνιση με το κλικ του Ποντικιού"
+msgstr "Εμφάνιση με το κλικ του ποντικιού"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
-msgstr "Χρονικό Όριο Απόκρυψης"
+msgstr "Χρονικό όριο απόκρυψης"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f δευτερόλεπτα"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
-msgstr "Διάρκεια Απόκρυψης"
+msgstr "Διάρκεια απόκρυψης"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
-msgstr "Εμφάνιση σε όλες τις Επιφάνειες Εργασίας"
+msgstr "Εμφάνιση σε όλες τις επιφάνειες εργασίας"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
-msgstr "Εμφάνιση σε επιλεγμένες Επιφάνειες Εργασίας"
+msgstr "Εμφάνιση σε επιλεγμένες επιφάνειες εργασίας"
 
 #: src/bin/e_ipc.c:47
 #, c-format
@@ -2201,7 +2289,7 @@ msgid ""
 "Enlightenment cannot initialize the File system.\n"
 "Perhaps you are out of memory?"
 msgstr ""
-"Το Enlightenment δεν μπορεί να εκκινήσει το Σύστημα Αρχείων.\n"
+"Το Enlightenment δεν μπορεί να εκκινήσει το σύστημα αρχείων.\n"
 "Πιθανόν να μην έχετε αρκετή μνήμη;"
 
 #: src/bin/e_main.c:427
@@ -2321,7 +2409,7 @@ msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει το σύσ
 
 #: src/bin/e_main.c:646
 msgid "Starting International Support"
-msgstr "Έναρξη Πολυεθνικής Υποστήριξης"
+msgstr "Έναρξη πολυεθνικής υποστήριξης"
 
 #: src/bin/e_main.c:651
 msgid "Enlightenment cannot set up its intl system."
@@ -2337,7 +2425,7 @@ msgstr ""
 
 #: src/bin/e_main.c:674
 msgid "Testing Format Support"
-msgstr "Δοκιμή Υποστήριξης Τύπων Αρχείων"
+msgstr "Δοκιμή υποστήριξης τύπων αρχείων"
 
 #: src/bin/e_main.c:685
 msgid ""
@@ -2381,7 +2469,7 @@ msgstr ""
 
 #: src/bin/e_main.c:735
 msgid "Setup Screens"
-msgstr "Ρύθμιση Οθονών"
+msgstr "Ρύθμιση οθονών"
 
 #: src/bin/e_main.c:740
 msgid ""
@@ -2391,7 +2479,7 @@ msgstr ""
 
 #: src/bin/e_main.c:746
 msgid "Setup Screensaver"
-msgstr "Ρύθμιση Προφύλαξης Οθόνης"
+msgstr "Ρύθμιση προφύλαξης οθόνης"
 
 #: src/bin/e_main.c:751
 msgid "Enlightenment cannot configure the X screensaver."
@@ -2399,7 +2487,7 @@ msgstr "Το Enlightenment δεν μπορεί να ρυθμίση την προ
 
 #: src/bin/e_main.c:755
 msgid "Setup Desklock"
-msgstr "Ρύθμιση Κλειδώματος Οθόνης"
+msgstr "Ρύθμιση κλειδώματος οθόνης"
 
 #: src/bin/e_main.c:760
 msgid "Enlightenment cannot set up its desk locking system."
@@ -2411,7 +2499,7 @@ msgstr ""
 
 #: src/bin/e_main.c:790
 msgid "Setup System Controls"
-msgstr "Ρύθμιση Χειρισμών Συστήματος"
+msgstr "Ρύθμιση χειρισμών συστήματος"
 
 #: src/bin/e_main.c:795
 msgid "Enlightenment cannot initialize the System Command system.\n"
@@ -2419,7 +2507,7 @@ msgstr ""
 
 #: src/bin/e_main.c:800
 msgid "Setup Actions"
-msgstr "Ρύθμιση Ενεργειών"
+msgstr "Ρύθμιση ενεργειών"
 
 #: src/bin/e_main.c:805
 msgid "Enlightenment cannot set up its actions system."
@@ -2427,7 +2515,7 @@ msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει το σύσ
 
 #: src/bin/e_main.c:809
 msgid "Setup Execution System"
-msgstr "Ρύθμιση Συστήματος Εκτέλεσης"
+msgstr "Ρύθμιση συστήματος εκτέλεσης"
 
 #: src/bin/e_main.c:814
 msgid "Enlightenment cannot set up its exec system."
@@ -2435,7 +2523,7 @@ msgstr ""
 
 #: src/bin/e_main.c:818
 msgid "Setup Remembers"
-msgstr "Ρύθμιση Ενθυμήσεων"
+msgstr "Ρύθμιση ενθυμήσεων"
 
 #: src/bin/e_main.c:823
 msgid "Enlightenment cannot setup remember settings."
@@ -2451,7 +2539,7 @@ msgstr ""
 
 #: src/bin/e_main.c:849
 msgid "Setup Message System"
-msgstr "Ρύθμιση Συστήματος Μηνυμάτων"
+msgstr "Ρύθμιση συστήματος μηνυμάτων"
 
 #: src/bin/e_main.c:854
 msgid "Enlightenment cannot set up its msg system."
@@ -2466,7 +2554,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Το Enlightenment δεν μπορεί να εγκαταστήσι το dnd σύστημά του."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2475,7 +2563,7 @@ msgstr ""
 
 #: src/bin/e_main.c:876
 msgid "Setup Modules"
-msgstr "Ρύθμιση Αρθρωμάτων"
+msgstr "Ρύθμιση αρθρωμάτων"
 
 #: src/bin/e_main.c:881
 msgid "Enlightenment cannot set up its module system."
@@ -2483,7 +2571,7 @@ msgstr ""
 
 #: src/bin/e_main.c:885
 msgid "Setup Color Classes"
-msgstr "Ρύθμιση Κλάσεων Χρωμάτων"
+msgstr "Ρύθμιση κλάσεων χρωμάτων"
 
 #: src/bin/e_main.c:890
 msgid "Enlightenment cannot set up its color class system."
@@ -2507,7 +2595,7 @@ msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει τις DPMS
 
 #: src/bin/e_main.c:913
 msgid "Set Up Powersave modes"
-msgstr ""
+msgstr "Ρύθμιση λειτουργιών εξοικονόμησης ενέργειας"
 
 #: src/bin/e_main.c:917
 msgid "Enlightenment cannot set up its powersave modes."
@@ -2515,7 +2603,7 @@ msgstr ""
 
 #: src/bin/e_main.c:922
 msgid "Setup Wallpaper"
-msgstr "Ρύθμιση Ταπετσαρίας"
+msgstr "Ρύθμιση ταπετσαρίας"
 
 #: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its desktop background system."
@@ -2525,7 +2613,7 @@ msgstr ""
 
 #: src/bin/e_main.c:932
 msgid "Setup Mouse"
-msgstr "Ρύθμιση Ποντικιού"
+msgstr "Ρύθμιση ποντικιού"
 
 #: src/bin/e_main.c:937
 msgid "Enlightenment cannot configure the mouse settings."
@@ -2534,7 +2622,7 @@ msgstr ""
 
 #: src/bin/e_main.c:942
 msgid "Setup Bindings"
-msgstr "Ρύθμιση Συνδυασμών"
+msgstr "Ρύθμιση συνδυασμών"
 
 #: src/bin/e_main.c:947
 msgid "Enlightenment cannot set up its bindings system."
@@ -2542,7 +2630,7 @@ msgstr ""
 
 #: src/bin/e_main.c:951
 msgid "Setup Popups"
-msgstr "Ρύθμιση Γρήγορων Ειδοποιήσεων"
+msgstr "Ρύθμιση άμεσων ειδοποιήσεων"
 
 #: src/bin/e_main.c:956
 msgid "Enlightenment cannot set up its popup system."
@@ -2551,7 +2639,7 @@ msgstr ""
 
 #: src/bin/e_main.c:961
 msgid "Setup Shelves"
-msgstr "Ρύθμιση Ραφιών"
+msgstr "Ρύθμιση ραφιών"
 
 #: src/bin/e_main.c:966
 msgid "Enlightenment cannot set up its shelf system."
@@ -2559,7 +2647,7 @@ msgstr ""
 
 #: src/bin/e_main.c:971
 msgid "Setup Thumbnailer"
-msgstr ""
+msgstr "Ρύθμιση του δημιουργού επισκοπήσεων"
 
 #: src/bin/e_main.c:976
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
@@ -2567,7 +2655,7 @@ msgstr ""
 
 #: src/bin/e_main.c:981
 msgid "Set Up File Ordering"
-msgstr "Ρύθμιση Ταξινόμησης Αρχείων"
+msgstr "Ρύθμιση ταξινόμησης αρχείων"
 
 #: src/bin/e_main.c:985
 msgid "Enlightenment cannot set up its order file system."
@@ -2575,7 +2663,7 @@ msgstr ""
 
 #: src/bin/e_main.c:1020
 msgid "Load Modules"
-msgstr "Φόρτωση Αρθρομάτων"
+msgstr "Φόρτωση αρθρωμάτων"
 
 #: src/bin/e_main.c:1028
 msgid ""
@@ -2599,11 +2687,11 @@ msgstr ""
 
 #: src/bin/e_main.c:1044
 msgid "Configure Shelves"
-msgstr "Ρύθμιση Ραφιών"
+msgstr "Ρύθμιση ραφιών"
 
 #: src/bin/e_main.c:1054
 msgid "Almost Done"
-msgstr "Σχεδόν Ολοκληρώθηκε"
+msgstr "Σχεδόν ολοκληρώθηκε"
 
 #: src/bin/e_module.c:117
 #, c-format
@@ -2616,7 +2704,7 @@ msgstr ""
 
 #: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
 msgid "Error loading Module"
-msgstr "Σφάλμα φόρτωσης Αρθρώματος"
+msgstr "Σφάλμα φόρτωσης αρθρώματος"
 
 #: src/bin/e_module.c:128 src/bin/e_module.c:145
 #, c-format
@@ -2627,7 +2715,7 @@ msgstr ""
 
 #: src/bin/e_module.c:150
 msgid "Module does not contain all needed functions"
-msgstr "Το Άρθρωμα δεν περιέχει όλες τις απαραίτητες λειτουργίες"
+msgstr "Το άρθρωμα δεν περιέχει όλες τις απαραίτητες λειτουργίες"
 
 #: src/bin/e_module.c:164
 #, c-format
@@ -2640,17 +2728,24 @@ msgstr ""
 #: src/bin/e_module.c:169
 #, c-format
 msgid "Enlightenment %s Module"
-msgstr "Enlightenment %s Άρθρωμα"
+msgstr "Enlightenment %s άρθρωμα"
 
 #: src/bin/e_module.c:497
 msgid "Would you like to unload this module?<br>"
 msgstr "Θέλετε να αποφορτώσετε αυτό το άρθρωμα?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -2658,22 +2753,21 @@ msgstr ""
 "Αιτήθηκε διαγραφή αυτού του ραφιού.<br><br>Είστε σίγουροι για τη διαγραφή "
 "του?"
 
-#: src/bin/e_shelf.c:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
-msgstr "Τέλος Μετακίνησης/Αλλαγής μεγέθους Αντικειμένων"
+msgstr "Τέλος μετακίνησης/αλλαγής μεγέθους αντικειμένων"
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
-msgstr "Έναρξη Μετακίνησης/Αλλαγής μεγέθους Αντικειμένων"
+msgstr "Έναρξη μετακίνησης/αλλαγής μεγέθους αντικειμένων"
 
-#: src/bin/e_shelf.c:1692
-#, fuzzy
+#: src/bin/e_shelf.c:1703
 msgid "Set Shelf Contents"
-msgstr "Περιεχόμενα Ραφιού"
+msgstr "Αλλαγή περιεχομένων ραφιού"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
-msgstr "Διαγραφή του Ραφιού"
+msgstr "Διέγραψε το ράφι"
 
 #: src/bin/e_startup.c:66
 msgid "Starting"
@@ -2681,16 +2775,16 @@ 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
 msgid "Logout problems"
-msgstr "Προβλήματα Αποσύνδεσης"
+msgstr "Προβλήματα αποσύνδεσης"
 
 #: src/bin/e_sys.c:317
 msgid ""
@@ -2698,7 +2792,7 @@ msgid ""
 "want to finish the logout<br>anyway without closing these<br>applications "
 "first?"
 msgstr ""
-"Η Αποσύνδεση καθυστερεί πολύ. Μερικές<br>εφαρμογές αρνούνται να κλείσουν."
+"Η αποσύνδεση καθυστερεί πολύ. Μερικές<br>εφαρμογές αρνούνται να κλείσουν."
 "<br>Θέλετε να ολοκληρώσετε την αποσύνδεση<br>χωρίς τον τερματισμό "
 "αυτών<br>των εφαρμογών?"
 
@@ -2712,7 +2806,7 @@ msgstr "Περίμενε περισσότερο"
 
 #: src/bin/e_sys.c:325
 msgid "Cancel Logout"
-msgstr "Ακύρωση Αποσύνδεσης"
+msgstr "Ακύρωση αποσύνδεσης"
 
 #: src/bin/e_sys.c:363
 msgid "Logout in progress"
@@ -2778,7 +2872,7 @@ msgstr ""
 
 #: src/bin/e_sys.c:535
 msgid "Power off"
-msgstr ""
+msgstr "Κλείσιμο"
 
 #: src/bin/e_sys.c:538
 msgid "Power off.<br><hilight>Please wait.</hilight>"
@@ -2786,7 +2880,7 @@ msgstr ""
 
 #: src/bin/e_sys.c:562
 msgid "Resetting"
-msgstr ""
+msgstr "Επανεκκινεί"
 
 #: src/bin/e_sys.c:565
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
@@ -2816,10 +2910,9 @@ msgstr "Σχετικά με αυτό το Θέμα"
 msgid "Set As Theme"
 msgstr "Ορισμός ως Θέμα"
 
-#: src/bin/e_toolbar.c:331
-#, fuzzy
+#: src/bin/e_toolbar.c:340
 msgid "Set Toolbar Contents"
-msgstr "Περιεχόμενα Γραμμής Εργαλείων"
+msgstr "Ορισμός περιεχομένων"
 
 #: src/bin/e_utils.c:246
 msgid "Cannot exit - immortal windows."
@@ -2832,67 +2925,67 @@ msgid ""
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Byte"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f MB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "Στο μέλλον"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
-msgstr "Στο τελευταίο Λεπτό"
+msgstr "Στο τελευταίο λεπτό"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Χρόνια πριν"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Μήνες πριν"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Εβδομάδες πριν"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Ημέρες πριν"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Ώρες πριν"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Λεπτά πριν"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -2904,7 +2997,7 @@ msgstr "Άγνωστο"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Πρόσθεση"
 
@@ -2924,10 +3017,10 @@ msgstr "Κάτω"
 
 #: src/bin/e_widget_fsel.c:293
 msgid "Add to Favorites"
-msgstr "Προσθήκη στα Αγαπημένα"
+msgstr "Προσθήκη στα αγαπημένα"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -2959,7 +3052,7 @@ msgstr "Προστατευμένο"
 #: src/bin/e_widget_fsel.c:684
 #, c-format
 msgid "Read Only"
-msgstr "Μόνο για Ανάγνωση"
+msgstr "Μόνο για ανάγνωση"
 
 #: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
 #, c-format
@@ -2968,15 +3061,15 @@ msgstr "Απαγόρευση"
 
 #: src/bin/e_widget_fsel.c:691
 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:92
 msgid "Basic Settings"
-msgstr "Βασικές Ρυθμίσεις"
+msgstr "Βασικές ρυθμίσεις"
 
 #: src/modules/battery/e_mod_config.c:93
 msgid "Show alert when battery is low"
@@ -2984,7 +3077,7 @@ msgstr "Εμφάνιση προειδοποίησης όταν η μπαταρί
 
 #: src/modules/battery/e_mod_config.c:136
 msgid "Check every:"
-msgstr ""
+msgstr "Έλεγχος κάθε:"
 
 #: src/modules/battery/e_mod_config.c:138
 #: src/modules/conf_performance/e_int_config_performance.c:149
@@ -2999,7 +3092,7 @@ msgstr ""
 
 #: src/modules/battery/e_mod_config.c:143
 msgid "Show alert on low battery"
-msgstr ""
+msgstr "Εμφάνιση ειδοποίησης όταν η μπαταρία τελειώνει"
 
 #: src/modules/battery/e_mod_config.c:145
 msgid "Alert when at:"
@@ -3008,12 +3101,12 @@ msgstr ""
 #: src/modules/battery/e_mod_config.c:147
 #, c-format
 msgid "%1.0f min"
-msgstr ""
+msgstr "%1.0f λεπτά"
 
 #: src/modules/battery/e_mod_config.c:149
 #, c-format
 msgid "%1.0f %%"
-msgstr ""
+msgstr "%1.0f %%"
 
 #: src/modules/battery/e_mod_config.c:151
 msgid "Auto dismiss in..."
@@ -3022,15 +3115,15 @@ msgstr ""
 #: src/modules/battery/e_mod_config.c:153
 #, c-format
 msgid "%1.0f sec"
-msgstr ""
+msgstr "%1.0f δευτ."
 
 #: src/modules/battery/e_mod_config.c:155
 msgid "Alert"
-msgstr ""
+msgstr "Ειδοποίηση"
 
 #: src/modules/battery/e_mod_config.c:160
 msgid "Auto Detect"
-msgstr ""
+msgstr "Αυτόματη αναγνώριση"
 
 #: src/modules/battery/e_mod_config.c:162
 #: src/modules/conf_applications/e_mod_main.c:39
@@ -3041,51 +3134,67 @@ msgid "Internal"
 msgstr "Εσωτερικό"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
-msgstr ""
+msgstr "HAL"
 
 #: src/modules/battery/e_mod_config.c:167
 msgid "Hardware"
-msgstr ""
+msgstr "Υλικό"
 
 #: src/modules/battery/e_mod_main.c:135
 msgid "Battery"
 msgstr "Μπαταρία"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr "Χαμηλή στάθμη μπαταριάς!"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr "Προτείνεται πηγή εναλλασσόμενου ρεύματος."
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr "ΣΦΑΛΜΑ"
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
-msgstr "Μετρητής Μπαταρίας"
+msgstr "Μετρητής μπαταρίας"
 
 #: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "Ρολόι"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
-msgstr "Πάνελ Ρυθμίσεων"
+msgstr "Πάνελ ρυθμίσεων"
+
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Επανεκκινεί"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "Χρόνος απενεργοποίησης"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+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 "Μενού Αγαπημένων"
+msgstr "Μενού αγαπημένων"
 
 #: src/modules/conf_applications/e_int_config_apps.c:104
 #: src/modules/conf_applications/e_int_config_apps.c:119
@@ -3096,21 +3205,21 @@ 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:1659
+#: src/modules/fileman/e_fwin.c:1923
 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"
@@ -3118,11 +3227,11 @@ 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
@@ -3133,11 +3242,11 @@ msgstr "Μενού"
 #: src/modules/conf_borders/e_int_config_borders.c:30
 #: src/modules/conf_borders/e_int_config_borders.c:197
 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
 msgid "Remember this Border for this window next time it appears"
@@ -3186,7 +3295,7 @@ 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"
@@ -3206,7 +3315,7 @@ 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"
@@ -3214,7 +3323,7 @@ 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"
@@ -3234,7 +3343,7 @@ 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"
@@ -3251,56 +3360,55 @@ 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
-#, fuzzy
 msgid "Settings Dialog Title"
-msgstr "Τίτλος Διαλόγου \"Σχετικά\""
+msgstr ""
 
 #: 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"
@@ -3322,11 +3430,11 @@ 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"
@@ -3338,15 +3446,15 @@ 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"
@@ -3355,27 +3463,27 @@ 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
@@ -3384,11 +3492,11 @@ 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
@@ -3406,27 +3514,27 @@ 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"
@@ -3434,11 +3542,11 @@ 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
@@ -3449,53 +3557,65 @@ 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
-#, fuzzy
 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:85
+#: 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:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
-msgstr "Αυτόματο Κλείδωμα"
+msgstr "Αυτόματο κλείδωμα"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 msgid "Lock when Enlightenment starts"
 msgstr "Κλείδωμα κατα την εκκίνηση του Enlightenment"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
 msgstr "Κλέιδωμα όταν το X Screensaver ενεργοποιείται"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+msgid "Time after screensaver activated"
+msgstr "Χρόνος μέχρι την εναλλαγή προφύλαξης οθόνης X"
+
+#: 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 "Κλείδωμα όταν ο Χρόνος Αδράνειας ξεπεραστεί"
+msgstr "Κλείδωμα όταν ο χρόνος αδράνειας ξεπεραστεί"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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:240
+#: 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
@@ -3504,29 +3624,29 @@ msgstr "%1.0f λεπτά"
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
-msgstr "Προσωπικά Αρχεία"
+msgstr "Προσωπικά αρχεία"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Ρυθμίσεις πλαισίου επανασύνδεσης"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: 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:337
+#: 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:341
+#: 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:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3535,96 +3655,131 @@ msgstr "Εμφάνιση στην ζώνη οθόνης #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
-msgstr "Λειτουργία Ταπετσαρίας"
+msgstr "Λειτουργία ταπετσαρίας"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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:358
+#: 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
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "Χρήση της ταπετσαρίας θέματος"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: 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 "Προσαρμοσμένο Κλείδωμα Οθόνης"
+msgstr "Προσαρμοσμένο κλείδωμα οθόνης"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: 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 "Κλείδωμα Οθόνης"
+msgstr "Κλείδωμα οθόνης"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
-msgstr "Ρυθμίσεις Εικονικών Επιαφανειών Εργασίας"
+msgstr "Ρυθμίσεις εικονικών επιαφανειών εργασίας"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: 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:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
-msgstr "Κινούμενη Αναστροφή"
+msgstr "Κινούμενη αναστροφή"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
-msgstr ""
+msgstr "Επιφάνειες εργασίας"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: 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:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
-msgstr "Κίνηση Εναλλαγής"
+msgstr "Κίνηση εναλλαγής"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Ανενεργό"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
-msgstr ""
+msgstr "Μετακίνηση προβολής"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Εστίαση"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 sec"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+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 "Εικονικές Επιφάνειες Εργασίας"
+msgstr "Εικονικές επιφάνειες εργασίας"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:36
 msgid "Dialog Settings"
-msgstr "Ρυθμίσεις Διαλόγων"
+msgstr "Ρυθμίσεις διαλόγων"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:87
 #: src/modules/conf_engine/e_int_config_engine.c:94
@@ -3633,19 +3788,19 @@ msgstr "Ρυθμίσεις Διαλόγων"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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
 msgid "Disable Confirmation Dialogs"
-msgstr "Απενεργοποίηση Διαλόγων Επιβεβαίωσης"
+msgstr "Απενεργοποίηση διαλόγων επιβεβαίωσης"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:91
 msgid "Normal Windows"
-msgstr "Κανονικά Παράθυρα"
+msgstr "Κανονικά παράθυρα"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Default Settings Dialogs Mode"
@@ -3654,16 +3809,16 @@ msgstr ""
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:101
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:140
 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
 msgid "Advanced Mode"
-msgstr "Προχωρημένη Λειτουργία"
+msgstr "Προχωρημένη λειτουργία"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:137
 msgid "Default Dialog Mode"
-msgstr "Προκαθορισμένη Λειτουργία Διαλόγου"
+msgstr "Προκαθορισμένη λειτουργία διαλόγου"
 
 #: src/modules/conf_dialogs/e_mod_main.c:35
 msgid "Dialogs"
@@ -3703,7 +3858,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"
@@ -3715,7 +3870,7 @@ 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
 msgid "Resolution"
@@ -3739,7 +3894,7 @@ msgstr "Καθρέφτισμα"
 
 #: src/modules/conf_display/e_int_config_display.c:641
 msgid "Missing Features"
-msgstr "Ελλειπή Χαρακτηριστικά"
+msgstr "Ελλειπή χαρακτηριστικά"
 
 #: src/modules/conf_display/e_int_config_display.c:642
 msgid ""
@@ -3752,7 +3907,7 @@ msgstr ""
 
 #: src/modules/conf_display/e_int_config_display.c:654
 msgid "No Refresh Rates Found"
-msgstr "Δεν βρέθηκαν Ρυθμοί Ανανέωσης"
+msgstr "Δεν βρέθηκαν ρυθμοί ανανέωσης"
 
 #: src/modules/conf_display/e_int_config_display.c:655
 msgid ""
@@ -3765,7 +3920,7 @@ msgstr ""
 
 #: 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
@@ -3782,31 +3937,31 @@ msgstr "Ο τρέχων εξυπηρετητής οθόνης δεν έχει <b
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:112
 msgid "Display Power Management Settings"
-msgstr "Ρυθμίσεις Διαχείρισης Ενέργειας Οθόνης"
+msgstr "Ρυθμίσεις διαχείρισης ενέργειας οθόνης"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: 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:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
 msgstr "Χρονόμετρα"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
-msgstr "Χρόνος Κατάστασης Αναμονής"
+msgstr "Χρόνος κατάστασης αναμονής"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
-msgstr "Χρόνος Αναστολής"
+msgstr "Χρόνος αναστολής"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: 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
@@ -3833,26 +3988,26 @@ msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
 msgid "Add Edge"
-msgstr ""
+msgstr "Προσθήκη αιχμής"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
 msgid "Delete Edge"
-msgstr ""
+msgstr "Διαγραφή αιχμής"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
 msgid "Modify Edge"
-msgstr ""
+msgstr "Τροποποίηση αιχμής"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
 #: 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_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_keybindings/e_int_config_keybindings.c:248
@@ -3864,11 +4019,11 @@ msgstr "Ενέργεια"
 #: 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
 msgid "General Options"
-msgstr ""
+msgstr "Γενικές επιλογές"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
 msgid "Allow binding activation with fullscreen windows"
@@ -3881,7 +4036,7 @@ msgstr ""
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
 #, c-format
 msgid "%.2f seconds"
-msgstr ""
+msgstr "%.2f δευτερόλεπτα"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
 msgid "Binding Edge Error"
@@ -3929,19 +4084,19 @@ 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 "Ενεργοποίηση Composite"
+msgstr "Ενεργοποίηση composite"
 
 #: 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 "Ενεργοποίηση Υποστήριξης Composite ?"
+msgstr "Ενεργοποίηση υποστήριξης composite ?"
 
 #: src/modules/conf_engine/e_int_config_engine.c:133
 msgid ""
@@ -3956,7 +4111,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
@@ -3978,19 +4133,19 @@ msgstr ""
 #: 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
@@ -4005,21 +4160,21 @@ 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 "Εντολή Τερματικού (CTRL+ENTER για χρήση)"
+msgstr "Εντολή τερματικού (CTRL+ENTER για χρήση)"
 
 #: 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
@@ -4036,37 +4191,37 @@ 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 "Στοίχιση Χ-Άξονα"
 
 #: 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 "Στοίχιση Υ-Άξονα"
 
 #: 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"
@@ -4089,9 +4244,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"
@@ -4107,15 +4261,15 @@ 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"
@@ -4123,15 +4277,15 @@ msgstr ""
 
 #: 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"
@@ -4155,23 +4309,23 @@ 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"
@@ -4179,23 +4333,23 @@ msgstr ""
 
 #: 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"
@@ -4203,7 +4357,7 @@ 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
@@ -4212,7 +4366,7 @@ msgstr "%d pixel"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:428
 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
@@ -4223,15 +4377,15 @@ msgstr "Γραμματοσειρές"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:452
 msgid "Basic preview text: 123: 我的天空!"
-msgstr "Βασικό Κείμενο Προεπισκόπησης: 123: 我的天空!"
+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
 msgid "Enable Font Class"
-msgstr "Ενεργοποίηση Κλάσης Γραμματοσειράς"
+msgstr "Ενεργοποίηση κλάσης γραμματοσειράς"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
 msgid "Hinting"
@@ -4248,54 +4402,54 @@ msgstr "Αυτόματα"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:661
 msgid "Font Fallbacks"
-msgstr "Αναπλήρωση Γραμματοσειρών"
+msgstr "Αναπλήρωση γραμματοσειρών"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:662
 msgid "Fallback Name"
-msgstr "Όνομα Αναπλήρωσης"
+msgstr "Όνομα αναπλήρωσης"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:674
 msgid "Enable Fallbacks"
-msgstr "Ενεργοποίηση Αναπληρώσεων"
+msgstr "Ενεργοποίηση αναπληρώσεων"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:683
 msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Προχωρημένο Κείμενο Προεπισκόπησης.. 我真的会写中文"
+msgstr "Προχωρημένο κείμενο προεπισκόπησης.. 我真的会写中文"
 
 #: 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
 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"
@@ -4307,11 +4461,11 @@ 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"
@@ -4323,18 +4477,20 @@ 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 ""
+"Δεν ήταν δυνατή η εισαγωγή της ρύθμισης.<br><br>Είστε σίγουροι πως είναι μια "
+"έγκυρη ρύθμιση?"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:297
 msgid ""
@@ -4348,7 +4504,7 @@ 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"
@@ -4369,7 +4525,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pixel"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4379,7 +4535,7 @@ msgstr "%1.0f pixel/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
@@ -4393,17 +4549,17 @@ 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
@@ -4419,28 +4575,28 @@ msgstr ""
 
 #: 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"
@@ -4458,22 +4614,22 @@ msgstr ""
 #: 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
@@ -4492,11 +4648,11 @@ 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
@@ -4511,16 +4667,16 @@ msgstr "%2.0f pixel"
 
 #: 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
 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
@@ -4529,7 +4685,7 @@ msgstr "%5.0f pixel/sec"
 
 #: 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
@@ -4549,15 +4705,15 @@ 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:"
@@ -4565,30 +4721,30 @@ 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 "Χρήση Αρχείου Edje"
+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 "Επιλογή ενός αρχείου Edj"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Αρχεία"
 
@@ -4601,32 +4757,32 @@ msgstr ""
 
 #: 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"
@@ -4634,7 +4790,7 @@ 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"
@@ -4646,7 +4802,7 @@ 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"
@@ -4654,54 +4810,54 @@ 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 "Χρήση Δείκτη Enlightenment"
+msgstr "Χρήση δείκτη Enlightenment"
 
 #: 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 "Χρήση δείκτη Χ"
 
 #: 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_mod_main.c:35
 msgid "Mouse Settings"
-msgstr "Ρυθμίσεις Ποντικιού"
+msgstr "Ρυθμίσεις ποντικιού"
 
 #: src/modules/conf_mouse/e_int_config_mouse.c:97
 msgid "Mouse Hand"
-msgstr "Πρωτεύον Πλήκτρο Ποντικιού"
+msgstr "Πρωτεύον πλήκτρο ποντικιού"
 
 #: src/modules/conf_mouse/e_int_config_mouse.c:105
 msgid "Mouse Acceleration"
-msgstr "Επιτάχυνση Ποντικιού"
+msgstr "Επιτάχυνση ποντικιού"
 
 #: src/modules/conf_mouse/e_int_config_mouse.c:107
 msgid "Acceleration"
@@ -4713,7 +4869,7 @@ 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"
@@ -4746,19 +4902,19 @@ 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
@@ -4774,19 +4930,19 @@ 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
@@ -4795,7 +4951,7 @@ 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
@@ -4804,7 +4960,7 @@ 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
@@ -4813,7 +4969,7 @@ msgstr "%1.0f αρχεία"
 
 #: src/modules/conf_performance/e_int_config_performance.c:167
 msgid "Number Of Edje Collections To Cache"
-msgstr "Αριθμός των Συλλογών Edje προς **"
+msgstr "Αριθμός των συλλογών Edje προς **"
 
 #: src/modules/conf_performance/e_int_config_performance.c:169
 #, c-format
@@ -4822,15 +4978,15 @@ 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
 msgid "Profile Selector"
-msgstr "Επιλογέας Προφίλ"
+msgstr "Επιλογέας προφίλ"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:107
 msgid "Available Profiles"
-msgstr "Διαθέσιμα Προφίλ"
+msgstr "Διαθέσιμα προφίλ"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:116
 #: src/modules/wizard/page_020.c:118
@@ -4839,16 +4995,16 @@ msgstr "Επιλογή ενός προφίλ"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:125
 msgid "Reset"
-msgstr ""
+msgstr "Επανεκκίνηση"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:281
 #, 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
 msgid "Delete OK?"
-msgstr ""
+msgstr "Διαγραφή εντάξει?"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:350
 msgid "Add New Profile"
@@ -4860,7 +5016,7 @@ 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"
@@ -4891,7 +5047,7 @@ 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"
@@ -4914,9 +5070,8 @@ msgid "%1.2f times"
 msgstr "%1.2f φορές"
 
 #: 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"
@@ -4930,71 +5085,65 @@ msgstr "Μέγιστο"
 msgid "Scaling"
 msgstr "Κλιμάκωση"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: 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:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 Screensaver"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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:168
+#: 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:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f δευτερόλεπτα"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Προτιμώμενο"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
-msgstr "Μη Προτιμώμενο"
+msgstr "Μη προτιμώμενο"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
-msgstr "Γεγονότα Έκθεσης"
+msgstr "Γεγονότα έκθεσης"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Επέτρεψε"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: 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:113
-#, fuzzy
+#: src/modules/ibar/e_mod_config.c:114
 msgid "Setup"
-msgstr "Ρύθμιση FM"
+msgstr "Ρύθμιση"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:277
 #, c-format
@@ -5007,11 +5156,11 @@ msgstr ""
 
 #: 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
@@ -5020,7 +5169,7 @@ 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
 msgid " Import..."
@@ -5032,28 +5181,24 @@ msgstr " Online..."
 
 #: src/modules/conf_theme/e_int_config_theme.c:1004
 msgid "Theme Categories"
-msgstr "Κατηγορίες Θεμάτων"
+msgstr "Κατηγορίες θεμάτων"
 
 #: src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Assign"
 msgstr "Ορισμός"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "Καθαρισμός"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 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 ""
@@ -5074,7 +5219,7 @@ 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"
@@ -5082,11 +5227,11 @@ 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
@@ -5095,12 +5240,12 @@ 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
 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
@@ -5119,19 +5264,19 @@ msgstr "Online..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
 msgid "Where to place the Wallpaper"
-msgstr "Που να τοποθετηθεί η Ταπετσαρία"
+msgstr "Που να τοποθετηθεί η ταπετσαρία"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
 msgid "All Desktops"
-msgstr "Σε όλες τις Επιφάνειες Εργασίας"
+msgstr "Σε όλες τις επιφάνειες εργασίας"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "This Desktop"
-msgstr "Σε αυτή την Επιφάνεια Εργασίας"
+msgstr "Σε αυτή την επιφάνεια εργασίας"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Screen"
-msgstr "Σε αυτή την Οθόνη"
+msgstr "Σε αυτή την οθόνη"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:97
 msgid "Create a gradient..."
@@ -5147,7 +5292,7 @@ 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
@@ -5163,11 +5308,11 @@ 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"
@@ -5175,7 +5320,7 @@ 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."
@@ -5183,13 +5328,12 @@ 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"
-msgstr "Επιλογές Γεμίσματος και Παραμόρφωσης"
+msgstr "Επιλογές γεμίσματος και παραμόρφωσης"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:167
 msgid "Stretch"
@@ -5213,7 +5357,7 @@ 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"
@@ -5226,11 +5370,11 @@ msgstr "%3.0f%%"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
 msgid "Select a Picture..."
-msgstr "Επιλογή μιας Εικόνας"
+msgstr "Επιλογή μιας εικόνας"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
 msgid "Picture Import Error"
-msgstr "Σφάλμα Εισαγωγής Εικόνας"
+msgstr "Σφάλμα εισαγωγής εικόνας"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
 msgid ""
@@ -5244,7 +5388,7 @@ msgstr ""
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
 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
@@ -5265,7 +5409,7 @@ msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:122
 msgid "Exchange wallpapers"
-msgstr ""
+msgstr "Ανταλλαγή φόντων"
 
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
@@ -5277,11 +5421,11 @@ 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"
@@ -5295,17 +5439,17 @@ 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
@@ -5324,7 +5468,7 @@ 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
@@ -5337,7 +5481,7 @@ 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"
@@ -5345,7 +5489,7 @@ 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"
@@ -5353,7 +5497,7 @@ 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"
@@ -5365,7 +5509,7 @@ 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"
@@ -5377,7 +5521,7 @@ msgstr "Προτίμησε το εικονίδιο που παρέχει η εφ
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:278
 msgid "Internal Windows"
-msgstr "Εσωτερικά Παράθυρα"
+msgstr "Εσωτερικά παράθυρα"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:280
 msgid "Always remember internal windows"
@@ -5385,7 +5529,7 @@ 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"
@@ -5438,7 +5582,7 @@ 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"
@@ -5467,12 +5611,12 @@ 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"
@@ -5492,7 +5636,7 @@ 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"
@@ -5508,17 +5652,17 @@ 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
 msgid "Smart expansion"
-msgstr "Έξυπνη Επέκταση"
+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
@@ -5532,11 +5676,11 @@ 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
 msgid "Maximize Directions"
-msgstr "Κατευθύνσεις Μεγιστοποίησης"
+msgstr "Κατευθύνσεις μεγιστοποίησης"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
 msgid "Both"
@@ -5553,7 +5697,7 @@ 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
@@ -5589,11 +5733,11 @@ msgstr ""
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:93
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
-msgstr "Ενθυμήσεις Παραθύρων"
+msgstr "Ενθυμίσεις παραθύρων"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:95
 msgid "Delete Remember(s)"
-msgstr "Διαγραφή Ενθύμησης/σεων"
+msgstr "Διαγραφή ενθύμησης/σεων"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:105
 msgid "Details"
@@ -5633,7 +5777,7 @@ 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"
@@ -5733,11 +5877,11 @@ 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"
@@ -5745,7 +5889,7 @@ 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"
@@ -5763,19 +5907,19 @@ msgstr "%i.%i GHz"
 
 #: 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 ""
@@ -5798,7 +5942,7 @@ msgstr ""
 
 #: src/modules/dropshadow/e_mod_config.c:40
 msgid "Dropshadow Settings"
-msgstr "Ρυθμίσεις Ρίψης Σκιάς"
+msgstr "Ρυθμίσεις ρίψης σκιάς"
 
 #: src/modules/dropshadow/e_mod_config.c:108
 msgid "Quality"
@@ -5806,23 +5950,23 @@ 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"
@@ -5834,15 +5978,15 @@ 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"
@@ -5854,7 +5998,7 @@ 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"
@@ -5862,15 +6006,15 @@ 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"
@@ -5882,37 +6026,29 @@ 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:230
-msgid "Mount error"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
-msgstr ""
+msgstr "Αρχικός κατάλογος"
 
-#: src/modules/fileman/e_mod_main.c:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
-msgstr ""
+msgstr "Αγαπημένα"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
-msgstr ""
+msgstr "Σύστημα αρχείων"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -5923,7 +6059,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -5933,108 +6069,112 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
-msgstr "Ρυθμίσεις Fileman Ανανεώθηκαν"
+msgstr "Ρυθμίσεις Fileman ανανεώθηκαν"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr "Ρυθμίσεις Fileman"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
-msgstr "Μέγεθος Εικονιδίου"
+msgstr "Μέγεθος εικονιδίου"
 
-#: src/modules/fileman/e_mod_config.c:224
-#, fuzzy
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
-msgstr "Λειτουργία Προβολής"
+msgstr "Προβολή"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
-msgstr "Άνοιγμα Καταλόγων στο ίδιο Μέρος"
+msgstr "Άνοιγμα καταλόγων στο ίδιο μέρος"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
-msgstr "Ταξινόμηση Καταλόγων Πρώτα"
+msgstr "Ταξινόμηση καταλόγων πρώτα"
 
-#: src/modules/fileman/e_mod_config.c:234
-#, fuzzy
+#: src/modules/fileman/e_mod_config.c:243
 msgid "Case Sensitive"
-msgstr "Βασικό Μέγεθος"
+msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
-msgstr "Χρήση Ενός Κλικ"
+msgstr "Χρήση ενός κλικ"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
-msgstr "Εμφάνιση Επέκτασης Εικονιδίου"
+msgstr "Εμφάνιση επέκτασης εικονιδίου"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
-msgstr "Εμφάνιση Ολόκληρης Διαδρομής"
+msgstr "Εμφάνιση ολόκληρης διαδρομής"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
-msgstr "Εμφάνιση Εικονιδίων Desktop"
+msgstr "Εμφάνιση εικονιδίων επιφάνειας εργασίας"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
-msgstr "Εμφάνιση Γραμμής Εργαλείων"
-
-#: src/modules/fileman/e_mod_config.c:257
-msgid "Show HAL icons on desktop"
-msgstr "Εμφάνισε εικονίδια HAL στο Desktop"
+msgstr "Εμφάνιση γραμμής εργαλείων"
 
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
 msgstr "Συμπεριφορά"
 
-#: src/modules/fileman/e_fwin.c:1187
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr "Εμφάνισε εικονίδια HAL στην επιφάνεια εργασίας"
+
+#: 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:1462
 msgid "Go to Parent Directory"
-msgstr "Στον Γονικό Κατάλογο"
+msgstr "Στον γονικό κατάλογο"
 
-#: src/modules/fileman/e_fwin.c:1249
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1524
 msgid "Other application..."
-msgstr "Προσθήκη Εφαρμογής..."
+msgstr "Άλλη εφαρμογή..."
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Άνοιγμα"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Άνοιγμα με..."
 
-#: src/modules/fileman/e_fwin.c:1628
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1892
 msgid "Known Applications"
-msgstr "Εφαρμογές"
+msgstr "Γνωστές εφαρμογές"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
-msgstr "Καθορισμένες Εφαρμογές"
+msgstr "Καθορισμένες εφαρμογές"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
-msgstr "Προσαρμοσμένη Εντολή"
+msgstr "Προσαρμοσμένη εντολή"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:53
-#, fuzzy, c-format
+#, c-format
 msgid "%d operations"
-msgstr "Διάρκεια Απόκρυψης"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:55
-#, fuzzy, c-format
+#, c-format
 msgid "idle"
-msgstr "Παράθεση"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:139
 msgid "EFM Operation Info"
@@ -6042,19 +6182,19 @@ msgstr ""
 
 #: 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"
@@ -6066,7 +6206,7 @@ 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
@@ -6080,7 +6220,7 @@ msgstr "Ελεύθερο"
 
 #: src/modules/gadman/e_mod_gadman.c:709
 msgid "Always on desktop"
-msgstr "Πάντα στην Επιφάνεια Εργασίας"
+msgstr "Πάντα στην επιφάνεια εργασίας"
 
 #: src/modules/gadman/e_mod_gadman.c:719
 msgid "On top pressing"
@@ -6088,11 +6228,11 @@ msgstr ""
 
 #: src/modules/gadman/e_mod_gadman.c:748
 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
@@ -6101,49 +6241,49 @@ 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:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
 msgstr "Ρυθμίσεις IBar"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
-msgstr "Επλεγμένη Πηγή Μπάρας"
+msgstr "Επιλεγμένη πηγή μπάρας"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
-msgstr "Ετικέτα Εικονιδίων"
+msgstr "Ετικέτα εικονιδίων"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
-msgstr "Εμφάνιση Ετικέτας Εικονιδίου"
+msgstr "Εμφάνιση ετικέτας εικονιδίου"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
-msgstr "Εμφάνιση Όνοματος Εφαρμογής"
+msgstr "Εμφάνιση ονόματος εφαρμογής"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
-msgstr "Εμφάνιση Σχολίου Εφαρμογής"
+msgstr "Εμφάνιση σχολίου εφαρμογής"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "Δημιουργία μιας νέας πηγής IBar"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "Εισαγωγή ενός ονόματος για αυτή τη νέα πηγή:"
 
@@ -6160,29 +6300,29 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Θέλετε να διαγράψετε αυτή την πηγή μπάρας?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
-msgstr "Αλλαγή Ρυθμίσεων Εικονιδίου"
+msgstr "Αλλαγή ρυθμίσεων εικονιδίου"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
-msgstr "Αφαίρεση Εικονιδίου"
+msgstr "Αφαίρεση εικονιδίου"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
-msgstr "Προσθήκη Εικονιδίου"
+msgstr "Προσθήκη εικονιδίου"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
-msgstr "Δημιουργία Νέου Εικονιδίου"
+msgstr "Δημιουργία νέου εικονιδίου"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
-msgstr "Προσθήκη Εφαρμογής"
+msgstr "Προσθήκη εφαρμογής"
 
 #: src/modules/ibox/e_mod_config.c:52
 msgid "IBox Settings"
@@ -6190,39 +6330,39 @@ msgstr "Ρυθμίσεις IBox"
 
 #: src/modules/ibox/e_mod_config.c:105
 msgid "Display Name"
-msgstr "Εμφάνιση Ονόματος"
+msgstr "Εμφάνιση ονόματος"
 
 #: src/modules/ibox/e_mod_config.c:110
 msgid "Display Title"
-msgstr "Εμφάνιση Τίτλου"
+msgstr "Εμφάνιση τίτλου"
 
 #: src/modules/ibox/e_mod_config.c:115
 msgid "Display Class"
-msgstr "Εμφάνιση Κλάσης"
+msgstr "Εμφάνιση κλάσης"
 
 #: src/modules/ibox/e_mod_config.c:120
 msgid "Display Icon Name"
-msgstr "Εμφάνιση Ονόματος Εικονιδίου"
+msgstr "Εμφάνιση ονόματος εικονιδίου"
 
 #: src/modules/ibox/e_mod_config.c:125
 msgid "Display Border Caption"
-msgstr "Εμφάνιση Ετικέτας Περιγράμματος"
+msgstr "Εμφάνιση ετικέτας περιγράμματος"
 
 #: src/modules/ibox/e_mod_config.c:155
 msgid "Show windows from all screens"
-msgstr "Εμφάνιση Παραθύρων από όλες τις οθόνες"
+msgstr "Εμφάνιση παραθύρων από όλες τις οθόνες"
 
 #: src/modules/ibox/e_mod_config.c:160
 msgid "Show windows from current screen"
-msgstr "Εμφάνιση Παραθύρων από την τρέχουσα Επιφάνεια Εργασίας"
+msgstr "Εμφάνιση παραθύρων από την τρέχουσα επιφάνεια εργασίας"
 
 #: src/modules/ibox/e_mod_config.c:169
 msgid "Show windows from all desktops"
-msgstr "Εμφάνιση Παραθύρων από όλες τις Επιφάνειες Εργασίας"
+msgstr "Εμφάνιση παραθύρων από όλες τις επιφάνειες εργασίας"
 
 #: src/modules/ibox/e_mod_config.c:174
 msgid "Show windows from active desktop"
-msgstr "Εμφάνιση Παραθύρων από την ενεργή Επιφάνεια Εργασίας"
+msgstr "Εμφάνιση παραθύρων από την ενεργή επιφάνεια εργασίας"
 
 #: src/modules/ibox/e_mod_main.c:226
 msgid "IBox"
@@ -6230,130 +6370,130 @@ msgstr "IBox"
 
 #: src/modules/pager/e_mod_config.c:72
 msgid "Pager Settings"
-msgstr "Ρυθμίσεις Pager"
+msgstr "Ρυθμίσεις διαχειριστή επιφανειών"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: 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:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
-msgstr "Ρυθμίσεις Γρήγορων Ειδοποιήσεων"
+msgstr "Ρυθμίσεις άμεσων ειδοποιήσεων"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr "Εμφάνιση ειδοποίησης κατα την αλλαγή"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr "Εμφάνιση ειδοποίησης για επείγοντα παράθυρα"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
-msgstr "Επιλογή και Ολίσθηση κουμπιού"
+msgstr "Επιλογή και ολίσθηση κουμπιού"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
-msgstr ""
+msgstr "Κλικ για ορισμό"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "Αντίσταση στο τράβηγμα"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
-msgstr "Ύψος πλαισίου Ειδοποίησης"
+msgstr "Ύψος πλαισίου ειδοποίησης"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
-msgstr "Ταχύτητα Ειδοποίησης"
+msgstr "Ταχύτητα ειδοποίησης"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f δευτερόλεπτα"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 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:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr "Προσοχή"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Κουμπί %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6363,20 +6503,20 @@ 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
@@ -6391,7 +6531,7 @@ 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"
@@ -6403,14 +6543,14 @@ 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"
@@ -6430,7 +6570,7 @@ msgstr "110 F"
 #: 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"
@@ -6487,7 +6627,7 @@ msgstr "Επόμενο"
 
 #: src/modules/wizard/e_wizard.c:281
 msgid "Welcome to Enlightenment"
-msgstr "Καλώς Ορίσατε στο Enlightenment"
+msgstr "Καλώς ορίσατε στο Enlightenment"
 
 #: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
 msgid "Select one"
@@ -6506,27 +6646,27 @@ msgstr ""
 
 #: 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"
@@ -6534,7 +6674,7 @@ 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"
@@ -6546,15 +6686,15 @@ msgstr ""
 
 #: src/modules/wizard/page_070.c:200
 msgid "Select Icons to Add"
-msgstr ""
+msgstr "Επιλογή εικονιδίων για προσθήκη"
 
 #: src/modules/wizard/page_080.c:62
 msgid "Quick Launch"
-msgstr ""
+msgstr "Γρήγορη εκκίνηση"
 
 #: src/modules/wizard/page_080.c:64
 msgid "Select Applications"
-msgstr ""
+msgstr "Επιλογή εφαρμογών"
 
 #: src/modules/mixer/app_mixer.c:165
 msgid "Capture"
@@ -6596,13 +6736,13 @@ msgstr "Αριστερά"
 msgid "Right:"
 msgstr "Δεξιά:"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: 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 "Ολισθητές Κλειδώματος"
+msgstr "Ολισθητές κλειδώματος"
 
 #: src/modules/mixer/app_mixer.c:419
 msgid "Edit"
@@ -6614,11 +6754,11 @@ 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:"
@@ -6630,17 +6770,17 @@ 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:613
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6648,15 +6788,15 @@ msgstr ""
 
 #: src/modules/connman/e_mod_main.c:213
 msgid "Connection Manager"
-msgstr "Διαχειριστής Συνδέσεων"
+msgstr "Διαχειριστής συνδέσεων"
 
 #: src/modules/connman/e_mod_main.c:730
 msgid "Network Connection Settings"
-msgstr "Ρυθμίσεις Δικτυακών Συνδέσεων"
+msgstr "Ρυθμίσεις δικτυακών συνδέσεων"
 
 #: src/modules/connman/e_mod_main.c:736
 msgid "Network Device"
-msgstr "Συσκευή Δικτύου"
+msgstr "Συσκευή δικτύου"
 
 #: src/modules/connman/e_mod_main.c:741
 msgid "Wifi"
@@ -6668,12 +6808,28 @@ msgstr "LAN"
 
 #: src/modules/connman/e_mod_main.c:747
 msgid "Specific Device"
-msgstr "Συγκεκριμένη Συσκευή"
+msgstr "Συγκεκριμένη συσκευή"
 
 #: src/modules/connman/e_mod_main.c:768
 msgid "Networks"
 msgstr "Δίκτυα"
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "Σύστημα"
+
+#~ msgid "Mount of device failed"
+#~ msgstr "Αποτυχία προσάρτησης συσκευής"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Ρύθμιση Εικονικών Desktop"
 
diff --git a/po/enlightenment.pot b/po/enlightenment.pot
index 3b35196..32fd07a 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-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -20,20 +20,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr ""
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -67,383 +67,385 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr ""
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr ""
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr ""
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr ""
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 
-#: src/bin/e_actions.c:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr ""
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 
-#: src/bin/e_actions.c:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr ""
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 
-#: src/bin/e_actions.c:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr ""
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 
-#: src/bin/e_actions.c:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr ""
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr ""
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr ""
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr ""
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr ""
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr ""
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr ""
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr ""
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr ""
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr ""
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr ""
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr ""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr ""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr ""
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr ""
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
 msgstr ""
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr ""
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr ""
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr ""
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr ""
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr ""
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr ""
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr ""
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr ""
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr ""
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr ""
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -453,102 +455,114 @@ msgstr ""
 msgid "Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr ""
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr ""
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr ""
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr ""
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr ""
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr ""
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+msgid "Enlightenment : Mode"
+msgstr ""
+
+#: src/bin/e_actions.c:2808
+msgid "Presentation Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2813
+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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -561,55 +575,55 @@ msgstr ""
 msgid "System"
 msgstr ""
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr ""
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr ""
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr ""
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 msgid "Lock"
 msgstr ""
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr ""
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr ""
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr ""
 
@@ -617,13 +631,14 @@ msgstr ""
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -638,7 +653,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -650,7 +665,7 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 "
@@ -661,7 +676,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -670,11 +685,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
 msgstr ""
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -682,7 +697,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -692,7 +707,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -701,7 +716,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -710,7 +725,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -718,11 +733,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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
@@ -748,7 +763,7 @@ 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr ""
 
@@ -757,34 +772,34 @@ msgstr ""
 msgid "Container %d"
 msgstr ""
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -792,6 +807,25 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
+#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr ""
@@ -886,23 +920,23 @@ msgstr ""
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr ""
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr ""
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr ""
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr ""
 
@@ -934,259 +968,307 @@ msgid ""
 "application failed to start."
 msgstr ""
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr ""
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr ""
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr ""
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+msgid "Mount Error"
+msgstr ""
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+msgid "Unmount Error"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+msgid "Eject Error"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr ""
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr ""
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr ""
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+msgid "Mount"
+msgstr ""
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr ""
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+msgid "Set background..."
+msgstr ""
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+msgid "Set overlay..."
+msgstr ""
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr ""
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr ""
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr ""
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 msgid "Warning"
 msgstr ""
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr ""
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1245,8 +1327,8 @@ msgid "Preview"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr ""
 
@@ -1255,7 +1337,7 @@ msgid "Thumbnail"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr ""
 
@@ -1271,70 +1353,70 @@ msgstr ""
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1383,8 +1465,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1392,7 +1474,7 @@ msgstr ""
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
 #: src/bin/e_int_border_menu.c:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr ""
 
@@ -1570,12 +1652,12 @@ msgstr ""
 msgid "Window List"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr ""
 
@@ -1825,11 +1907,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr ""
 
@@ -1863,8 +1945,8 @@ msgstr ""
 msgid "Unload Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1894,12 +1976,12 @@ msgstr ""
 msgid "Remove Gadget"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: 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:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr ""
 
@@ -1981,121 +2063,121 @@ msgstr ""
 msgid "No name!!"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 msgid "Set Contents..."
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr ""
 
@@ -2400,7 +2482,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2574,29 +2656,36 @@ msgstr ""
 msgid "Would you like to unload this module?<br>"
 msgstr ""
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 msgid "Set Shelf Contents"
 msgstr ""
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr ""
 
@@ -2738,7 +2827,7 @@ msgstr ""
 msgid "Set As Theme"
 msgstr ""
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 msgid "Set Toolbar Contents"
 msgstr ""
 
@@ -2753,67 +2842,67 @@ msgid ""
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -2825,7 +2914,7 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr ""
 
@@ -2848,7 +2937,7 @@ msgid "Add to Favorites"
 msgstr ""
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -2962,6 +3051,7 @@ msgid "Internal"
 msgstr ""
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
@@ -2973,24 +3063,24 @@ msgstr ""
 msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr ""
 
@@ -2999,10 +3089,22 @@ msgid "Clock"
 msgstr ""
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
 msgstr ""
 
+#: src/modules/conf/e_mod_main.c:234
+msgid "Presentation"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:241
+msgid "Offline"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:269
+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"
@@ -3025,7 +3127,7 @@ msgid "Restart Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr ""
 
@@ -3380,41 +3482,53 @@ msgstr ""
 msgid "Desk"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: 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:176
+#: 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:180
+#: 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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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:240
+#: 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
@@ -3425,27 +3539,27 @@ msgstr ""
 msgid "Personal"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: 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:337
+#: 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:341
+#: 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:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3454,29 +3568,48 @@ msgstr ""
 #: 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/fileman/e_mod_config.c:220
+#: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: 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:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr ""
 
@@ -3484,59 +3617,73 @@ msgstr ""
 msgid "Screen Lock"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: 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:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 ""
@@ -3552,8 +3699,8 @@ msgstr ""
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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 ""
@@ -3703,23 +3850,23 @@ msgstr ""
 msgid "Display Power Management Settings"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: 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:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr ""
 
@@ -4287,7 +4434,7 @@ msgid "%1.0f pixels"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4504,7 +4651,7 @@ 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr ""
 
@@ -4845,55 +4992,50 @@ msgstr ""
 msgid "Scaling"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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:168
+#: 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:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr ""
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr ""
 
@@ -4906,7 +5048,7 @@ msgid "Configured Shelves"
 msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 msgid "Setup"
 msgstr ""
 
@@ -4950,10 +5092,6 @@ msgstr ""
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr ""
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr ""
@@ -5792,27 +5930,19 @@ msgstr ""
 msgid "Run Command Dialog"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount error"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: 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:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -5823,7 +5953,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -5833,92 +5963,100 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 msgid "Case Sensitive"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:257
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:729
+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:261
-#: src/modules/gadman/e_mod_gadman.c:729
-msgid "Behavior"
+#: src/modules/fileman/e_mod_config.c:273
+msgid "Mount volumes on insert"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1187
+#: src/modules/fileman/e_mod_config.c:276
+msgid "Open filemanager on mount"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr ""
 
@@ -6007,39 +6145,39 @@ msgstr ""
 msgid "Select a window"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr ""
 
@@ -6054,27 +6192,27 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr ""
 
@@ -6126,128 +6264,128 @@ msgstr ""
 msgid "Pager Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: 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:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 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:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6490,7 +6628,7 @@ msgstr ""
 msgid "Right:"
 msgstr ""
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr ""
 
@@ -6530,11 +6668,11 @@ msgstr ""
 msgid "Mixer Settings Updated"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6567,3 +6705,15 @@ msgstr ""
 #: src/modules/connman/e_mod_main.c:768
 msgid "Networks"
 msgstr ""
+
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+msgid "Systray"
+msgstr ""
diff --git a/po/eo.gmo b/po/eo.gmo
index ce8e0de..87c3d76 100644
Binary files a/po/eo.gmo and b/po/eo.gmo differ
diff --git a/po/eo.po b/po/eo.po
index aebf414..91a4eda 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -3,50 +3,51 @@
 # translation of e17-070910.po to
 # translation of eo.po to
 # This file is put in the public domain.
-# Olivier M <olivierweb at nospam.ifrance.com>, 2006-2007
 #
+# Olivier M <olivierweb at nospam.ifrance.com>, 2006-2007.
+# Olivier <eliovir at nospam.gmail.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
-"PO-Revision-Date: 2007-12-10 22:43+0100\n"
-"Last-Translator: \n"
-"Language-Team:  <fr at li.org>\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
 "X-Poedit-Language: Esperanto\n"
 "X-Poedit-Basepath: .\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"
 "X-Poedit-SearchPath-0: /usr/portage/distfiles/cvs-src/e17/apps/e/src\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "Pri Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
-#, fuzzy
 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."
@@ -57,9 +58,9 @@ 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 ""
-"Kopirajto &copy; 1999-2007; de la Programada Teamo de Enlightenment."
+"Kopirajto &copy; 1999-2008; de la Programada Teamo de Enlightenment."
 "<br><br>Ni esperas ke vi ĝojas uzadon de tiu programaro tiom kiel ni ĝojis "
-"dum skribado de ĝi.<br><br>Tiu programaro doniĝas tiel (\"kiel øi estas\")  "
+"dum skribado de ĝi.<br><br>Tiu programaro doniĝas tiel (\"kiel ĝi estas\")  "
 "sen eksplicita aŭ implicita garantio. Ĉi tiu softvaro estas regita de "
 "licencaj kondiĉoj, do bonvolu vidi la dosierojn COPYING kaj COPYING-PLAIN "
 "pri licenco instalitajn sur via sistemo. <br><br>Enlightenment estas sub "
@@ -86,43 +87,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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Jes"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Ne"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Ĉu vi cestas, ke vi deziras eliri ? "
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Ĉu vi estas certa, ke vi volas adiaŭi?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Ĉu vi cestas, ke vi deziras estingi ? "
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -130,11 +133,11 @@ msgstr ""
 "Vi petis estingi vian komputilon.<br><br>Ĉu vi certas ke vi volas estingi "
 "ĝin ?"
 
-#: src/bin/e_actions.c:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Ĉu vi cestas, ke vi deziras relanĉi ? "
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -142,18 +145,18 @@ msgstr ""
 "Vi petis relanĉi vian komputilon.<br><br>Ĉu vi certas ke vi volas relanĉi "
 "ĝin ?"
 
-#: src/bin/e_actions.c:2047
+#: src/bin/e_actions.c:2061
 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:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Ĉu vi cestas, ke vi deziras diskodormi ? "
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -161,338 +164,316 @@ msgstr ""
 "Vi petis diskodormi vian komputilon.<br><br>Ĉu vi certas ke vi volas dormigi "
 "ĝin ?"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Fenestro : Agoj"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Movi"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
-msgstr "Grandecŝanĝi"
+msgstr "Regrandigi"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menuo"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Fenestra Menuo"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Plialtigi"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Malplialtigi"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Mortigi"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Fenestro : stato"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Inversigi Fiksan Modon"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Inversigi Piktograman Modon"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Inversigi Plenekranan Modon"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maksimumigi"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Maksimumigi Vertikale"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Maksimumigi Horizontale"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Maksimumigi Plenekrane"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Maksimumiga Modo \"Inteligenta\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Maksimumiga Modo \"Ekspansia\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Maksimumiga Modo \"Pleniga\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Baskulo de Subvolva Modo"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Baskulo de Suprvolva Modo"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "Baskulo de Maldesktrvolva Modo"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Baskulo de Dekstrvolva Modo"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Inversigo de Ombriga Modo"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Inversigi Senrandan Staton"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "Inversigi Pinglatan Staton"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Labortablo"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Labortabla Ŝango al maldekstro"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Labortabla Ŝango al dekstro"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Labortabla Ŝango al supro"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Labortabla Ŝango al subo"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Labortabla Ŝango Laŭ..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Vidigi la Labortablon"
 
-#: src/bin/e_actions.c:2581
-#, fuzzy
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
-msgstr "Vidigi la Labortablon"
+msgstr "Vidigi la breton"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Labortabla Ŝango por..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Labortabla Ŝango Linie..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "InterŜanĝi kun la 0-a Labortablo"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "InterŜanĝi kun 1-a Labortablo"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "InterŜanĝi kun 2-a Labortablo"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "InterŜanĝi kun 3-a Labortablo"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "InterŜanĝi kun 4-a Labortablo"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "InterŜanĝi kun 5-a Labortablo"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "InterŜanĝi kun 6-a Labortablo"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "InterŜanĝi kun 7-a Labortablo"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "InterŜanĝi kun 8-a Labortablo"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "InterŜanĝi kun 9-a Labortablo"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "InterŜanĝi kun 10-a Labortablo"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "InterŜanĝi kun 11-a Labortablo"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "InterŜanĝi kun la Labortablo..."
 
-#: src/bin/e_actions.c:2628
-#, fuzzy
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
-msgstr "Labortabla Ŝango al maldekstro"
+msgstr "Labortabla Ŝango al maldekstro (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2630
-#, fuzzy
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
-msgstr "Labortabla Ŝango al dekstro"
+msgstr "Labortabla Ŝango al dekstro (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2632
-#, fuzzy
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
-msgstr "Labortabla Ŝango al supro"
+msgstr "Labortabla Ŝango al supro (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2634
-#, fuzzy
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
-msgstr "Labortabla Ŝango al subo"
+msgstr "Labortabla Ŝango al subo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2636
-#, fuzzy
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
-msgstr "Labortabla Ŝango Laŭ..."
+msgstr "Labortabla Ŝango Laŭ...(Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2642
-#, fuzzy
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
-msgstr "Labortabla Ŝango por..."
+msgstr "Labortabla Ŝango por... (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2648
-#, fuzzy
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
-msgstr "Labortabla Ŝango Linie..."
+msgstr "Labortabla Ŝango Linie... (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2654
-#, fuzzy
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
-msgstr "Labortabla Ŝango por..."
+msgstr "Labortabla Ŝango direkcien..."
 
-#: src/bin/e_actions.c:2659
-#, fuzzy
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
-msgstr "InterŜanĝi kun la 0-a Labortablo"
+msgstr "InterŜanĝi kun la 0-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2661
-#, fuzzy
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
-msgstr "InterŜanĝi kun 1-a Labortablo"
+msgstr "InterŜanĝi kun 1-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2663
-#, fuzzy
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
-msgstr "InterŜanĝi kun 2-a Labortablo"
+msgstr "InterŜanĝi kun 2-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2665
-#, fuzzy
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
-msgstr "InterŜanĝi kun 3-a Labortablo"
+msgstr "InterŜanĝi kun 3-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2667
-#, fuzzy
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
-msgstr "InterŜanĝi kun 4-a Labortablo"
+msgstr "InterŜanĝi kun 4-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2669
-#, fuzzy
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
-msgstr "InterŜanĝi kun 5-a Labortablo"
+msgstr "InterŜanĝi kun 5-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2671
-#, fuzzy
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
-msgstr "InterŜanĝi kun 6-a Labortablo"
+msgstr "InterŜanĝi kun 6-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2673
-#, fuzzy
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
-msgstr "InterŜanĝi kun 7-a Labortablo"
+msgstr "InterŜanĝi kun 7-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2675
-#, fuzzy
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
-msgstr "InterŜanĝi kun 8-a Labortablo"
+msgstr "InterŜanĝi kun 8-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2677
-#, fuzzy
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
-msgstr "InterŜanĝi kun 9-a Labortablo"
+msgstr "InterŜanĝi kun 9-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2679
-#, fuzzy
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
-msgstr "InterŜanĝi kun 10-a Labortablo"
+msgstr "InterŜanĝi kun 10-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2681
-#, fuzzy
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
-msgstr "InterŜanĝi kun 11-a Labortablo"
+msgstr "InterŜanĝi kun 11-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2683
-#, fuzzy
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
-msgstr "InterŜanĝi kun la Labortablo..."
+msgstr "InterŜanĝi kun la Labortablo... (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -502,103 +483,114 @@ msgstr "InterŜanĝi kun la Labortablo..."
 msgid "Screen"
 msgstr "Ekrano"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Sendi Muson al 0-a Ekrano"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Sendi Muson al 1-a Ekrano"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Sendi Muson al Ekrano..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Sendi Muson ĝis la proksima ekrano"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Sendi muson ĝis la antaŭa ekrano"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Sendi muson ĝis la antaŭa/proksima ekranoj..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Fenestro : Movado"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "Ĝis Sekvonta Labortablo"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Ĝis Antaŭa Labortablo"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "Laŭ Labortablo #..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Al Labortablo..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Montri ĉefMenuon"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Montri Preferatajn Menuon"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Vidigi \"Ĉiuj Aplikaĵoj\" Menuon"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Vidigi Klientan Menuon"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Vidigi Menuon..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Komando"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Aplikaĵo"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Relanĉi"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Eliri"
 
-#: src/bin/e_actions.c:2789
-#, fuzzy
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
-msgstr "Eliri"
+msgstr "Eliri nun"
+
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment : Reĝimo"
+
+#: src/bin/e_actions.c:2808
+msgid "Presentation Mode Toggle"
+msgstr "Inversigi la prezentan reĝimon"
+
+#: src/bin/e_actions.c:2813
+msgid "Offline Mode Toggle"
+msgstr "Inversigi la senkonektan reĝimon"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -611,73 +603,70 @@ msgstr "Eliri"
 msgid "System"
 msgstr "Sistemo"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Elsaluti"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
-msgstr ""
+msgstr "Kurentmalŝalti nun"
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
-msgstr ""
+msgstr "Kurentmalŝalti"
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Relanĉi"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Paŭzi"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Diskodormi"
 
-#: src/bin/e_actions.c:2821
-#, fuzzy
+#: src/bin/e_actions.c:2845
 msgid "Lock"
-msgstr "ŝlosoj"
+msgstr "Ŝlosi"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Purigi Fenestrojn"
 
-#: src/bin/e_actions.c:2831
-#, fuzzy
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
-msgstr "Fenestro : Agoj"
+msgstr "Ĝeneraĵoj : Agoj"
 
-#: src/bin/e_actions.c:2831
-#, fuzzy
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
-msgstr "Ordigi Aplikaĵojn"
+msgstr "Malfruata agado"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Difini kiel Tapeton"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "Legado de labortablaj dosieroj farita"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "Legado de labortabla dosiero"
 
 #: src/bin/e_color_dialog.c:29
-#, fuzzy
 msgid "Color Selector"
-msgstr "Aspekta Elektilo"
+msgstr "Koloro-elektilo"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -692,7 +681,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -704,8 +693,7 @@ msgstr "Konfirmi"
 msgid "Cancel"
 msgstr "Rezigni"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
-#, fuzzy
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 "
@@ -715,16 +703,15 @@ msgid ""
 "adding it in. You can re-configure things now to your<br>liking. Sorry for "
 "the hiccup in your settings.<br>"
 msgstr ""
-"Agordaj datumoj bezonas ĝisdatigon. Vian malnova agordo<br>... estas viŝita "
-"kaj nova aro da defaŭtoj pravalorizita. Ĉi tiu<br>okazos regule dum "
-"evoluado, tiel ne raportu <br>cimon. Ĉi tiu simple signifas ke Enlightenment "
-"bezonas novan agordan<br>datumon defaŭte por uzeblaj funkcioj tio, ke via "
-"malnova<br>agordo simple mankas. Ĉi tiu nova aro da defaŭtoj 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:746
-#, fuzzy
+"Agordaj datumoj bezonas ĝisdatigon. Vian malnova agordo<br>estis viŝita kaj "
+"nova aro da defaŭtoj pravalorizita. Ĉi tiu<br>okazos regule dum evoluado, "
+"tiel ne raportu <br>cimon. Ĉi tiu simple signifas ke Enlightenment bezonas "
+"novan agordan<br>datumon defaŭte por uzeblaj funkcioj kiujn via "
+"malnova<br>agordo simple ne enhavas. Ĉi tiu nova aro da defaŭtoj "
+"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:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -733,29 +720,29 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 "Via agordo estas PLI NOVA ol Enlightenment. Tio estas<br> strangega. Tio ne "
-"devus okazi almenaux vi malĝisdatigis<br>Enlightenement aux kopii la agordo "
-"el ejo kie pli nova<br>versio de Enlightenment estis funciinta. Tio estas "
-"malbona kaj<br>kiel antauxzorgo via agordo estis restauxrita per defauxta."
-"<br>Bedauxrinde por la ĝeno.<br>"
+"devus okazi krom se vi malĝisdatigis<br>Enlightenement aŭ se vi kopiis la "
+"agordon el ejo kie pli nova<br>versio de Enlightenment estis funciinta. Tio "
+"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:1629
-#, fuzzy
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
-msgstr "Labortablaj Agordoj"
+msgstr "Ĝisdatiĝis agordoj"
 
-#: src/bin/e_config.c:1652
-#, fuzzy, c-format
+#: src/bin/e_config.c:1712
+#, 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 ""
 "Eraro okazis dum registrado de Enlightenment-aj<br>agordoj en la disko. La "
-"eraro ne povas esti definata.<br><br>La dosiero kie la eraro okazis estis:"
-"<br>%s<br><br>Tiu dosiero estis forviŝita por eviti malbonigi datumojn.<br>"
+"eraro ne povas esti difinata.<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:1663
-#, fuzzy, c-format
+#: src/bin/e_config.c:1723
+#, 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 "
@@ -763,15 +750,15 @@ 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 ""
-"La agordaj dosieroj de Enlightenenment estas troo grandaj<brpor la  "
+"La agordaj dosieroj de Enlightenenment estas troo grandaj<br>por la  "
 "dosiersistemo kie ili estas registritaj.<br>Tiu ĉi eraro estas tre stranga "
-"kial la dosieroj devus<br>esti ekstreme malgranda. Bonvolu kontroli la "
+"ĉar la dosieroj devus<br>esti ekstreme malgrandaj. Bonvolu kontroli la "
 "agordojn<br>por via hejma dosierujo. <br><br>La dosiero, kie la eraro "
-"okazis, estis:<br>%s<br><br>Ĉi tiu dosiero estas forigita por eviti "
-"koruptadon de datumoj.<br>"
+"okazis, estis:<br>%s<br><br>Ĉi tiu dosiero estis forigata por eviti "
+"difektadon de donitaĵoj.<br>"
 
-#: src/bin/e_config.c:1676
-#, fuzzy, c-format
+#: src/bin/e_config.c:1736
+#, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
 "Enlightenment. Your disk is having troubles<br>and possibly needs "
@@ -779,42 +766,41 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 "Eniga eraro okazis dum la skibado de agordaj dosieroj<br>por Enlightenemnt. "
-"Via disko estas havanta problemojn<br>kaj eble bezonas anstataŭaĵon."
+"Via disko estas havanta problemojn<br>kaj eble bezonas anstataŭigon."
 "<br><br>La dosiero kie la eraro okazis estis:<br>%s<br><br>Ĉi tiu dosiero "
-"estas forigita por eviti koruptadon de datumoj.<br>"
+"estis forigata por eviti difektadon de donitaĵoj.<br>"
 
-#: src/bin/e_config.c:1687
-#, fuzzy, c-format
+#: src/bin/e_config.c:1747
+#, 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 ""
-"Enlightement ne povas skribi ĝian agordan dosieron<br>ĉar ĝi elĉerpiĝis "
-"spacon por skribi la dosieron.<br>Vi devas ĉu elĉerpiĝas de disko spaco ĉu "
-"vi iris<br>super via kvotan limo.<br><br>La dosiero kie la eraro okazis "
-"estis:<br>%s<br><br>Ĉi tiu dosiero estas forigita por eviti koruptadon de "
-"datumoj.<br>"
-
-#: src/bin/e_config.c:1699
-#, fuzzy, c-format
+"Enlightement ne povas skribi sian agordan dosieron<br>ĉar ĝi elĉerpiĝis "
+"spacon por skribi la dosieron.<br>Vi elĉerpiĝis diskon spacon ĉu "
+"trouzis<br>vian kvotan limon.<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:1759
+#, 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 ""
-"La agorda dosiero, kiun Enlightenment estis skribanta,<br>neatendite "
+"La agorda dosiero, kien Enlightenment estis skribanta,<br>neatendite "
 "malfermiĝis. Tio estas tre nekutima.<br><br>La dosiero kie la eraro okazis "
-"estis:<br>%s<br><br>Ĉi tiu dosiero estas forigita por eviti koruptadon de "
+"estis:<br>%s<br><br>Ĉi tiu dosiero estis forigata por eviti difektadon de "
 "donitaĵoj.<br>"
 
-#: src/bin/e_config.c:1724
-#, fuzzy
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
-msgstr "Problemoj de skribo de Enlightenment Konfiguraĵo"
+msgstr "Problemoj de skribo de Enlightenment-agordo"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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
@@ -840,7 +826,7 @@ msgid "Modules"
 msgstr "Moduloj"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Etendiloj"
 
@@ -849,20 +835,20 @@ msgstr "Etendiloj"
 msgid "Container %d"
 msgstr "Ujo %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Eraro - neniu subteno de PAM"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 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:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Ŝloso Malsukcesis"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -870,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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Bonvolu entajpi vian malŝlosan pasvorton"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Eraro de la Aŭtentiga Sistemo"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -889,6 +875,28 @@ 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
+msgid "Activate Presentation Mode?"
+msgstr "Ebligi la prezentan reĝimon"
+
+#: src/bin/e_desklock.c:1040
+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 malŝlosis la labortablon tro rapide<br><br>Ĉu vi volas ebligi la "
+"<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
+msgid "No, but increase timeout"
+msgstr "Ne, sed pligrandigi la tempolimon"
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr "Ne, kaj ĉesi tiun peton"
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Malplenaj Fenestraj Ecoj"
@@ -989,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:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Forviŝi"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Eltondi"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Kopii"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Alglui"
 
@@ -1039,268 +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:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Eraro dum lanĉo de Aplikaĵo"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s haltis ruladon senatendite."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Elirsignala kodo %i sendita el %s."
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s interrompiĝis per InterrompSignalo."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s interrompiĝis per ElirSignalo."
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s interrompiĝis per ĉesigSignalo."
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s interrompiĝis per glitpunkta eraro."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s interrompiĝis per Neinterrompebla Mortiga Signalo"
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s interrompiĝis per Segmenta Misfunkcio."
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s interrompiĝis per Rompita Dukto."
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s interrompiĝis per FiniĝSignalo."
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s interrompiĝis per Busa Eraro."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s interrompiĝis per Signala Numero %i."
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 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:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Eraraj Protokoloj"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Nenio erara mesaĝo ĉeestas."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Konservi Tiun Mesaĝon"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, 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:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Erara Informaĵo"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Erara Signala informaĵo"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Eligitaj Datumoj"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Neniu eligo ĉeestas"
 
-#: src/bin/e_fm.c:866
-#, fuzzy
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr "Neekzistanta vojo"
 
-#: src/bin/e_fm.c:869
-#, fuzzy, c-format
+#: src/bin/e_fm.c:937
+#, c-format
 msgid "%s doesn't exist."
-msgstr "%s ne ekzistas"
+msgstr "%s ne ekzistas."
+
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Eraro de surmeto"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Eraro de surmeto"
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Eraro"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i Dosieroj"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
-#, fuzzy
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
-msgstr "Linia"
+msgstr "Ligo"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
-#, fuzzy
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
-msgstr "Pri"
+msgstr "Ĉesigi"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
-#, fuzzy
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
-msgstr "Elektaj Agordoj"
+msgstr "Heredas gepatrajn agordojn"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Vidiga Modo"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Refreŝigi Rigardon"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Vidigi Kaŝitajn Dosierojn"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "Memorigi Ordon"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Tuj Ordigi"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nova Dosierujo"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Renomi"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Muti"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Ecoj"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
-#, fuzzy
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
-msgstr "Uzi Defaŭltaĵon"
+msgstr "Uzi defaŭltaĵon"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Kradaj Piktogramoj"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Piktogramaj Difinitaj de uzanto"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Listo"
 
-#: src/bin/e_fm.c:8176
-#, fuzzy, c-format
+#: src/bin/e_fm.c:8380
+#, c-format
 msgid "Icon Size (%d)"
-msgstr "Piktograma Grandeco"
+msgstr "Piktograma grandeco (%d)"
+
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+msgid "Set background..."
+msgstr "Difini tapeton..."
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+msgid "Set overlay..."
+msgstr "Difini kovron..."
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Forviŝi"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Krei novan dosierujon"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Nova Nomo de Dosierujo:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renomi %s al:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Renomi Dosieron"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
-#, fuzzy
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
-msgstr "Relanĉi"
+msgstr "Reprovi"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
-#, fuzzy
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
-msgstr "Lanĉa Eraro"
+msgstr "Eraro"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
-msgstr ""
+msgstr "Ne por ĉiuj"
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
-msgstr ""
+msgstr "Jes por ĉiuj"
 
-#: src/bin/e_fm.c:8524
-#, fuzzy
+#: src/bin/e_fm.c:9014
 msgid "Warning"
-msgstr "Komencante"
+msgstr "Averto"
 
-#: src/bin/e_fm.c:8527
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9017
+#, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
-msgstr "Ĉu vi certas ke vi deziras forviŝi<br><hilight>%s</hilight>?"
+msgstr ""
+"La dosiero jam ekzistas. Ĉu vi volas anstataŭigi ĝin?<br><hilight>%s</"
+"hilight>"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
-msgstr ""
+msgstr "Malatenti tiun ĉi"
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
-msgstr ""
+msgstr "Malatenti ĉiujn"
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
-msgstr ""
+msgstr "Eraro okazis dum efektivado de funkciado.<br>%s"
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Konfirmi Forviŝon"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, 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:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1361,8 +1415,8 @@ msgid "Preview"
 msgstr "Antaŭvido"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: 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"
 
@@ -1371,7 +1425,7 @@ msgid "Thumbnail"
 msgstr "Bildeto"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Difinita de uzanto"
 
@@ -1387,70 +1441,70 @@ msgstr "Ligila Informaĵo"
 msgid "Select an Image"
 msgstr "Elekti bildon"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
-msgstr ""
+msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
-msgstr ""
+msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
-msgstr ""
+msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
-msgstr ""
+msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
-msgstr ""
+msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr "Nekonata Datumportilo"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "Demetebla Aparato"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Plata"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Eniga"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Aspekto"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Aŭtomate rulumi enhavojn"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
-msgstr "Ebligi Grandecŝanĝon"
+msgstr "Regrandigebla"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Komenci movon/regrandigon de ĉi tiun vanaĵon"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Forviŝi tiun vanaĵon"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "Ĉesi movon/regrandigon ĉi tiun vanaĵon"
 
@@ -1501,8 +1555,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1510,7 +1564,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Stako"
 
@@ -1566,9 +1620,8 @@ msgid "Edit Icon"
 msgstr "Redakti Piktogramon"
 
 #: src/bin/e_int_border_menu.c:77
-#, fuzzy
 msgid "Add Application..."
-msgstr "Aldoni Aplikaĵon"
+msgstr "Aldoni Aplikaĵon..."
 
 #: src/bin/e_int_border_menu.c:88
 msgid "Create Icon"
@@ -1587,9 +1640,8 @@ msgid "Unpin from Desktop"
 msgstr "Malpingli de la Labortablo"
 
 #: src/bin/e_int_border_menu.c:130
-#, fuzzy
 msgid "More..."
-msgstr "Eluzi..."
+msgstr "Pli..."
 
 #: src/bin/e_int_border_menu.c:164
 msgid "Iconify"
@@ -1608,19 +1660,16 @@ msgid "Unmaximize"
 msgstr "Malgrandegigi"
 
 #: src/bin/e_int_border_menu.c:484
-#, fuzzy
 msgid "Keyboard Shortcut"
-msgstr "Aldoni Fulmoklavon"
+msgstr "Fulmoklavo"
 
 #: src/bin/e_int_border_menu.c:490
-#, fuzzy
 msgid "To Favorites Menu"
-msgstr "Menuo de Preferaĵoj"
+msgstr "En la menuon de preferaĵoj"
 
 #: src/bin/e_int_border_menu.c:495
-#, fuzzy
 msgid "To Launcher"
-msgstr "Aldoni tiun Aplikaĵon en la Lanĉilon"
+msgstr "En la lanĉilon"
 
 #: src/bin/e_int_border_menu.c:517 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
@@ -1693,19 +1742,18 @@ msgstr "Plenekrana"
 msgid "Window List"
 msgstr "Fenestrolisto"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Vokilo"
 
 #: src/bin/e_int_border_menu.c:1059
-#, fuzzy
 msgid "Taskbar"
-msgstr "Preterpasi la Taskopleton"
+msgstr "Taskopleto"
 
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
@@ -1777,7 +1825,7 @@ msgstr "Nedauxra Por"
 
 #: src/bin/e_int_border_prop.c:437
 msgid "Client Leader"
-msgstr ""
+msgstr "Parenca fenestro"
 
 #: src/bin/e_int_border_prop.c:438
 msgid "Gravity"
@@ -1969,19 +2017,18 @@ msgstr "Restarigi tiun programon dum ensaluto"
 
 #: src/bin/e_int_border_remember.c:550
 msgid "Always focus on start"
-msgstr ""
+msgstr "Ĉiam fokusigi dum komenco"
 
 #: 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
-#, fuzzy
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
-msgstr "Labortablaj Agordoj"
+msgstr "Agordoj"
 
 #: 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
@@ -2013,8 +2060,8 @@ msgstr "Ŝarĝitaj Moduloj"
 msgid "Unload Module"
 msgstr "Malŝarĝi Modulon"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2044,13 +2091,12 @@ msgstr "Elektitaj Vanaĵoj"
 msgid "Remove Gadget"
 msgstr "Forviŝi Vanaĵon"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
-#, fuzzy
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 msgid "Toolbar Settings"
-msgstr "Ĉirkaŭflui Agordoj"
+msgstr "Agordoj de ilbreto"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Aranĝo"
 
@@ -2124,9 +2170,8 @@ msgid "(No Applications)"
 msgstr "(Neniu aplikaĵo)"
 
 #: src/bin/e_int_menus.c:709
-#, fuzzy
 msgid "Set Virtual Desktops"
-msgstr "Virtualaj Labortabloj"
+msgstr "Difini virtualajn labortablojn"
 
 #: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
 msgid "(No Windows)"
@@ -2136,122 +2181,121 @@ msgstr "(Neniu Fenestro)"
 msgid "No name!!"
 msgstr "Neniu nomo!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(Neniu Breto)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Breto numero"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Aldoni Breton"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Forviŝi Breton"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Bretaj Agordoj"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Malgrandega"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Meza"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Granda"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Grandega"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 msgid "Set Contents..."
-msgstr "Bretaj Enhavoj"
+msgstr "Difini enhavon.."
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Supre ĉio"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Malsupre Fenestroj"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Malsupre ĉio"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "Permesi pozicigon de fenestroj super la breton"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Ŝrumpi al Enhava Grandeco"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f rastumeroj"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Stiloj"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "Aŭtomata Kaŝo"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "Aŭtomate kaŝi la breton"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "Vidigi dum muso en"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "Vidigi dum musa alklako"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "Tempolimo de kaŝo"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekundoj"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "Kaŝi daŭron"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "Vidigi en ĉiuj Labortabloj"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "Vidigi en elektitaj Labortabloj"
 
@@ -2265,6 +2309,12 @@ msgid ""
 "or is not owned by you. Please check:\n"
 "%s/enlightenment-%s\n"
 msgstr ""
+"Ebla provo de (InterProceza Komunikado)\n"
+"IPC-kodrompado. La dosierujo de IPC-konektilo\n"
+"jam ekzistas SED la permesoj estas tro malprecizaj\n"
+"(devas esti nur legebla kaj skribebla de la posedanto,\n"
+"kaj neniu alia) aŭ ne estas posedata de vi. Bonvolu \n"
+"kontroli: %s/enlightenment-%s\n"
 
 #: src/bin/e_ipc.c:57
 #, c-format
@@ -2274,6 +2324,10 @@ msgid ""
 "Please check:\n"
 "%s/enlightenment-%s\n"
 msgstr ""
+"La dosierujo de IPC-konektilo ne kreiĝis aŭ\n"
+"legiĝis.\n"
+"Bonvolu kontroli\n"
+"%s/enlightenment-%s\n"
 
 #: src/bin/e_main.c:326
 #, c-format
@@ -2303,6 +2357,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 ""
+"Opcioj:\n"
+"\t-display EKRANO\n"
+"\t\tKonekti al la ekrano nomata EKRANO.\n"
+"\t\tEkz.: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAldoni FALSAN xinerama-ekranon (anstataŭe de la veraj)\n"
+"\t\tlaŭ la geometrio. Aldonu tiom kom vi volas. Ili ĉiuj\n"
+"\t\tanstataŭigas la verajn xinerama-ekranojn, se pluraj.\n"
+"\t\tTio povas esti uzita por simuli xinerama.\n"
+"\t\tEkz.: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800"
+"+0\n"
+"\t-profile AGORDA_PROFILO\n"
+"\t\tUzi la agordan profilon AGORDA_PROFILO anstataŭ la elektita defaŭlta "
+"aŭnur \"default\".\n"
+"\t-good\n"
+"\t\tEstu bone.\n"
+"\t-evil\n"
+"\t\tEstu malbone.\n"
+"\t-psychotic\n"
+"\t\tEstu psikoza.\n"
+"\t-locked\n"
+"\t\tStarti kun la labortablo ŝlosita, tiel pasvorto estos petata.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\t(Mi ja scias kion mi farantas kaj akcesptas plenan respondecon por tio)\n"
+"\t\tSe vi bezonas tiun helpon, vi ne bezonas tiun opction.\n"
 
 #: src/bin/e_main.c:389
 msgid ""
@@ -2349,6 +2428,8 @@ msgid ""
 "Enlightenment cannot initialize its emergency alert system.\n"
 "Have you set your DISPLAY variable?"
 msgstr ""
+"Enlienghtenment ne povas difini sian averto-sistemon.\n"
+"Ĉu vi difinis vian variablon DISPLAY?"
 
 #: src/bin/e_main.c:476
 msgid ""
@@ -2371,6 +2452,8 @@ msgid ""
 "Enlightenment cannot setup xinerama wrapping.\n"
 "This should not happen."
 msgstr ""
+"Enlightenment ne povas difini la fluon de xinerama.\n"
+"Tio ne devus okazi."
 
 #: src/bin/e_main.c:512
 msgid ""
@@ -2386,6 +2469,9 @@ msgid ""
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
+"Laŭ Enlightenment, ecore_evas ne eltenas la bildigon de X11 en\n"
+"Evas. Bonvolu kontroli vian instalon de Evas kaj Ecore kaj kontroli\n"
+"ke ili eltenas la modulo de bildigo de X11."
 
 #: src/bin/e_main.c:525
 msgid ""
@@ -2393,6 +2479,9 @@ msgid ""
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
+"Laŭ Enlightenment, ecore_evas ne eltenas la bildigon de bufro en\n"
+"Evas. Bonvolu kontroli vian instalon de Evas kaj Ecore kaj kontroli\n"
+"ke ili eltenas la modulo de bildigo de Software Buffer."
 
 #: src/bin/e_main.c:541 src/bin/e_main.c:548
 msgid ""
@@ -2419,9 +2508,8 @@ msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment ne povas difini sian agordan sistemon."
 
 #: src/bin/e_main.c:595
-#, fuzzy
 msgid "Enlightenment cannot set up its scale system."
-msgstr "Enlightenment ne eblas difini sian bretan sistemon."
+msgstr "Enlightenment ne eblas difini sian skalan sistemon."
 
 #: src/bin/e_main.c:603
 msgid "Enlightenment cannot set up the pointer system."
@@ -2432,6 +2520,8 @@ msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
 msgstr ""
+"Enlightenment ne eblas difini vojojn por trovi dosierojn.\n"
+"Eble memoro ne sufiĉas?"
 
 #: src/bin/e_main.c:630
 msgid "Enlightenment cannot set up its font system."
@@ -2443,7 +2533,7 @@ msgstr "Enlightenment ne povas difini sian etosan sistemon."
 
 #: src/bin/e_main.c:646
 msgid "Starting International Support"
-msgstr ""
+msgstr "Komencante eltenon de internaciigo"
 
 #: src/bin/e_main.c:651
 msgid "Enlightenment cannot set up its intl system."
@@ -2454,34 +2544,44 @@ msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
 msgstr ""
+"Enlightenment ne eblas difini komencan ekranon.\n"
+"Eble memoro ne sufiĉas?"
 
 #: src/bin/e_main.c:674
 msgid "Testing Format Support"
-msgstr ""
+msgstr "Provado de elteno de formato"
 
 #: src/bin/e_main.c:685
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
 msgstr ""
+"Laŭ Enlightenment, Evas ne povas krei bufro-areaĵon. Bonvolu kontroli\n"
+"ke Evas enhavas eltenon de programa bufrilo-modulo.\n"
 
 #: src/bin/e_main.c:696
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
 msgstr ""
+"Laŭ Enlightenment, Evas ne povas ŝargi la PNG-dosierojn.\n"
+"Kontrolu ke Evas enhavas eltenon de PNG-ŝargilo.\n"
 
 #: src/bin/e_main.c:705
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
 msgstr ""
+"Laŭ Enlightenment, Evas ne povas ŝargi JPEG-dosierojn.\n"
+"Kontrolu ke Evas enhavas eltenon de JPEG.\n"
 
 #: src/bin/e_main.c:714
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
 msgstr ""
+"Laŭ Enlightenment, Evas ne povas ŝargi EET-dosierojn.\n"
+"Kontrolu ke Evas enhavas eltenon de EET.\n"
 
 #: src/bin/e_main.c:725
 msgid ""
@@ -2489,6 +2589,9 @@ msgid ""
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
+"Laŭ Enlightenment, Evas ne povas ŝargi la tiparon 'Sans'. Bonvolu kontroli "
+"ĉu Evas eltenas \"fontconfig\"\n"
+"kaj la sistema \"fontconfig\" difinas iun tiparon 'Sans'.\n"
 
 #: src/bin/e_main.c:735
 msgid "Setup Screens"
@@ -2499,6 +2602,9 @@ msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
 msgstr ""
+"La agordo de Enlightenment por la administrado de fenestroj por ĉiuj ekranoj "
+"de\n"
+"via sistemo malsukcesis. Eble alia fenestradministrilo funkcias?\n"
 
 #: src/bin/e_main.c:746
 msgid "Setup Screensaver"
@@ -2514,7 +2620,7 @@ msgstr "Agodi Labortablan Ŝloson"
 
 #: src/bin/e_main.c:760
 msgid "Enlightenment cannot set up its desk locking system."
-msgstr ""
+msgstr "Enlightenment ne povas difini sian sistemon de ekran-ŝloso."
 
 #: src/bin/e_main.c:773
 msgid "Setting up Paths"
@@ -2538,7 +2644,7 @@ msgstr "Enlightenment ne povas difini sian agadan sistemon."
 
 #: src/bin/e_main.c:809
 msgid "Setup Execution System"
-msgstr ""
+msgstr "Agordi la sistemon de lanĉo"
 
 #: src/bin/e_main.c:814
 msgid "Enlightenment cannot set up its exec system."
@@ -2554,7 +2660,7 @@ msgstr "Enlightenment ne povas difini memorigajn agordojn."
 
 #: src/bin/e_main.c:831
 msgid "Setup FM"
-msgstr ""
+msgstr "Agordi FM"
 
 #: src/bin/e_main.c:836
 msgid "Enlightenment cannot initialize the File manager.\n"
@@ -2577,12 +2683,13 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment ne povas difini sian \"dnd\"-sistemon."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
-msgstr ""
+#, fuzzy
+msgid "Setup Grab Input Handling"
+msgstr "Agordi traktadon de enigo-aparato"
 
 #: src/bin/e_main.c:872
 msgid "Enlightenment cannot set up its input grab handling system."
-msgstr ""
+msgstr "Enlightenment ne povas difini sian sistemon de kapto de enigo."
 
 #: src/bin/e_main.c:876
 msgid "Setup Modules"
@@ -2598,7 +2705,7 @@ msgstr "Agordi Kolorajn Klasojn"
 
 #: src/bin/e_main.c:890
 msgid "Enlightenment cannot set up its color class system."
-msgstr ""
+msgstr "Enlightenment ne povas difini sian sistemon de koloro-klasoj."
 
 #: src/bin/e_main.c:894
 msgid "Setup Gadcon"
@@ -2610,21 +2717,19 @@ msgstr "Enlightenment ne povas difini sian sistemon de kontrolo de vanaĵoj."
 
 #: src/bin/e_main.c:904
 msgid "Setup DPMS"
-msgstr ""
+msgstr "Agordi DPMS (administrado de energi-ŝparo de ekrano)"
 
 #: src/bin/e_main.c:909
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment ne povas difini la DPMS-agordojn."
 
 #: src/bin/e_main.c:913
-#, fuzzy
 msgid "Set Up Powersave modes"
-msgstr "Difini Agmetodon por ĉeforgana Potenco"
+msgstr "Agordi la energiŝparajn reĝimojn"
 
 #: src/bin/e_main.c:917
-#, fuzzy
 msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment ne povas difini sian spruĉajan sistemon."
+msgstr "Enlightenment ne povas difini siajn energiŝparajn reĝimojn."
 
 #: src/bin/e_main.c:922
 msgid "Setup Wallpaper"
@@ -2639,9 +2744,8 @@ msgid "Setup Mouse"
 msgstr "Agordi Muson"
 
 #: src/bin/e_main.c:937
-#, fuzzy
 msgid "Enlightenment cannot configure the mouse settings."
-msgstr "Enlightenment ne povas difini la DPMS-agordojn."
+msgstr "Enlightenment ne povas difini la agordojn de muso."
 
 #: src/bin/e_main.c:942
 msgid "Setup Bindings"
@@ -2677,7 +2781,7 @@ msgstr "Enlightenment ne povas eki la Miniaturon sistemon.\n"
 
 #: src/bin/e_main.c:981
 msgid "Set Up File Ordering"
-msgstr ""
+msgstr "Agordi la ordigadon de dosieroj"
 
 #: src/bin/e_main.c:985
 msgid "Enlightenment cannot set up its order file system."
@@ -2694,10 +2798,14 @@ msgid ""
 "problem<br>modules from your configuration. The module<br>configuration "
 "dialog should let you select your<br>modules again."
 msgstr ""
+"Enlightenment fuŝis frue dum komenco kaj<br> restartiĝis. Ĉiuj moduloj "
+"malebliĝis kaj ne<br> ŝargiĝos por helpi forigi iun ajn probleman<br>modulon "
+"de via agordo. La modulo de agordo<br> permesos elekti viajn modulojn de "
+"nove."
 
 #: src/bin/e_main.c:1035
 msgid "Enlightenment crashed early on start and has been restarted"
-msgstr ""
+msgstr "Enlightenment fuŝis frue dum komenco kaj restartiĝis."
 
 #: src/bin/e_main.c:1036
 msgid ""
@@ -2706,6 +2814,10 @@ msgid ""
 "modules from your configuration.<br><br>The module configuration dialog "
 "should let you select your<br>modules again."
 msgstr ""
+"Enlightenment fuŝis frue dum komenco kaj<br> restartiĝis. Ĉiuj moduloj "
+"malebliĝis kaj ne<br> ŝargiĝos por helpi forigi iun ajn probleman<br>modulon "
+"de via agordo. La modulo de agordo<br> permesos elekti viajn modulojn de "
+"nove."
 
 #: src/bin/e_main.c:1044
 msgid "Configure Shelves"
@@ -2734,6 +2846,8 @@ 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 ""
+"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
 msgid "Module does not contain all needed functions"
@@ -2746,6 +2860,9 @@ msgid ""
 "module API version of: %i.<br>The module API advertized by Enlightenment is: "
 "%i.<br>"
 msgstr ""
+"Eraro de modulo-API<br>Eraro pravalorizi la modulon: %s<br>Ĝi bezonas "
+"minimumeversion de modulo-API %i.<br>La modulo-API bezonata de Enlightenment "
+"estas: %i.<br>"
 
 #: src/bin/e_module.c:169
 #, c-format
@@ -2756,31 +2873,40 @@ msgstr "Enlightenment-a \"%s\" Modulo"
 msgid "Would you like to unload this module?<br>"
 msgstr "ĉu vi volas malŝarĝi tiun modulon ?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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 ""
+"Vi malebligis la ekrankurtenon tro rapide<br><br>Ĉu vi volas ebligi la "
+"<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
 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:1259
+#: src/bin/e_shelf.c:1273
 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:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Halti Movadon/GrandecŜanĝon de Elementoj"
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Komenci Movadon/GrandecŜanĝon de Elementoj"
 
-#: src/bin/e_shelf.c:1692
-#, fuzzy
+#: src/bin/e_shelf.c:1703
 msgid "Set Shelf Contents"
-msgstr "Bretaj Enhavoj"
+msgstr "Difini la bretan enhavon"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Forviŝi tiun Breton"
 
@@ -2790,12 +2916,12 @@ msgstr "Komencante"
 
 #: src/bin/e_sys.c:170
 msgid "Checking System Permissions"
-msgstr ""
+msgstr "Kontrolado de sistemaj permesoj"
 
 #: 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 "Kontrolo de sistemo finita."
 
 #: src/bin/e_sys.c:314
 msgid "Logout problems"
@@ -2827,58 +2953,51 @@ msgid "Logout in progress"
 msgstr "Elsalutante"
 
 #: src/bin/e_sys.c:366
-#, fuzzy
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
-msgstr "Elsaluto estas rulanta.<br><hilight>Bonvolu atendi.</hilight>"
+msgstr "Elsalutante.<br><hilight>Bonvolu atendi.</hilight>"
 
 #: src/bin/e_sys.c:395 src/bin/e_sys.c:456
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment estas okupata de alia peto"
 
 #: src/bin/e_sys.c:401
-#, fuzzy
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
-"Enlightenement estas laboranta dum elsalutado.<br>Vi ne povas plenumi "
-"aliajn<br>sistemajn agojn ĝis tio finiĝos."
+"Elsalutante.<br>Vi ne povas plenumi aliajn sistemajn agojn ĝis tio finiĝos."
 
 #: src/bin/e_sys.c:409
-#, fuzzy
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
-"Enlightenment estas estinganta la sistemon.<br>Vi ne povas fari iujn ajn "
-"aliajn sistemajn agadojn<br>antaŭ estingo ekis."
+"Kurentmalŝaltante.<br>Vi ne povas fari iujn ajn aliajn sistemajn "
+"agadojn<br>antaŭ estingo ekis."
 
 #: src/bin/e_sys.c:416
-#, fuzzy
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
-"Enlightenment estas relanĉanta la sistemon.<br>Vi ne povas fari aliajn "
-"sistemajn agadoj<br>antaŭ la relanĉo ekos."
+"Restartigante.<br>Vi ne povas fari aliajn sistemajn agadoj<br>antaŭ la "
+"relanĉo ekos."
 
 #: src/bin/e_sys.c:423
-#, fuzzy
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
-"Enlightenment estas paŭziganta la sistemon.<br>Vi ne povas fari iujn ajn "
-"aliajn sistemajn agadoj<br>antaŭ la paŭzigo ekos."
+"Sistempaŭzigante.<br>Vi ne povas fari iujn ajn aliajn sistemajn "
+"agadoj<br>antaŭ la paŭzigo ekos."
 
 #: src/bin/e_sys.c:430
-#, fuzzy
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
-"Enlightenement estas diskdormiganta vian sistemon.<br>Vi ne povas plenumi "
-"aliajn sistemajn agojn<br>ĝis tio finiĝos."
+"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
 msgid "EEK! This should not happen"
@@ -2886,62 +3005,53 @@ msgstr "HUJ! Tio ne devus okazi"
 
 #: src/bin/e_sys.c:463
 msgid "Power off failed."
-msgstr ""
+msgstr "La kurentmalŝalto malsukcesis."
 
 #: src/bin/e_sys.c:468
-#, fuzzy
 msgid "Reset failed."
-msgstr "Labortabla dosiero"
+msgstr "La restartigo malsukcesis."
 
 #: src/bin/e_sys.c:473
-#, fuzzy
 msgid "Suspend failed."
-msgstr "Diskodormiga tempo"
+msgstr "Diskodormigo malsukcesis."
 
 #: src/bin/e_sys.c:478
-#, fuzzy
 msgid "Hibernate failed."
 msgstr "Diskdormigo de via sistemo malsukcesis."
 
 #: src/bin/e_sys.c:535
 msgid "Power off"
-msgstr ""
+msgstr "Kurentmalŝalti"
 
 #: src/bin/e_sys.c:538
-#, fuzzy
 msgid "Power off.<br><hilight>Please wait.</hilight>"
-msgstr "Relanĉante vian Komputilon.<br><hilight>Bonvolu atendi</hilight>"
+msgstr "Kurentmalŝalto.<br><hilight>Bonvolu atendi</hilight>"
 
 #: src/bin/e_sys.c:562
-#, fuzzy
 msgid "Resetting"
-msgstr "Labortablaj Agordoj"
+msgstr "Restartigante"
 
 #: src/bin/e_sys.c:565
-#, fuzzy
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
-msgstr "Relanĉante vian Komputilon.<br><hilight>Bonvolu atendi</hilight>"
+msgstr "Restartigante.<br><hilight>Bonvolu atendi</hilight>"
 
 #: src/bin/e_sys.c:588
 msgid "Suspending"
 msgstr "Dormigante"
 
 #: src/bin/e_sys.c:591
-#, fuzzy
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
-msgstr "Dormigante vian komputilon.<br><hilight>Bonvolu atendi</hilight>"
+msgstr "Dormigante.<br><hilight>Bonvolu atendi</hilight>"
 
 #: src/bin/e_sys.c:614
 msgid "Hibernating"
 msgstr "Diskdormigante"
 
 #: src/bin/e_sys.c:617
-#, fuzzy
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
-msgstr "Diskdormigante vian Komputilon.<br><hilight>Bonvolu atendi.</hilight>"
+msgstr "Diskdormigante.<br><hilight>Bonvolu atendi.</hilight>"
 
 #: src/bin/e_theme_about.c:17
-#, fuzzy
 msgid "About Theme"
 msgstr "Pri tiu etoso"
 
@@ -2949,10 +3059,9 @@ msgstr "Pri tiu etoso"
 msgid "Set As Theme"
 msgstr "Difini kiel Etoson"
 
-#: src/bin/e_toolbar.c:331
-#, fuzzy
+#: src/bin/e_toolbar.c:340
 msgid "Set Toolbar Contents"
-msgstr "Bretaj Enhavoj"
+msgstr "Difini la ilobretan enhavon"
 
 #: src/bin/e_utils.c:246
 msgid "Cannot exit - immortal windows."
@@ -2964,68 +3073,71 @@ msgid ""
 "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 ""
+"Kelkaj fenestroj ĉiam ekzistas kun la ŝlosilo ebligita. Tio signifas<br>ke "
+"Enlightenment ne permesos sin ĉesigi ĝis tiujn fenestoj<br>estos fermitaj aŭ "
+"kies la ŝlosilo foriĝis.<br>"
 
-#: src/bin/e_utils.c:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "Je futuro"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "Je lasta minuto"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "Antaŭ %li Jaroj"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "Antaŭ %li Monatoj"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "Antaŭ %li Semajnoj"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "Antaŭ %li Tagoj"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "Antaŭ %li Horoj"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "Antaŭ %li minutoj"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3037,7 +3149,7 @@ msgstr "Nekonata"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Aldoni"
 
@@ -3060,7 +3172,7 @@ msgid "Add to Favorites"
 msgstr "Aldoni al Preferata Menuo"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3104,9 +3216,8 @@ msgid "Read-Write"
 msgstr "Lege skribe"
 
 #: src/modules/battery/e_mod_config.c:41
-#, fuzzy
 msgid "Battery Monitor Settings"
-msgstr "Konfiguraĵo Bateria Monitoro"
+msgstr "Agordo de Bateria monitoro"
 
 #: src/modules/battery/e_mod_config.c:92
 msgid "Basic Settings"
@@ -3117,60 +3228,54 @@ msgid "Show alert when battery is low"
 msgstr "Montri antaŭgardon kiam baterio estas baznivela"
 
 #: src/modules/battery/e_mod_config.c:136
-#, fuzzy
 msgid "Check every:"
-msgstr "Inspekti baterion je ĉiuj :"
+msgstr "Inspekti je ĉiuj:"
 
 #: src/modules/battery/e_mod_config.c:138
 #: 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 dosieroj"
+msgstr "%1.0f tempunuoj"
 
 #: src/modules/battery/e_mod_config.c:140
-#, fuzzy
 msgid "Polling"
-msgstr "Plata"
+msgstr "Ĝisdatigante"
 
 #: src/modules/battery/e_mod_config.c:143
-#, fuzzy
 msgid "Show alert on low battery"
-msgstr "Montri antaŭgardon kiam baterio estas baznivela"
+msgstr "Montri averton kiam baterio estas baznivela"
 
 #: src/modules/battery/e_mod_config.c:145
-#, fuzzy
 msgid "Alert when at:"
-msgstr "Pepi kiam baterio estas malpli ol :"
+msgstr "Avertii kiam baterio estas je:"
 
 #: src/modules/battery/e_mod_config.c:147
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f min"
 msgstr "%1.0f minutoj"
 
 #: src/modules/battery/e_mod_config.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f %%"
-msgstr "%3.0f%%"
+msgstr "%1.0f %%"
 
 #: src/modules/battery/e_mod_config.c:151
 msgid "Auto dismiss in..."
-msgstr ""
+msgstr "Aŭtomate forigi post..."
 
 #: src/modules/battery/e_mod_config.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f sec"
-msgstr "%1.1f sekundoj"
+msgstr "%1.0f sekundoj"
 
 #: src/modules/battery/e_mod_config.c:155
-#, fuzzy
 msgid "Alert"
-msgstr "Plirapidigi"
+msgstr "Averto"
 
 #: src/modules/battery/e_mod_config.c:160
-#, fuzzy
 msgid "Auto Detect"
-msgstr "Aŭtomata Kaŝo"
+msgstr "Aŭtomate detekti"
 
 #: src/modules/battery/e_mod_config.c:162
 #: src/modules/conf_applications/e_mod_main.c:39
@@ -3181,37 +3286,36 @@ msgid "Internal"
 msgstr "Interna"
 
 #: src/modules/battery/e_mod_config.c:164
-#, fuzzy
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
-msgstr "ALT"
+msgstr "HAL"
 
 #: src/modules/battery/e_mod_config.c:167
 msgid "Hardware"
-msgstr ""
+msgstr "Aparataro"
 
 #: src/modules/battery/e_mod_main.c:135
 msgid "Battery"
 msgstr "Baterio"
 
-#: src/modules/battery/e_mod_main.c:845
-#, fuzzy
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
-msgstr "Montri antaŭgardon kiam baterio estas baznivela"
+msgstr "Via baterio estas baznivela!"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
-msgstr ""
+msgstr "Alterna kurento estas rekomendita."
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
-msgstr ""
+msgstr "Neaplikebla"
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
-msgstr ""
+msgstr "ERARO"
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr "Baterio-mesurilo"
 
@@ -3220,10 +3324,21 @@ msgid "Clock"
 msgstr "Horloĝo"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
-msgstr "Labortablaj Agordoj"
+msgstr "Panelo de agordoj"
+
+#: src/modules/conf/e_mod_main.c:234
+msgid "Presentation"
+msgstr "Prezentaĵo"
+
+#: src/modules/conf/e_mod_main.c:241
+msgid "Offline"
+msgstr "Senkonekte"
+
+#: src/modules/conf/e_mod_main.c:269
+msgid "Modes"
+msgstr "Reĝimoj"
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
@@ -3247,7 +3362,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:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "Ĉiuj Aplikaĵoj"
 
@@ -3256,9 +3371,8 @@ msgid "Selected Applications"
 msgstr "Ordigi Aplikaĵojn"
 
 #: src/modules/conf_applications/e_mod_main.c:34
-#, fuzzy
 msgid "Apps"
-msgstr "Apliki"
+msgstr "Aplikaĵoj"
 
 #: src/modules/conf_applications/e_mod_main.c:35
 msgid "New Application"
@@ -3298,9 +3412,8 @@ msgstr "Memori tiun randon pri tiu fenestro je proksima foje ĝi aperos"
 #: 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 "ŝlosoj"
+msgstr "Aspekto"
 
 #: src/modules/conf_borders/e_mod_main.c:35
 msgid "Borders"
@@ -3351,7 +3464,7 @@ msgstr "Alfabeta"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:128
 msgid "Window stacking layer"
-msgstr ""
+msgstr "Tavolo de fenestra stakado"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:130
 msgid "Most recently used"
@@ -3363,19 +3476,19 @@ msgstr "Bildsimboligitaj fenestroj"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:136
 msgid "Group with owning desktop"
-msgstr ""
+msgstr "Grupigi kun posedanta labortablo"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:138
 msgid "Group with current desktop"
-msgstr ""
+msgstr "Grupo kun nuna labortablo"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:140
 msgid "Separate group"
-msgstr ""
+msgstr "Disigi grupon"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:142
 msgid "Warp to owning desktop"
-msgstr ""
+msgstr "Ŝovi al la posedantan labortablon"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:146
 msgid "Menu Item Captions"
@@ -3383,7 +3496,7 @@ msgstr "Etikedo de Menua Elemento"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:147
 msgid "Limit caption length"
-msgstr ""
+msgstr "Limigi longecon de etikedo"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:149
 #, c-format
@@ -3411,9 +3524,8 @@ msgid "Border Title"
 msgstr "Randa Titolo"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
-#, fuzzy
 msgid "Settings Dialog Title"
-msgstr "Titolo de la Pri-dialogo"
+msgstr "Titolo de dialogo de agordoj"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
 msgid "Error Text"
@@ -3426,7 +3538,7 @@ msgstr "Titolo de Menuo"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
 msgid "Menu Title Active"
-msgstr ""
+msgstr "Titolo de la aktiva menuo"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
 #: src/modules/conf_fonts/e_int_config_fonts.c:62
@@ -3435,7 +3547,7 @@ msgstr "Menua Elemento"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:56
 msgid "Menu Item Active"
-msgstr ""
+msgstr "Elemento de la aktiva menuo"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:57
 #: src/modules/conf_fonts/e_int_config_fonts.c:67
@@ -3445,7 +3557,7 @@ msgstr "Mova Teksto"
 #: 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 "GrandecŜanĝa Teksto"
+msgstr "Regrandigi tekston"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:59
 msgid "Winlist Item"
@@ -3471,15 +3583,15 @@ msgstr "Butona Teksto"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:69
 msgid "Button Text Disabled"
-msgstr ""
+msgstr "Teksto de butono malebligita"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:70
 msgid "Check Text"
-msgstr ""
+msgstr "Teksto de markobutono"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:71
 msgid "Check Text Disabled"
-msgstr ""
+msgstr "Teksto de markobutono malebligita"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:72
 msgid "Entry Text"
@@ -3491,11 +3603,11 @@ msgstr "Etikeda Teksto"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:74
 msgid "List Item Text"
-msgstr ""
+msgstr "Teksto de ero de listo"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:75
 msgid "List Item Odd Text"
-msgstr ""
+msgstr "Teksto de nepara elemento de listo"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:76
 #: src/modules/conf_fonts/e_int_config_fonts.c:92
@@ -3504,19 +3616,19 @@ msgstr "Lista Titolo"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:77
 msgid "Radio Text"
-msgstr ""
+msgstr "Teksto de radiobutono"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:78
 msgid "Radio Text Disabled"
-msgstr ""
+msgstr "Teksto de radiobutono malebligita"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:79
 msgid "Slider Text"
-msgstr ""
+msgstr "Teksto de ŝovilo"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:80
 msgid "Slider Text Disabled"
-msgstr ""
+msgstr "Teksto de malebligita ŝovilo"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:87
 msgid "Module Label"
@@ -3528,9 +3640,8 @@ msgid "Colors"
 msgstr "Koloroj"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:251
-#, fuzzy
 msgid "Other"
-msgstr "Aliaj de IBar"
+msgstr "Alia"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:435
 msgid "Window Manager Colors"
@@ -3599,50 +3710,60 @@ msgstr "Labortabla Tapeto"
 
 #: src/modules/conf_desk/e_int_config_desk.c:162
 #: src/modules/conf_mime/e_int_config_mime.c:193
-#, fuzzy
 msgid "Set"
-msgstr "Elekti"
+msgstr "Meti"
 
 #: src/modules/conf_desk/e_mod_main.c:35
 msgid "Desk"
 msgstr "Labortablo"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "Agordoj de Ekrana Ŝloso"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Aŭtomata Ŝloso"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
-#, fuzzy
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 msgid "Lock when Enlightenment starts"
-msgstr "Uzi Enlightenment-an kursoron"
+msgstr "Ŝlosi kiam Enlightenment ekas"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
 msgstr "Ŝlosi kiam ekrankurteno komencas"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+msgid "Time after screensaver activated"
+msgstr "Tempolimo por startigi ekrankurtenon"
+
+#: 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 sekundoj"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
 msgid "Lock when idle time exceeded"
-msgstr ""
+msgstr "Ŝlosi kiam tempo de senokupo trapasita"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+msgstr "Tempo de senokupo trapasenda"
+
+#: 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 minutoj"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3653,27 +3774,27 @@ msgstr "%1.0f minutoj"
 msgid "Personal"
 msgstr "Persona"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Agordoj de EnsalutadoSkatolo"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
 msgstr "Montri en ĉiuj ekranaj zonoj"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr "Montri en nuna ekrana zono"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
 msgstr "Montri en ekrana zono #:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3682,29 +3803,48 @@ msgstr "Montri en ekrana zono #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Tapeta Modo"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
 #: src/modules/gadman/e_mod_config.c:149
 msgid "Theme Defined"
 msgstr "Difinita de Etoso"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Tapeto de Etoso"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+msgid "User Wallpaper"
+msgstr "Uzi tapeton"
+
+#: 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 "Startigi la prezentan reĝimon"
+
+#: 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 "Sugesti starton de prezentan reĝimon"
+
+#: 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 "se malebligita antaŭe"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:457
 msgid "Custom Screenlock"
 msgstr "Propra ekrena ŝloso"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "Uzi propran ekranan ŝloson"
 
@@ -3712,59 +3852,73 @@ msgstr "Uzi propran ekranan ŝloson"
 msgid "Screen Lock"
 msgstr "Ekrana Ŝloso"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "Agordoj de Virtualaj Labortabloj"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Nombro de Labortabloj"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Labortabla Ŝango per Muso"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "Animata Spegulo"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Labortabloj"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
-msgstr ""
+msgstr "Ŝanĝi labortablon dum objektoj demetiĝas al ekrana rando"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: src/modules/conf_desks/e_int_config_desks.c:298
 msgid "Wrap desktops around when flipping"
-msgstr ""
+msgstr "Ŝanĝi labortablon cirkle"
 
-#: src/modules/conf_desks/e_int_config_desks.c:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "Spegula Animaĵo"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "For"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "Panelo"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Pligrandigo"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 sekundoj"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+msgid "Background panning"
+msgstr "Panorama ekranfono"
+
+#: src/modules/conf_desks/e_int_config_desks.c:321
+#, c-format
+msgid "%.2f X-axis pan factor"
+msgstr "%.2f panorama faktoro laŭ X-akso"
+
+#: src/modules/conf_desks/e_int_config_desks.c:325
+#, c-format
+msgid "%.2f Y-axis pan factor"
+msgstr "%.2f panorama faktoro laŭ Y-akso"
+
 #: src/modules/conf_desks/e_mod_main.c:35
 msgid "Virtual Desktops"
 msgstr "Virtualaj Labortabloj"
@@ -3780,8 +3934,8 @@ msgstr "Agordoj de Dialogoj"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -3791,14 +3945,12 @@ msgid "Disable Confirmation Dialogs"
 msgstr "Malebligi Konfirmo de Dialogoj"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:91
-#, fuzzy
 msgid "Normal Windows"
-msgstr "(Neniu Fenestro)"
+msgstr "Normala fenestroj"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:98
-#, fuzzy
 msgid "Default Settings Dialogs Mode"
-msgstr "Modo de Defaŭlta Dialogo"
+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
@@ -3825,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 in %d seconds."
 msgstr ""
+"Ĉu tio ŝajnas bone? <hilight>Konservu</hilight> se ĝi estas, aŭ restaŭru se "
+"ĝi ne estas.<br> Se vi ne klakas butonon, la malnova ekrandistingivo (%dx%d "
+"je %d Hz) estos<br> restaŭrigita post %d sekundoj."
 
 #: src/modules/conf_display/e_int_config_display.c:136
 #, c-format
@@ -3833,6 +3988,9 @@ msgid ""
 "<br>If you do not press a button, the old resolution of<br>%dx%d will be "
 "restored in %d seconds."
 msgstr ""
+"Ĉu tio ŝajnas bone? <hilight>Konservu</hilight> se ĝi estas, aŭ restaŭru se "
+"ĝi ne estas.<br> Se vi ne klakas butonon, la malnova ekrandistingivo (%dx%d) "
+"estos<br> restaŭrigita post %d sekundoj."
 
 #: src/modules/conf_display/e_int_config_display.c:146
 #, c-format
@@ -3841,6 +3999,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 ""
+"Ĉu tio ŝajnas bone? <hilight>Konservu</hilight> se ĝi estas, aŭ Ne se ĝi ne "
+"estas.<br> Se vi ne klakas butonon, la malnova ekrandistingivo (%dx%d je %d "
+"Hz) estos<br> restaŭrigita <hilight>TUJ</hilight>."
 
 #: src/modules/conf_display/e_int_config_display.c:153
 #, c-format
@@ -3849,20 +4010,21 @@ msgid ""
 "<br>If you do not press a button, the old resolution of<br>%dx%d will be "
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
+"Ĉu tio ŝajnas bone? <hilight>Konservu</hilight> se ĝi estas, aŭ restaŭru se "
+"ĝi ne estas.<br> Se vi ne klakas butonon, la malnova ekrandistingivo (%dx%d) "
+"estos<br> restaŭrigita <hilight>TUJ</hilight>."
 
 #: src/modules/conf_display/e_int_config_display.c:190
 msgid "Resolution change"
 msgstr "Distingiva ŝanĝo"
 
 #: src/modules/conf_display/e_int_config_display.c:194
-#, fuzzy
 msgid "Save"
-msgstr "Ŝtato"
+msgstr "Konservi"
 
 #: src/modules/conf_display/e_int_config_display.c:195
-#, fuzzy
 msgid "Restore"
-msgstr "Relanĉi"
+msgstr "Restarigi"
 
 #: src/modules/conf_display/e_int_config_display.c:228
 msgid "Screen Resolution Settings"
@@ -3900,10 +4062,14 @@ msgid ""
 "be<br>that at the time <hilight>ecore</hilight> was built, there<br>was no "
 "XRandR support detected."
 msgstr ""
+"El via X-vido-servilo mankas la elteno de la<br> <hilight>XRandR</hilight> "
+"(X Resize and Rotate) kromaĵo.<br> Vi ne povas ŝanĝi la ekrandistingivo sen "
+"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
 msgid "No Refresh Rates Found"
-msgstr ""
+msgstr "Neniu ofteco de aktualigo trovita"
 
 #: src/modules/conf_display/e_int_config_display.c:655
 msgid ""
@@ -3913,6 +4079,11 @@ msgid ""
 "setting<br>the resolution, which may cause <hilight>damage</hilight> to your "
 "screen."
 msgstr ""
+"Neniu ofteco de aktualigo estas raportita de via x-vido-servilo.<br> Se vi "
+"rulas inigitan X-vido-servilon, tio estas atenda. Tamen, se<br> vi ne rulas "
+"tian servilon, do la nuna ofteco de aktualigo uziĝos<br> dum agordado de la "
+"ekrandistingivo, kiu povas kaŭzi <hilight>domaĝon</hilight><br> al via "
+"ekrano."
 
 #: src/modules/conf_display/e_mod_main.c:35
 msgid "Screen Resolution"
@@ -3925,34 +4096,33 @@ msgstr "Vidigo de Signalado de Administrado de Potenco"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:61
 msgid "The current display server is not <br>DPMS capable."
-msgstr ""
+msgstr "La nuna servilo de vidigo ne scipovas 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 "La nuna servilo de vidigo ne havas DPMS-kromaĵon."
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:112
 msgid "Display Power Management Settings"
 msgstr "Vidigo de agordojn de Administrado de Potenco"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
 msgid "Enable Display Power Management"
 msgstr "Ebligi Vidigon de Administrado de Potenco"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:203
-#, fuzzy
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
-msgstr "Horloĝo(j)"
+msgstr "Tempmezurilo"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "Atenda tempo"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "Diskodormiga tempo"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "Estinga tempo"
 
@@ -3973,32 +4143,29 @@ 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:"
 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
-#, fuzzy
 msgid "Edge Binding Settings"
-msgstr "Agordoj de Klavaj Bindoj"
+msgstr "Agordoj de Edje-Bindoj"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
 #: src/modules/conf_edgebindings/e_mod_main.c:35
-#, fuzzy
 msgid "Edge Bindings"
-msgstr "Klavaj Bindoj"
+msgstr "Edje-Bindoj"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
-#, fuzzy
 msgid "Add Edge"
-msgstr "Aldunu Vanaĵon"
+msgstr "Alduni \"Edje\""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
-#, fuzzy
 msgid "Delete Edge"
-msgstr "Forviŝi Klavon"
+msgstr "Forviŝi \"Edje\""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
-#, fuzzy
 msgid "Modify Edge"
-msgstr "Ŝanĝi Klavon"
+msgstr "Ŝanĝi \"Edje\""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
@@ -4024,38 +4191,34 @@ msgid "Action Params"
 msgstr "Agaj Parametroj"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#, fuzzy
 msgid "General Options"
-msgstr "Ĝeneralaj Agordoj"
+msgstr "Ĝeneralaj opcioj"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
-#, fuzzy
 msgid "Allow binding activation with fullscreen windows"
-msgstr "Permesas al fenestroj ke ili estu sube plenekrana fenestro"
+msgstr "Permesas ebligadon de fulmklavoj kun plenekranaj fenestroj."
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
-#, fuzzy
 msgid "Edge Binding Sequence"
-msgstr "Bindado de Klava Sekvenco"
+msgstr "Sekvenco de Edje-fulmklavoj"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
-#, fuzzy, c-format
+#, c-format
 msgid "%.2f seconds"
-msgstr "%2.2f sekundoj"
+msgstr "%.2f sekundoj"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
-#, fuzzy
 msgid "Binding Edge Error"
-msgstr "Eraro de Klava Bindo"
+msgstr "Eraro de Edje-Bindo"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 "La bindado de klava sekvenco, kiun vi elektis, estas jam uzita de la agado "
-"\"<br><hilight>%s</hilight>\".<br>Bonvolu elekti alian bindadon de klavan "
+"\"<br><hilight>%s</hilight>\".<br>Bonvolu elekti alian bindadon de Edje-"
 "sekvenco."
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
@@ -4088,9 +4251,8 @@ msgstr "VIN"
 #: 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 "Startigo"
+msgstr "Enigo"
 
 #: src/modules/conf_engine/e_int_config_engine.c:38
 msgid "Engine Settings"
@@ -4105,9 +4267,8 @@ msgid "Default Engine"
 msgstr "Defaŭlta Motoro"
 
 #: src/modules/conf_engine/e_int_config_engine.c:131
-#, fuzzy
 msgid "Enable Composite Support ?"
-msgstr "Ebligi Composite-on"
+msgstr "Ĉu ebligi Composite-eltenon?"
 
 #: src/modules/conf_engine/e_int_config_engine.c:133
 msgid ""
@@ -4115,6 +4276,8 @@ msgid ""
 "not support composite.<br><br>Are you sure you wish to enable composite "
 "support ?"
 msgstr ""
+"Vi volas ebligi la eltenon de Composite, sed via nuna<br> ekrano ne eltenas "
+"Composite.<br><br> Ĉu vi certas ke vi volas ebligi la eltenon de Composite?"
 
 #: src/modules/conf_engine/e_mod_main.c:35
 msgid "Engine"
@@ -4137,7 +4300,7 @@ msgstr "Maksimuma Numbro de Kongruaj 'Exes' Listigendaj"
 #: 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 "Longeco de historio"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:129
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:182
@@ -4175,7 +4338,7 @@ msgstr "Terminalaj Agordoj"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:198
 msgid "Terminal Command (CTRL+RETURN to utilize)"
-msgstr ""
+msgstr "Terminala komando (KTRL+REVENO por uzi)"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:206
 #: src/modules/conf_winlist/e_int_config_winlist.c:295
@@ -4244,20 +4407,19 @@ msgstr "Titola Breto"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
-msgstr ""
+msgstr "Tekstbloko"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
-msgstr ""
+msgstr "Tekstbloko eta"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
-msgstr ""
+msgstr "Tekstbloko granda"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:70
-#, fuzzy
 msgid "Settings Heading"
-msgstr "Labortablaj Agordoj"
+msgstr "Kapo de agordoj"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
@@ -4341,12 +4503,11 @@ msgstr "Administrilo"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
-msgstr ""
+msgstr "Ĉeno-bufro"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:97
-#, fuzzy
 msgid "Desktop Icon"
-msgstr "Vidigi Labortablajn Piktogramojn"
+msgstr "Labortabla Piktogramo"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
@@ -4439,7 +4600,7 @@ msgstr "Piktogramaj Etosoj"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:198
 msgid "Icon theme overrides general theme"
-msgstr ""
+msgstr "Piktograma Etoso anstataŭigas ĝeneralan etoson"
 
 #: src/modules/conf_icon_theme/e_mod_main.c:35
 msgid "Icon Theme"
@@ -4489,9 +4650,8 @@ msgid "Exported Environment Variables"
 msgstr "Eksportitaj Medivariabloj"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:66
-#, fuzzy
 msgid "Select an Input Method Settings..."
-msgstr "Elektu agodon de tajpo-metodo"
+msgstr "Elekti agordon de tajpo-metodo.."
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:281
 #: src/modules/conf_imc/e_int_config_imc_import.c:296
@@ -4518,22 +4678,20 @@ msgid "Language"
 msgstr "Lingvo"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:37
-#, fuzzy
 msgid "Interaction Settings"
-msgstr "Elektaj Agordoj"
+msgstr "Agordoj de interagoj"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:94
-#, fuzzy
 msgid "Thumbscroll"
-msgstr "Bildeto"
+msgstr "Miniaturo-rulumilo"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:96
 msgid "Enable Thumbscroll"
-msgstr ""
+msgstr "Ebligi miniaturan rulumon"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:100
 msgid "Threshold for a thumb drag"
-msgstr ""
+msgstr "Sojlo por ŝovado de miniaturo"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:103
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:228
@@ -4542,27 +4700,27 @@ msgid "%1.0f pixels"
 msgstr "%1.0f rastrumeroj"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
-msgstr ""
+#, fuzzy
+msgid "Threshold for applying drag momentum"
+msgstr "Sojlo por apliki moviĝeman ŝovon"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f pixels/sec"
-msgstr "%5.0f rastrumeroj/sek"
+msgstr "%1.0f rastrumeroj/sek"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:114
 msgid "Friction slowdown"
-msgstr ""
+msgstr "Malplirapidigo de froto"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "%1.2f sec"
-msgstr "%1.1f sekundoj"
+msgstr "%1.2f sekundoj"
 
 #: src/modules/conf_interaction/e_mod_main.c:35
-#, fuzzy
 msgid "Interaction"
-msgstr "Interna"
+msgstr "Interago"
 
 #: src/modules/conf_intl/e_int_config_intl.c:583
 #: src/modules/conf_intl/e_mod_main.c:35
@@ -4765,7 +4923,7 @@ msgid "Select an Edj File"
 msgstr "Elekti \"Edj\"-dosieron"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Dosieroj"
 
@@ -4775,6 +4933,9 @@ msgid ""
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
 "highlight> to abort."
 msgstr ""
+"Bonvolu teni iun ajn modifilon kiun vi volas<br> kaj premi iun ajn butonon "
+"sur via muso, aŭ<br> ruli la musradon, por difini musan bindon.<br> Premu "
+"<hilight>Eskapo</highlight> por ĉesi."
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:112
 msgid "Mouse Binding Settings"
@@ -4841,15 +5002,13 @@ msgstr "Kursoraj Agordoj"
 
 #: 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 "Ombra Koloro"
+msgstr "Vidigi kursoron"
 
 #: 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 "Uzi X11-an kursoron"
+msgstr "Senokupa kursoro"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:141
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:221
@@ -4871,14 +5030,12 @@ msgstr "Musa kursoro"
 
 #: src/modules/conf_mouse/e_int_config_mouse.c:36
 #: src/modules/conf_mouse/e_mod_main.c:35
-#, fuzzy
 msgid "Mouse Settings"
-msgstr "Modulaj Agordoj"
+msgstr "Agordo de muso"
 
 #: src/modules/conf_mouse/e_int_config_mouse.c:97
-#, fuzzy
 msgid "Mouse Hand"
-msgstr "Musaj Bindoj"
+msgstr "Mano de muso"
 
 #: src/modules/conf_mouse/e_int_config_mouse.c:105
 msgid "Mouse Acceleration"
@@ -4893,9 +5050,8 @@ msgid "Threshold"
 msgstr "Sojlo"
 
 #: src/modules/conf_paths/e_int_config_paths.c:62
-#, fuzzy
 msgid "Search Path Settings"
-msgstr "Komencaj Agordoj"
+msgstr "Agordoj de serĉovojoj"
 
 #: src/modules/conf_paths/e_int_config_paths.c:73
 msgid "Data"
@@ -4955,9 +5111,8 @@ msgstr "%1.0f kps"
 
 #: 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 "Eraro dum lanĉo de aplikaĵo"
+msgstr "Prioritato de aplikaĵoj"
 
 #: src/modules/conf_performance/e_int_config_performance.c:146
 msgid "Cache Settings"
@@ -5017,25 +5172,23 @@ msgstr "Uzeblaj aspektoj"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:116
 #: src/modules/wizard/page_020.c:118
-#, fuzzy
 msgid "Select a profile"
-msgstr "Elekti \"Edj\"-dosieron"
+msgstr "Elekti profilon"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:125
-#, fuzzy
 msgid "Reset"
-msgstr "Grandecŝanĝi"
+msgstr "Restarigo"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:281
-#, fuzzy, c-format
+#, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
-"Vi petis foriviŝi tiun breton.<br><br>Ĉu vi certas ke vi volas foriviŝi ĝin ?"
+"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
-#, fuzzy
 msgid "Delete OK?"
-msgstr "Forviŝi Klavon"
+msgstr "Forviŝi Bone?"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:350
 msgid "Add New Profile"
@@ -5046,132 +5199,120 @@ msgid "Profiles"
 msgstr "Aspektoj"
 
 #: src/modules/conf_scale/e_int_config_scale.c:61
-#, fuzzy
 msgid "Scaling Settings"
-msgstr "Agordoj de Dialogoj"
+msgstr "Agordoj de skalado"
 
 #: src/modules/conf_scale/e_int_config_scale.c:140
 msgid "Scale with DPI"
-msgstr ""
+msgstr "Skali kun punkto cole (DPI)"
 
 #: src/modules/conf_scale/e_int_config_scale.c:144
-#, fuzzy
 msgid "Relative"
-msgstr "Plialtigi"
+msgstr "Relativa"
 
 #: src/modules/conf_scale/e_int_config_scale.c:145
 msgid "Base DPI to scale relative to"
-msgstr ""
+msgstr "Baza punkto cole (DPI) skalenda relative al"
 
 #: 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 punktoj cole (DPI)"
 
 #: src/modules/conf_scale/e_int_config_scale.c:151
 #, c-format
 msgid "Currently %i DPI"
-msgstr ""
+msgstr "Nune %i punktoj cole (DPI)"
 
 #: src/modules/conf_scale/e_int_config_scale.c:245
 msgid "Policy"
-msgstr ""
+msgstr "Strategio"
 
 #: src/modules/conf_scale/e_int_config_scale.c:248
-#, fuzzy
 msgid "Don't Scale"
-msgstr "Ne permesi"
+msgstr "Ne skali"
 
 #: src/modules/conf_scale/e_int_config_scale.c:252
 msgid "Scale relative to screen DPI"
-msgstr ""
+msgstr "Skali relative al ekranaj punktoj cole (DPI)"
 
 #: src/modules/conf_scale/e_int_config_scale.c:255
 #, c-format
 msgid "Base DPI (Currently %i DPI)"
-msgstr ""
+msgstr "Baza punktoj cole (DPI) (Nune %i DPI)"
 
 #: src/modules/conf_scale/e_int_config_scale.c:263
 msgid "Custom scaling factor"
-msgstr ""
+msgstr "Propra skala faktoro"
 
 #: 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 dosieroj"
+msgstr "%1.2f fojoj"
 
 #: src/modules/conf_scale/e_int_config_scale.c:272
-#, fuzzy
 msgid "Constraints"
-msgstr "Ujo"
+msgstr "Limigoj"
 
 #: src/modules/conf_scale/e_int_config_scale.c:273
-#, fuzzy
 msgid "Minimum"
-msgstr "Minimuma Grandeco"
+msgstr "Minimume"
 
 #: src/modules/conf_scale/e_int_config_scale.c:279
-#, fuzzy
 msgid "Maximum"
-msgstr "Maksimuma Grandeco"
+msgstr "Maksimume"
 
 #: src/modules/conf_scale/e_mod_main.c:35
-#, fuzzy
 msgid "Scaling"
-msgstr "Stako"
+msgstr "Skalado"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Agordoj de Ekrenkurteno"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 "Ebligi Ekrankurtenon XScreensaver"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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 "Horloĝo(j) de ekrankurteno"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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 "Daŭro ĝis XScreensaver ekas"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
 msgstr "Tempo ĝis XScreensaver alternas"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f sekundoj"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "Malplenado"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Preferata"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "Ne Preferata"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
-msgstr ""
+msgstr "Eventoj de ekspono"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Permesi"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "Ne permesi"
 
@@ -5184,10 +5325,9 @@ msgid "Configured Shelves"
 msgstr "Agorditaj Bretoj"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
-#, fuzzy
+#: src/modules/ibar/e_mod_config.c:114
 msgid "Setup"
-msgstr "Agordi Ŝovon kaj Demeton"
+msgstr "Agordi"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:277
 #, c-format
@@ -5216,13 +5356,12 @@ msgid "Theme Selector"
 msgstr "Etosa Elektilo"
 
 #: src/modules/conf_theme/e_int_config_theme.c:431
-#, fuzzy
 msgid " Import..."
-msgstr "Eluzi..."
+msgstr "Enporti..."
 
 #: src/modules/conf_theme/e_int_config_theme.c:435
 msgid " Online..."
-msgstr ""
+msgstr " Enrete..."
 
 #: src/modules/conf_theme/e_int_config_theme.c:1004
 msgid "Theme Categories"
@@ -5232,10 +5371,6 @@ msgstr "Etosaj Kategorioj"
 msgid "Assign"
 msgstr "Atribui"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "Forviŝi"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "Forviŝi ĉion"
@@ -5263,9 +5398,8 @@ msgstr ""
 "\"Enlightenment\" ne eblas importi etoson<br>kial okazis eraroj dum kopiado."
 
 #: src/modules/conf_theme/e_int_config_theme_web.c:127
-#, fuzzy
 msgid "Exchange themes"
-msgstr "Piktogramaj Etosoj"
+msgstr "Interŝanĝi etosojn"
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:44
 msgid "Transition Settings"
@@ -5310,7 +5444,7 @@ msgstr "Kolortransiro..."
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
 msgid "Online..."
-msgstr ""
+msgstr "Enrete..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
 msgid "Where to place the Wallpaper"
@@ -5377,9 +5511,8 @@ msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr "Pro ajn kialo, Enlightenment ne eblis krei transiron."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
-#, fuzzy
 msgid "Wallpaper settings..."
-msgstr "Tapetaj Agordoj"
+msgstr "Tapetaj agordoj.."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
 msgid "Fill and Stretch Options"
@@ -5456,9 +5589,8 @@ msgstr ""
 "validas?"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:122
-#, fuzzy
 msgid "Exchange wallpapers"
-msgstr "Tapeto de Etoso"
+msgstr "Interŝanĝi tapetojn"
 
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
@@ -5513,7 +5645,7 @@ msgstr "Lokigi mane per muso"
 #: 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 "Aŭtomate aperigi la labortablon de nova fenestro"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:203
 msgid "Window Move Geometry"
@@ -5530,11 +5662,11 @@ msgstr "Sekvi fenestron kiam ĝi moviĝas"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:214
 msgid "Window Resize Geometry"
-msgstr "FenestrGrandecŝanĝa Geometrio"
+msgstr "Geometrio de regrandigo de fenestroj"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:218
 msgid "Follow the window as it resizes"
-msgstr "Sekvi fenestron kiam ĝi grandecŝanĝas"
+msgstr "Sekvi fenestron kiam ĝi regrandiĝas"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:225
 msgid "Window Shading"
@@ -5546,7 +5678,7 @@ msgstr "Linia"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:238
 msgid "Smooth accelerate and decelerate"
-msgstr ""
+msgstr "Glata plirapidigo kaj malplirapidigo"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:242
 msgid "Accelerate"
@@ -5606,7 +5738,7 @@ msgstr "Montrila fokuso"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:189
 msgid "Sloppy focus"
-msgstr ""
+msgstr "Superbordiĝanta enfokusigo"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:193
 msgid "New Window Focus"
@@ -5634,7 +5766,7 @@ msgstr "Aliaj Agordoj"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:206
 msgid "Always pass on caught click events to programs"
-msgstr ""
+msgstr "Ĉiam ignori dum kapto de klako-eventoj al programoj"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:208
 msgid "A click on a window always raises it"
@@ -5654,7 +5786,7 @@ msgstr "Nuligas fokuson dum fenestra kaŝo aŭ fermo"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:216
 msgid "Slide pointer to a new focused window"
-msgstr ""
+msgstr "Ŝovi la kursoron en novan fokusigatan feneston"
 
 #: src/modules/conf_window_focus/e_mod_main.c:35
 #: src/modules/wizard/page_060.c:26
@@ -5663,9 +5795,8 @@ msgstr "Fenestra Fokuso"
 
 #: 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 "FenestrMoviĝa Geometrio"
+msgstr "Geometrio de fenestro"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:129
 msgid "Resistance"
@@ -5688,30 +5819,25 @@ msgid "Resistance to desktop gadgets:"
 msgstr "Rezisto al labortablaj vanaĵoj"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:160
-#, fuzzy
 msgid "Keyboard move and resize"
-msgstr "Klavaro kaj Muso"
+msgstr "Movigi kaj regrandigi per klavaro"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:161
-#, fuzzy
 msgid "Automatically accept changes after:"
-msgstr "Aŭtomate rulumi enhavojn"
+msgstr "Aŭtomate akcepti ŝanĝojn post:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:165
-#, fuzzy
 msgid "Move by:"
-msgstr "Movi"
+msgstr "Movi laŭ:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:169
-#, fuzzy
 msgid "Resize by:"
-msgstr "Grandecŝanĝi"
+msgstr "Regrandigi laŭ:"
 
 #: 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 "Grandega Poliso"
+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
@@ -5730,16 +5856,15 @@ msgstr "Plenigi disponeblan  spacon"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:138
 msgid "Maximize Policy"
-msgstr "Grandega Poliso"
+msgstr "Strategio de maksimumigo"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
-#, fuzzy
 msgid "Maximize Directions"
-msgstr "Maksimumigi Horizontale"
+msgstr "Maksimumigi direkcien"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
 msgid "Both"
-msgstr ""
+msgstr "Ambaŭ"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Allow window manipulation"
@@ -5747,13 +5872,12 @@ msgstr "Permesi fenestran manuzon"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
 msgid "Automatically move/resize windows on shelf autohide"
-msgstr ""
+msgstr "Aŭtomate movi/regrandigi dei fenestroj dum aŭtokaŝo de breto"
 
 #: 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 "Fenestro Volvado"
+msgstr "Stakado de fenestroj"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:140
@@ -5779,7 +5903,7 @@ msgstr "Altigi la fenestron"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:157
 msgid "Raise when starting to move or resize"
-msgstr "Altigi dum komenco de movado aŭ grandŝanĝo"
+msgstr "Altigi dum komenco de movado aŭ regrandigado"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:159
 msgid "Raise when clicking to focus"
@@ -5788,58 +5912,48 @@ 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_mod_main.c:17
-#, fuzzy
 msgid "Window Remembers"
-msgstr "Fenestra Memoro"
+msgstr "Fenestraj memoroj"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:95
-#, fuzzy
 msgid "Delete Remember(s)"
-msgstr "Agordi Memorojn"
+msgstr "Forigi memoro(j)n"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:105
-#, fuzzy
 msgid "Details"
-msgstr "Aprioraĵoj"
+msgstr "Detaloj"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:108
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:269
-#, fuzzy
 msgid "<No Name>"
-msgstr "Piktograma Nomo"
+msgstr "<Neniu nomo>"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:111
-#, fuzzy
 msgid "Class:"
-msgstr "Klaso"
+msgstr "Klaso:"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:113
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:271
-#, fuzzy
 msgid "<No Class>"
-msgstr "Klaso"
+msgstr "<Neniu klaso>"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:116
-#, fuzzy
 msgid "Title:"
-msgstr "Titolo"
+msgstr "Titolo:"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:118
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:273
-#, fuzzy
 msgid "<No Title>"
-msgstr "Titolo"
+msgstr "<Neniu titolo>"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:121
-#, fuzzy
 msgid "Role:"
-msgstr "Grado"
+msgstr "Rolo;"
 
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:123
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:275
-#, fuzzy
 msgid "<No Role>"
-msgstr "<Neniom>"
+msgstr "<Neniu rolo>"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:62
 msgid "Window List Settings"
@@ -5883,7 +5997,7 @@ msgstr "Malfonigi fenestron dum elektado"
 #: 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 "Ŝovi muson en la fenestron dum elektado"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:170
 #: src/modules/conf_winlist/e_int_config_winlist.c:248
@@ -5914,29 +6028,24 @@ msgid "Cpufreq"
 msgstr "Ĉeforgana Ofteco"
 
 #: src/modules/cpufreq/e_mod_main.c:182
-#, fuzzy
 msgid "Fast (4 ticks)"
-msgstr "Rapida (0.5 sek)"
+msgstr "Rapida (4 tempunuoj)"
 
 #: src/modules/cpufreq/e_mod_main.c:189
-#, fuzzy
 msgid "Medium (8 ticks)"
-msgstr "Meza (1 sek)"
+msgstr "Meza (8 tempunuoj)"
 
 #: src/modules/cpufreq/e_mod_main.c:196
-#, fuzzy
 msgid "Normal (32 ticks)"
-msgstr "Normala (2 sek)"
+msgstr "Normala (32 tempunuoj)"
 
 #: src/modules/cpufreq/e_mod_main.c:203
-#, fuzzy
 msgid "Slow (64 ticks)"
-msgstr "Malrapida (5 sek)"
+msgstr "Malrapida (64 tempunuoj)"
 
 #: src/modules/cpufreq/e_mod_main.c:210
-#, fuzzy
 msgid "Very Slow (256 ticks)"
-msgstr "Malrapidega (30 sek)"
+msgstr "Malrapidega (256 tempunuoj)"
 
 #: src/modules/cpufreq/e_mod_main.c:225
 msgid "Manual"
@@ -5956,16 +6065,15 @@ msgstr "Maksimuma Rapideco"
 
 #: src/modules/cpufreq/e_mod_main.c:244
 msgid "Restore CPU Power Policy"
-msgstr "Restarigi Agmetodon por ĉeforgana Potenco"
+msgstr "Restarigi strategion por ĉeforgana Potenco"
 
 #: src/modules/cpufreq/e_mod_main.c:252
 msgid "Powersaving policy"
-msgstr ""
+msgstr "Strategio de energiŝparado"
 
 #: src/modules/cpufreq/e_mod_main.c:280
-#, fuzzy
 msgid "Automatic powersaving"
-msgstr "Aŭtomata Ŝloso"
+msgstr "Aŭtomata energiŝparado"
 
 #: src/modules/cpufreq/e_mod_main.c:299
 #, c-format
@@ -5983,7 +6091,7 @@ msgstr "Tempo inter ĝisdatigoj"
 
 #: src/modules/cpufreq/e_mod_main.c:324
 msgid "Set CPU Power Policy"
-msgstr "Difini Agmetodon por ĉeforgana Potenco"
+msgstr "Difini strategion por ĉeforgana Potenco"
 
 #: src/modules/cpufreq/e_mod_main.c:331
 msgid "Set CPU Speed"
@@ -5991,7 +6099,7 @@ msgstr "Difini Rapidecon de ĉeforgano"
 
 #: src/modules/cpufreq/e_mod_main.c:337
 msgid "Powersaving behavior"
-msgstr ""
+msgstr "Konduto de energiŝparado"
 
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid ""
@@ -6007,6 +6115,9 @@ msgid ""
 "missing<br>Kernel modules or features, or your CPU<br>simply does not "
 "support this feature."
 msgstr ""
+"Via kerno neniel eltenas agordon de<br>ofteco de ĉeforgana funkcio. Eble vi "
+"mistrafis<br>modulojn de la kerno aŭ eblecoj, aŭ via ĉeforgano<br>simple ne "
+"eltenas tiun eblecon."
 
 #: src/modules/cpufreq/e_mod_main.c:432
 msgid ""
@@ -6017,9 +6128,8 @@ msgstr ""
 "modulo \"setfreq\"."
 
 #: src/modules/dropshadow/e_mod_config.c:40
-#, fuzzy
 msgid "Dropshadow Settings"
-msgstr "Agordoj de Dialogoj"
+msgstr "Agordoj de ombro"
 
 #: src/modules/dropshadow/e_mod_config.c:108
 msgid "Quality"
@@ -6107,37 +6217,25 @@ msgstr "Helega"
 
 #: src/modules/dropshadow/e_mod_main.c:90
 msgid "Dropshadow"
-msgstr ""
+msgstr "Ĵetita ombro"
 
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 msgid "Run Command Dialog"
 msgstr "Lanĉi Dialogon de Komandoj"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "Lanĉa Eraro"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
-msgstr ""
+msgstr "Hejmo"
 
-#: src/modules/fileman/e_mod_main.c:332
-#, fuzzy
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
-msgstr "Menuo de Preferaĵoj"
+msgstr "Preferaĵoj"
 
-#: src/modules/fileman/e_mod_main.c:344
-#, fuzzy
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
-msgstr "Relanĉi"
+msgstr "Radiko"
 
-#: src/modules/fileman/e_mod_main.c:441
-#, fuzzy
+#: 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 "
@@ -6156,7 +6254,7 @@ msgstr ""
 "aktuale laŭ via<br>ŝato. Pardonon pro la momenta problemeto en via agordo."
 "<br>"
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -6172,180 +6270,170 @@ msgstr ""
 "kaj<br>kiel antaŭzorgo via agordo estis restaŭrita per defaŭltaĵoj."
 "<br>Bonvolu pardoni por la ĝeno.<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
-#, fuzzy
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
-msgstr "Agordoj de \"Fileman\""
+msgstr "Agordoj de \"Fileman\" ĝisdatigitaj"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr "Agordoj de \"Fileman\""
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Piktograma Grandeco"
 
-#: src/modules/fileman/e_mod_config.c:224
-#, fuzzy
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
-msgstr "Vidiga Modo"
+msgstr "Vidigi"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr "Malfermi Dosierujojn samloke"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "Unue Ordigi Dosierujojn"
 
-#: src/modules/fileman/e_mod_config.c:234
-#, fuzzy
+#: src/modules/fileman/e_mod_config.c:243
 msgid "Case Sensitive"
-msgstr "Baza Grandeco"
+msgstr "Usklecodistinga"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "Uzi Simplan Alklakon"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
-msgstr ""
+msgstr "Uzi alternativajn modifilojn de elekto"
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr "Montri Piktograman Finaĵon"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "Montru Plenan Vojon"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr "Vidigi Labortablajn Piktogramojn"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr "Vidigi Ilobreton"
 
-#: src/modules/fileman/e_mod_config.c:257
-#, fuzzy
-msgid "Show HAL icons on desktop"
-msgstr "Vidigi en ĉiuj Labortabloj"
-
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
+msgstr "Konduto"
+
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr "Vidigi HAL-piktogramojn sur labortablo"
+
+#: 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:1187
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr "Iri al Patra Dosierujo"
 
-#: src/modules/fileman/e_fwin.c:1249
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1524
 msgid "Other application..."
-msgstr "Aldoni Aplikaĵon"
+msgstr "Alia aplikaĵo..."
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Malfermi"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Malfermi per..."
 
-#: src/modules/fileman/e_fwin.c:1628
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1892
 msgid "Known Applications"
-msgstr "Aplikaĵoj"
+msgstr "Konataj Aplikaĵoj"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Specialaj Aplikaĵoj"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr "Propran komandon"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:53
-#, fuzzy, c-format
+#, c-format
 msgid "%d operations"
-msgstr "Kaŝi daŭron"
+msgstr "%d agoj"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:55
-#, fuzzy, c-format
+#, c-format
 msgid "idle"
-msgstr "Kaheligi"
+msgstr "senokupa"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:139
 msgid "EFM Operation Info"
-msgstr ""
+msgstr "Aktualaj operacioj en EFM"
 
 #: src/modules/gadman/e_mod_config.c:58
-#, fuzzy
 msgid "Gadgets Manager"
-msgstr "Dosiera administrilo"
+msgstr "Administrilo de akcesoraĵoj"
 
 #: src/modules/gadman/e_mod_config.c:147
-#, fuzzy
 msgid "Background Mode"
-msgstr "Tapetoj"
+msgstr "Reĝimo de fono"
 
 #: src/modules/gadman/e_mod_config.c:152 src/modules/gadman/e_mod_config.c:184
-#, fuzzy
 msgid "Custom Image"
-msgstr "Propran komandon"
+msgstr "Propra bildo"
 
 #: src/modules/gadman/e_mod_config.c:156 src/modules/gadman/e_mod_config.c:177
-#, fuzzy
 msgid "Custom Color"
-msgstr "Propran komandon"
+msgstr "Propra koloro"
 
 #: src/modules/gadman/e_mod_config.c:160
-#, fuzzy
 msgid "Transparent"
-msgstr "Nedauxra Por"
+msgstr "Travidebla"
 
 #: src/modules/gadman/e_mod_config.c:167
-#, fuzzy
 msgid "Animations"
-msgstr "Spegula Animaĵo"
+msgstr "Animaĵoj"
 
 #: src/modules/gadman/e_mod_config.c:168
-#, fuzzy
 msgid "Background"
-msgstr "Tapetoj"
+msgstr "Fono"
 
 #: 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 "Fenestraĵoj"
+msgstr "Akcesoraĵoj"
 
 #: src/modules/gadman/e_mod_gadman.c:677
-#, fuzzy
 msgid "Free"
-msgstr "Kadro"
+msgstr "Libera"
 
 #: src/modules/gadman/e_mod_gadman.c:709
-#, fuzzy
 msgid "Always on desktop"
-msgstr "Ĉiam Supre"
+msgstr "Ĉiam surlabortable"
 
 #: src/modules/gadman/e_mod_gadman.c:719
 msgid "On top pressing"
-msgstr ""
+msgstr "Dum klakado supre"
 
 #: src/modules/gadman/e_mod_gadman.c:748
-#, fuzzy
 msgid "Add other gadgets"
-msgstr "Aldunu Vanaĵon"
+msgstr "Aldonu aliajn akcesoraĵojn"
 
 #: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
-#, fuzzy
 msgid "Show/hide gadgets"
-msgstr "Ne kaŝi Vanaĵojn"
+msgstr "Vidigi/kaŝi akcesoraĵojn"
 
 #: 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
@@ -6364,40 +6452,39 @@ msgstr "Antaŭa Fenestro"
 msgid "Select a window"
 msgstr "Elekti fenestron"
 
-#: src/modules/ibar/e_mod_config.c:55
-#, fuzzy
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
-msgstr "Ĉirkaŭflui Agordoj"
+msgstr "Agordoj de IBar"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Fonto de Elektita Listelo"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Piktogramaj Etikedoj"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Montri Piktograman Etikedon"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "Vidigi \"App\"-Nomon"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "Vidigi \"App\"-Komenton"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "Vidigi \"App\"-ĝeneralon"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "Krei novan ibar-fonton"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "Enigi nomon por tiu nova fonto:"
 
@@ -6414,36 +6501,33 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Ĉu vi certas, ke vi deziras forviŝi tiun bar-fonton ?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Ŝanĝi Piktogramajn Ecojn"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Forviŝi Piktogramon"
 
-#: src/modules/ibar/e_mod_main.c:809
-#, fuzzy
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
-msgstr "Aldoni Aplikaĵon"
+msgstr "Aldoni piktogramon"
 
-#: src/modules/ibar/e_mod_main.c:816
-#, fuzzy
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
-msgstr "Krei Piktogramon"
+msgstr "Krei novan piktogramon"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Aldoni Aplikaĵon"
 
 #: src/modules/ibox/e_mod_config.c:52
-#, fuzzy
 msgid "IBox Settings"
-msgstr "Agordoj de EnsalutadoSkatolo"
+msgstr "Agordoj de IBar"
 
 #: src/modules/ibox/e_mod_config.c:105
 msgid "Display Name"
@@ -6462,9 +6546,8 @@ msgid "Display Icon Name"
 msgstr "Vidigi Piktograman Nomon"
 
 #: src/modules/ibox/e_mod_config.c:125
-#, fuzzy
 msgid "Display Border Caption"
-msgstr "Vidiga Informaĵo"
+msgstr "Etikedo de ekrana rando"
 
 #: src/modules/ibox/e_mod_config.c:155
 msgid "Show windows from all screens"
@@ -6490,164 +6573,151 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr "Paĝilaj Agordoj"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 msgid "Flip desktop on mouse wheel"
 msgstr "Labortabla Ŝango dum musa radado"
 
-#: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:164
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 msgid "Show desktop names"
-msgstr "Vidigi Labortablajn Piktogramojn"
+msgstr "Vidigi labortablajn nomojn"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
-msgstr "Paĝilaj Ŝprucaj Agordoj"
+msgstr "Agordoj de ŝprucfenestro"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr "Vidigi ŝprucfenestron dum ŝanĝo de labortablo"
 
-#: src/modules/pager/e_mod_config.c:133
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
-msgstr "Montri ŝprucfenestron dum urĝa fenestro"
+msgstr "Montri ŝprucfenestron por urĝaj fenestroj"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
-msgstr ""
+msgstr "Elekti kaj ŝovi butonon"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "Klaki por difini"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
-msgstr ""
+msgstr "Butono ŝovi kaj demeti"
 
-#: src/modules/pager/e_mod_config.c:182
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
-msgstr "Virtuala Labortablo"
+msgstr "Demeti la tutan labortablon"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
-msgstr ""
+msgstr "Alto de la ŝprucfenestro de klavo-agadoj"
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f rastrumeroj"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "Rezistado al ŝovoj"
 
-#: src/modules/pager/e_mod_config.c:208
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
-msgstr "Ŝpruca Rapideco"
+msgstr "Alteco de la tabulpaĝilo-ŝprucfenestro"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
-msgstr "Ŝpruca Rapideco"
+msgstr "Rapideco de ŝprucfenestro"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekundoj"
 
-#: src/modules/pager/e_mod_config.c:230
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
-msgstr "Agordoj de Fenestrolisto"
+msgstr "Agordoj de urĝaj fenestroj"
 
-#: src/modules/pager/e_mod_config.c:231
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
-msgstr "Montri ŝprucfenestron dum urĝa fenestro"
+msgstr "Vidigi ŝprucfenestron dum urĝa fenestro"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
-msgstr ""
+msgstr "Ŝprucfenestro por urĝa fenestro  fiksiĝas en la ekrano"
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
-msgstr ""
+msgstr "Kapto de la butono de la tabulpaĝilo"
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 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:344
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
-msgstr "Ago"
+msgstr "Atentu"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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 ""
+"Vi ne povas uzi la dekstran butonon de la muso en la<br> breto por tio ĉar "
+"ĝ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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Butono %i"
 
-#: src/modules/pager/e_mod_main.c:2808
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
-msgstr "Paĝilaj Ŝprucaj Agordoj"
+msgstr "Vidigi la ŝprucfenestron de tabulpaĝilo"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
-msgstr "Labortabla Ŝango al dekstro"
+msgstr "Ŝprucfenestr dekstren de labortablo"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
-msgstr "Labortabla Ŝango al maldekstro"
+msgstr "Ŝprucfenestr maldekstren de labortablo"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
-msgstr "Labortabla Ŝango al supro"
+msgstr "Ŝprucfenestr supren de labortablo"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
-msgstr "Labortabla Ŝango al subo"
+msgstr "Ŝprucfenestr malsupren de labortablo"
 
 #: src/modules/start/e_mod_main.c:110
 msgid "Start"
 msgstr "Startigo"
 
 #: src/modules/syscon/e_mod_main.c:34
-#, fuzzy
 msgid "System Control"
-msgstr "Agordi Sistemajn Kontrolojn"
+msgstr "Sistema Kontrolo"
 
 #: src/modules/syscon/e_mod_main.c:55
-#, fuzzy
 msgid "System Controls"
-msgstr "Agordi Sistemajn Kontrolojn"
+msgstr "Sistemaj Kontroloj"
 
 #: src/modules/temperature/e_mod_config.c:63
-#, fuzzy
 msgid "Temperature Settings"
-msgstr "Ĝeneralaj Agordoj"
+msgstr "Agordoj de temperaturo"
 
 #: src/modules/temperature/e_mod_config.c:248
 #: src/modules/temperature/e_mod_config.c:352
@@ -6762,19 +6832,16 @@ msgid "Next"
 msgstr "Sekva"
 
 #: src/modules/wizard/e_wizard.c:281
-#, fuzzy
 msgid "Welcome to Enlightenment"
-msgstr "Bonvenon al Enlightenment 東京"
+msgstr "Bonvenon en Enlightenment"
 
 #: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
-#, fuzzy
 msgid "Select one"
-msgstr "Elekti Piktogramon"
+msgstr "Elekti iun"
 
 #: src/modules/wizard/page_020.c:55
-#, fuzzy
 msgid "Profile"
-msgstr "Aspektoj"
+msgstr "Profilo"
 
 #: src/modules/wizard/page_030.c:89
 msgid ""
@@ -6782,209 +6849,196 @@ msgid ""
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
 "on<br>how to get your<br>application menus<br>working."
 msgstr ""
+"Neniu dosiero de menu estis<br> trovita en via sistemo.<br> Bonvolu legi la "
+"dokumentaron<br> ĉe www.enlightenment.org<br> por pliaj detaloj pri kiel "
+"funkciigi<br> viajn menuoj de apliakoj."
 
 #: src/modules/wizard/page_030.c:107
-#, fuzzy
 msgid "Select application menu"
-msgstr "Ordigi Aplikaĵojn"
+msgstr "Elekti menuon de aplikaĵoj"
 
 #: src/modules/wizard/page_030.c:124
-#, fuzzy
 msgid "System Default"
-msgstr "Uzi Defaŭltaĵon"
+msgstr "Sistema apriora valoro"
 
 #: src/modules/wizard/page_040.c:25
-#, fuzzy
 msgid "Launcher Bar"
-msgstr "Aldoni tiun Aplikaĵon en la Lanĉilon"
+msgstr "Lanĉo-breto"
 
 #: src/modules/wizard/page_040.c:27
-#, fuzzy
 msgid "Select applications"
-msgstr "Ordigi Aplikaĵojn"
+msgstr "Elekti aplikaĵojn"
 
 #: src/modules/wizard/page_050.c:28
-#, fuzzy
 msgid "Desktop Files"
-msgstr "Labortabla dosiero"
+msgstr "Labortablaj dosieroj"
 
 #: src/modules/wizard/page_050.c:32
-#, fuzzy
 msgid "No icons on desktop"
-msgstr "Vidigi en ĉiuj Labortabloj"
+msgstr "Neniu piktogramo sur labortablo"
 
 #: src/modules/wizard/page_050.c:35
-#, fuzzy
 msgid "Enable desktop icons"
-msgstr "Vidigi Labortablajn Piktogramojn"
+msgstr "Ebligi la labortablajn piktogramojn"
 
 #: src/modules/wizard/page_060.c:28
-#, fuzzy
 msgid "Focus mode"
-msgstr "Fokuso"
+msgstr "Reĝimo de fokuso"
 
 #: src/modules/wizard/page_060.c:32
-#, fuzzy
 msgid "Click to focus windows"
-msgstr "Klaki por fokusigi"
+msgstr "Klaki por fokusigi fenestrojn"
 
 #: src/modules/wizard/page_060.c:35
 msgid "Mouse over focuses windows"
-msgstr ""
+msgstr "Supra muso fokusigas fenestrojn"
 
 #: src/modules/wizard/page_070.c:200
-#, fuzzy
 msgid "Select Icons to Add"
-msgstr "Elekti Piktogramon"
+msgstr "Elektu piktogramojn aldonendajn"
 
 #: src/modules/wizard/page_080.c:62
-#, fuzzy
 msgid "Quick Launch"
-msgstr "Lanĉi"
+msgstr "Rapida lanĉo"
 
 #: src/modules/wizard/page_080.c:64
-#, fuzzy
 msgid "Select Applications"
-msgstr "Ordigi Aplikaĵojn"
+msgstr "Elekti aplikaĵojn"
 
 #: src/modules/mixer/app_mixer.c:165
-#, fuzzy
 msgid "Capture"
-msgstr "Ĉeforgana Ofteco"
+msgstr "Kapti"
 
 #: src/modules/mixer/app_mixer.c:167
 msgid "Playback"
-msgstr ""
+msgstr "Reproduktado"
 
 #: src/modules/mixer/app_mixer.c:289
-#, fuzzy
 msgid "Output"
-msgstr "Eligitaj Datumoj"
+msgstr "Eligo"
 
 #: src/modules/mixer/app_mixer.c:363
-#, fuzzy
 msgid "Cards"
-msgstr "Klaso"
+msgstr "Kartoj"
 
 #: src/modules/mixer/app_mixer.c:378 src/modules/mixer/conf_gadget.c:280
-#, fuzzy
 msgid "Channels"
-msgstr "Rezigni"
+msgstr "Kanaloj"
 
 #: src/modules/mixer/app_mixer.c:390
-#, fuzzy
 msgid "Card:"
-msgstr "Forviŝi"
+msgstr "Karto:"
 
 #: src/modules/mixer/app_mixer.c:394
-#, fuzzy
 msgid "Channel:"
-msgstr "Rezigni"
+msgstr "Kanalo:"
 
 #: src/modules/mixer/app_mixer.c:398
-#, fuzzy
 msgid "Type:"
-msgstr "Dosiera Typo:"
+msgstr "Tipo:"
 
 #: src/modules/mixer/app_mixer.c:402
 msgid "Left:"
-msgstr ""
+msgstr "&Maldekstre:"
 
 #: src/modules/mixer/app_mixer.c:407
-#, fuzzy
 msgid "Right:"
-msgstr "Hela"
+msgstr "Dekstre:"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
-#, fuzzy
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
-msgstr "Menua Elemento"
+msgstr "Muti"
 
 #: src/modules/mixer/app_mixer.c:415 src/modules/mixer/conf_gadget.c:196
-#, fuzzy
 msgid "Lock Sliders"
-msgstr "ŝovilo"
+msgstr "Ŝlosilo de rulumskaloj"
 
 #: src/modules/mixer/app_mixer.c:419
-#, fuzzy
 msgid "Edit"
-msgstr "Eliri"
+msgstr "Redakti"
 
 #: src/modules/mixer/conf_gadget.c:202
 msgid "Show both sliders when locked"
-msgstr ""
+msgstr "Vidigi ambaŭajn ŝovilojn kiam ŝlosita"
 
 #: src/modules/mixer/conf_gadget.c:322
 msgid "Sound Cards"
-msgstr ""
+msgstr "Sonkartoj"
 
 #: src/modules/mixer/conf_gadget.c:377
-#, fuzzy
 msgid "Mixer Settings"
-msgstr "Grandecaj Agordoj"
+msgstr "Agordoj de sonmiksilo"
 
 #: src/modules/mixer/conf_module.c:98
 msgid "Mixer to use for global actions:"
-msgstr ""
+msgstr "Sonmiksilo uzenda por ĝeneralaj agoj:"
 
 #: src/modules/mixer/conf_module.c:152
-#, fuzzy
 msgid "Launch mixer..."
-msgstr "Aldoni tiun Aplikaĵon en la Lanĉilon"
+msgstr "Startigi miksilon..."
 
 #: src/modules/mixer/conf_module.c:187
-#, fuzzy
 msgid "Mixer Module Settings"
-msgstr "Modulaj Agordoj"
+msgstr "Agordoj de la modulo Sonmiksilo"
 
 #: src/modules/mixer/e_mod_main.c:123
-#, fuzzy
 msgid "Mixer Settings Updated"
-msgstr "Agordo de Fileman Ĝisdatigita"
+msgstr "Agordo de la modulo Sonmiksilo ĝisdatigita"
 
-#: src/modules/mixer/e_mod_main.c:613
-#, fuzzy
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
-msgstr "Agordi Sistemajn Kontrolojn"
+msgstr "Kontroloj"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
 msgstr ""
+"Agordaj datumoj de la modulo sonmiksilo ŝanĝis.<br>Via malnova agordo estis "
+"anstataŭigita de defaŭltoj.<br>Bonvolu pardoni por la ĝeno."
 
 #: src/modules/connman/e_mod_main.c:213
-#, fuzzy
 msgid "Connection Manager"
-msgstr "Fenestradministrilo"
+msgstr "Kontekto-administrilo"
 
 #: src/modules/connman/e_mod_main.c:730
-#, fuzzy
 msgid "Network Connection Settings"
-msgstr "Elektaj Agordoj"
+msgstr "Agordoj de retkonekto"
 
 #: src/modules/connman/e_mod_main.c:736
-#, fuzzy
 msgid "Network Device"
-msgstr "Demetebla Aparato"
+msgstr "Aparato de reto"
 
 #: src/modules/connman/e_mod_main.c:741
-#, fuzzy
 msgid "Wifi"
-msgstr "Ene de"
+msgstr "Sendrata reto"
 
 #: src/modules/connman/e_mod_main.c:744
 msgid "LAN"
-msgstr ""
+msgstr "Loka reto"
 
 #: src/modules/connman/e_mod_main.c:747
-#, fuzzy
 msgid "Specific Device"
-msgstr "Specialaj Aplikaĵoj"
+msgstr "Speciala aparato"
 
 #: src/modules/connman/e_mod_main.c:768
 msgid "Networks"
-msgstr ""
+msgstr "Retoj"
+
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr "Alia taskopleto ekzistas"
+
+#: src/modules/systray/e_mod_main.c:872
+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:1070
+msgid "Systray"
+msgstr "Taskopleto"
+
+#~ msgid "Mount of device failed"
+#~ msgstr "Surmeto de aparato malsukcesis"
 
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Konfiguri Virtualajn Labortablojn"
diff --git a/po/es.gmo b/po/es.gmo
index 451c5dc..5f102e5 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 993c5f7..9420b8d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2009-04-11 18:00+0000\n"
 "Last-Translator: DiegoJ <diegojromerolopez at gmail.com>\n"
 "Language-Team: Spanish <>\n"
@@ -21,20 +21,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Acerca de Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -80,386 +80,388 @@ 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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Sí"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "No"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "¿Está seguro de que quiere salir?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "¿Está seguro de que desea terminar la sesión?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "¿Está seguro de que quiere apagar?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "¿Está seguro de que quiere reiniciar?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 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:2047
+#: src/bin/e_actions.c:2061
 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:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "¿Está seguro de que quiere hibernar?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 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:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Ventana: Acciones"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Mover"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menú"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Menú de ventana"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Levantar"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Bajar"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Terminar"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Ventana: Estado"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Activar/Desactivar modo pegajoso"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Activar/Desactivar modo iconificado"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Activar/Desactivar modo a pantalla completa"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Maximizar verticalmente"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Maximizar horizontalmente"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Maximizar a pantalla completa"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Modo de maximizado \"inteligente\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Modo de maximizado \"expandido\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Modo de maximizado \"llenado\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Activar/Desactivar modo de sombra superior"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Activar/Desactivar modo de sombra inferior"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "Activar/Desactivar modo de sombra izquierda"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Activar/Desactivar modo de sombra derecha"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Activar/Desactivar modo de sombra"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Activar/Desactivar estado sin bordes"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "Activar/Desactivar estado fijo"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Voltear Escritorio al lado Izquierdo"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Voltear Escritorio al lado Derecho"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Voltear Escritorio para Arriba"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Voltear escritorio hacia abajo"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Voltear el escritorio por..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Mostrar escritorio"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
 msgstr ""
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Voltear el escritorio a..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Voltear el escritorio linealmente..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Cambiar al escritorio 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Cambiar al escritorio 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Cambiar al escritorio 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Cambiar al escritorio 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Cambiar al escritorio 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Cambiar al escritorio 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Cambiar al escritorio 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Cambiar al escritorio 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Cambiar al escritorio 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Cambiar al escritorio 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Cambiar al escritorio 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Cambiar al escritorio 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Cambiar al escritorio..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Voltear escritorio Izquierda (todas las pantallas)"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Voltear escritorio derecha (todas las pantallas)"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Voltear escritorio arriba (todas las pantallas)"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Voltear escritorio abajo (todas las pantallas)"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Voltear escritorio por... (todas las pantallas)"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Voltear escritorio a... (todas las pantallas)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Voltear escritorio linealmente... (todas las pantallas)"
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
 msgstr "Girar el escritorio en dirección..."
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Cambiar al escritorio 0 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Cambiar al escritorio 1 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Cambiar al escritorio 2 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Cambiar al escritorio 3 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Cambiar al escritorio 4 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Cambiar al escritorio 5 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Cambiar al escritorio 6 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Cambiar al escritorio 7 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Cambiar al escritorio 8 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Cambiar al escritorio 9 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Cambiar al escritorio 10 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Cambiar al escritorio 11 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Cambiar al escritorio... (todas las pantallas)"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -469,102 +471,117 @@ msgstr "Cambiar al escritorio... (todas las pantallas)"
 msgid "Screen"
 msgstr "Pantalla"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Enviar ratón a la pantalla 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Enviar ratón a la pantalla 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Enviar ratón a la pantalla..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Enviar ratón 1 pantalla adelante"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Enviar ratón 1 pantalla atrás"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Enviar ratón adelante/atrás pantallas..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Ventana: moviendo"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "Al escritorio siguiente"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Al escritorio anterior"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "Por escritorio #..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Al escritorio..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Mostrar menú principal"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Mostrar menú de favoritos"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Mostrar menú con todas las aplicaciones"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Mostrar menú de clientes"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Mostrar menú..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Ejecutar"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Aplicación"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Salir"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
 msgstr "Salir ahora"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Módulo %s de Enlightenment"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Activar/Desactivar modo a pantalla completa"
+
+#: src/bin/e_actions.c:2813
+#, fuzzy
+msgid "Offline Mode Toggle"
+msgstr "Activar/Desactivar modo de sombra"
+
+#: 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -577,55 +594,55 @@ msgstr "Salir ahora"
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Cerrar sesión"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr "Apagar ahora"
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr "Apagar"
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Hibernar"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 msgid "Lock"
 msgstr "Bloquear"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Limpiar ventanas"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr "Acciones : Genéricas"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
 msgstr "Acción retardada"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Poner como fondo de escritorio"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "Escaneo de archivos de escritorio completado"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "Escanear archivos del escritorio"
 
@@ -633,13 +650,14 @@ msgstr "Escanear archivos del escritorio"
 msgid "Color Selector"
 msgstr "Selector de color"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -654,7 +672,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -666,7 +684,7 @@ msgstr "Aceptar"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 +704,7 @@ msgstr ""
 "reconfigurar las cosas a su<br>gusto. Disculpe por las dificultades creadas "
 "en su configuración.<br>"
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -701,11 +719,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:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
 msgstr "Opciones mejoradas"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -717,7 +735,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:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -733,7 +751,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:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -746,7 +764,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:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -760,7 +778,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:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -772,11 +790,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:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemas de escritura en las preferencias de Elightenment"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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,7 +820,7 @@ msgid "Modules"
 msgstr "Módulos"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Complementos"
 
@@ -811,22 +829,22 @@ msgstr "Complementos"
 msgid "Container %d"
 msgstr "Contenedor %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Error - no hay soporte para PAM"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 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:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Falló el bloqueo"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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 +852,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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Introduzca su contraseña para desbloquear"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Error del sistema de autentificación"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -853,6 +871,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
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Propiedades de la ventana incompletas"
@@ -953,23 +990,23 @@ msgstr "Elegir un icono"
 msgid "Select an Executable"
 msgstr "Elegir un ejecutable"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Pegar"
 
@@ -1003,262 +1040,316 @@ msgstr ""
 "Enlightenment no pudo ejecutar la aplicación:<br><br>%s<br><br>La aplicación "
 "falló al iniciarse."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Error de ejecución de la aplicación"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s dejó de funcionar inesperadamente."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, 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:442
+#: src/bin/e_exec.c:443
 #, 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:444
+#: src/bin/e_exec.c:445
 #, 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:448
+#: src/bin/e_exec.c:449
 #, 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:451
+#: src/bin/e_exec.c:452
 #, 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:454
+#: src/bin/e_exec.c:455
 #, 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:457
+#: src/bin/e_exec.c:458
 #, 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:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s fue interrumpido por una tubería rota."
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, 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:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s fue interrumpido por un error de Bus."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, 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:525
+#: src/bin/e_exec.c:528
 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:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Informe de errores"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "No hubo mensaje de error"
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Guardar el mensaje"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, 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:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Información de error"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Información de señal de error"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Información de salida"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "No hubo salida"
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr "Direccion inexistente"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s no existe."
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Error de montado"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Error de montado"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Error"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i archivos"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
 msgstr "Enlace"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr "Abortar"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
 msgstr "Heredar configuración del padre"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Modo de vista"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Actualizar vista"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Mostrar archivos ocultos"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "Recordar orden"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Ordenar ahora"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nuevo directorio"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Silenciar"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
 msgstr "Usar por defecto"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Iconos de malla"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Iconos personalizados"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Tamaño de icono (%d)"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Poner como fondo de escritorio"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "Contenidos del contenedor"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Limpiar"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Crear un nuevo directorio"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Nombre del nuevo directorio:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renombrar %s a:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Renombrar archivo"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr "Reintentar"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Error"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr "No a todos"
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr "Sí a todos"
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "Iniciando"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "¿Está seguro de que quiere eliminar<br><hilight>%s</hilight>?"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr "Ignorar éste"
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr "Ignorar todos"
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, 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:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Confirmar eliminación"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, 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:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1319,8 +1410,8 @@ msgid "Preview"
 msgstr "Previsualizar"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -1329,7 +1420,7 @@ msgid "Thumbnail"
 msgstr "Miniatura"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -1345,70 +1436,70 @@ msgstr "Información del enlace"
 msgid "Select an Image"
 msgstr "Elija una imagen"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volumen desconocido"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "Dispositivo extraíble"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Plano"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Recorte"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Desplazar el contenido automáticamente"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Puede cambiar de tamaño"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Comenzar a mover/cambiar tamaño de este gadget"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Eliminar este gadget"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "Parar mover/cambiar tamaño del dispositivo"
 
@@ -1460,8 +1551,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1469,7 +1560,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Apilamiento"
 
@@ -1647,12 +1738,12 @@ msgstr "Pantalla completa"
 msgid "Window List"
 msgstr "Lista de ventanas"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Paginador"
 
@@ -1930,11 +2021,11 @@ msgstr "Siempre enfocar 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr "Preferencias"
 
@@ -1968,8 +2059,8 @@ msgstr "Módulos cargados"
 msgid "Unload Module"
 msgstr "Descargar módulo"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1999,12 +2090,12 @@ msgstr "Gadgets seleccionados"
 msgid "Remove Gadget"
 msgstr "Eliminar gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 msgid "Toolbar Settings"
 msgstr "Preferencias de barra de herramientas"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Diseño"
 
@@ -2090,122 +2181,122 @@ msgstr "(Sin ventanas)"
 msgid "No name!!"
 msgstr "¡Sin nombre!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(Sin contenedores)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Contenedor #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Agregar un contenedor"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Eliminar un contenedor"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Opciones del contenedor"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Diminuto"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Medio"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grande"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Enorme"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Contenidos del contenedor"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Sobre todo"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Debajo de las ventanas"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Debajo de todo"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "Permitir a las ventanas superponerse al contenedor"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Ajustar al tamaño del contenido"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f píxeles"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Estilos"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "Ocultar automáticamente"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "Ocultar el contenedor automáticamente"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "Mostrar cuando el ratón esté dentro"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "Mostrar al apretar el botón del ratón"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "Tiempo para ocultar"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f segundos"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "Ocultar duración"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "Mostrar en todos los escritorios"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "Mostrar en escritorios específicos"
 
@@ -2599,8 +2690,9 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment no puede iniciar su sistema de dnd"
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
-msgstr ""
+#, fuzzy
+msgid "Setup Grab Input Handling"
+msgstr "Preparando el capturador de entradas"
 
 #: src/bin/e_main.c:872
 msgid "Enlightenment cannot set up its input grab handling system."
@@ -2793,30 +2885,37 @@ msgstr "Módulo %s de Enlightenment"
 msgid "Would you like to unload this module?<br>"
 msgstr "¿Quiere deshabilitar este módulo?"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 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:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 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:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 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:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Contenidos del contenedor"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Borrar el contenedor"
 
@@ -2971,7 +3070,7 @@ msgstr "Sobre el tema"
 msgid "Set As Theme"
 msgstr "Elegir como tema"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Contenidos de la barra de herramientas"
@@ -2991,67 +3090,67 @@ msgstr ""
 "ventanas<br>hayan sido cerradas o se les haya quitado el bloqueo de ciclo de "
 "vida.<br>"
 
-#: src/bin/e_utils.c:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "En el futuro"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "En el último minuto"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "hace %li años"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "hace %li meses"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "hace %li semanas"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "hace %li días"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "hace %li horas"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "hace %li minutos"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3063,7 +3162,7 @@ msgstr "Desconocido"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Agregar"
 
@@ -3086,7 +3185,7 @@ msgid "Add to Favorites"
 msgstr "Agregar a favoritos"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3200,6 +3299,7 @@ msgid "Internal"
 msgstr "Interna"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
@@ -3211,24 +3311,24 @@ msgstr "Hardware"
 msgid "Battery"
 msgstr "Batería"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr "¡Bateria baja!"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr "Se recomienda corriente directa."
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr "N/D"
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr "Medidor de batería"
 
@@ -3237,10 +3337,25 @@ msgid "Clock"
 msgstr "Reloj"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
 msgstr "Panel de opciones"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Reiniciando"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "Tiempo para apagar"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Módulos"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3263,7 +3378,7 @@ msgid "Restart Applications"
 msgstr "Reiniciar aplicaciones"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "Todas las aplicaciones"
 
@@ -3620,41 +3735,54 @@ msgstr "Elegir"
 msgid "Desk"
 msgstr "Escritorio"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "Opciones de bloqueo de pantalla"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Bloqueo automático"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 msgid "Lock when Enlightenment starts"
 msgstr "Bloquear cuando arranca Enlightment"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
 msgstr "Bloquear cuando se activa el salvapantallas de X"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+msgid "Time after screensaver activated"
+msgstr "Tiempo hasta que alterne el salvapantallas de X"
+
+#: 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 segundos"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
 msgid "Lock when idle time exceeded"
 msgstr "Bloquear cuando se excede el tiempo de espera"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:184
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
 msgid "Idle time to exceed"
 msgstr "Tiempo de espera para exceder"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 minutos"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3665,27 +3793,27 @@ msgstr "%1.0f minutos"
 msgid "Personal"
 msgstr "Personal"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Opciones de caja de ingreso"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
 msgstr "Mostrar en todas las zonas de la pantalla"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr "Mostrar en la zona de la pantalla actual"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
 msgstr "Mostrar en la zona de la pantalla #:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3694,29 +3822,49 @@ msgstr "Mostrar en la zona de la pantalla #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Modo fondo de pantalla"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
 #: src/modules/gadman/e_mod_config.c:149
 msgid "Theme Defined"
 msgstr "Tema definido"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Tema del fondo de pantall"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "Usar el fondo de pantalla del tema"
+
+#: 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 "Bloqueo de pantalla personalizado"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "Usar un bloqueador de pantalla propio"
 
@@ -3724,60 +3872,75 @@ msgstr "Usar un bloqueador de pantalla propio"
 msgid "Screen Lock"
 msgstr "Bloqueo de pantalla"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "Opciones de escritorios virtuales"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Número de escritorios"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Cambio de escritorio con el mouse"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "Animar volteado"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Escritorios"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
 msgstr ""
 "Cambiar de escritorios cuando se arrastren objetos al borde de la pantalla"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: src/modules/conf_desks/e_int_config_desks.c:298
 msgid "Wrap desktops around when flipping"
 msgstr "Ajustar escritorios cuando se voltean"
 
-#: src/modules/conf_desks/e_int_config_desks.c:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "Animación del cambio"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Afuera"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "Cara"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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.f seg"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Cambio de fondo de pantalla"
+
+#: 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 "Escritorios virtuales"
@@ -3793,8 +3956,8 @@ msgstr "Opciones de diálogo"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -3961,23 +4124,23 @@ msgstr "El servidor de imagen actual no<br>tiene la extensión DPMS"
 msgid "Display Power Management Settings"
 msgstr "Opciones de manejo de la energía del monitor"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
 msgid "Enable Display Power Management"
 msgstr "Habilitar el administrador de Energía de Pantalla"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
 msgstr "Temporizadores"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "Tiempo de espera"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "Tiempo de suspensión"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "Tiempo para apagar"
 
@@ -4555,7 +4718,8 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pixeles"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+#, fuzzy
+msgid "Threshold for applying drag momentum"
 msgstr "Umbral para aplicar momento de arrastre"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4776,7 +4940,7 @@ msgid "Select an Edj File"
 msgstr "Elegir un archivo Edj"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Archivos"
 
@@ -5121,55 +5285,50 @@ msgstr "Maxima"
 msgid "Scaling"
 msgstr "Escala"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Opciones de salva-pantallas"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 "Habilitar el salva-pantallas de X"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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 "Temporizador(es) del salvapantallas"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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 "Tiempo hasta que arranque el salvapantallas de X"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
 msgstr "Tiempo hasta que alterne el salvapantallas de X"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f segundos"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "Vaciando"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Preferidos"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "No preferidos"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr "Eventos expuestos"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Permitir"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "No permitir"
 
@@ -5182,7 +5341,7 @@ msgid "Configured Shelves"
 msgstr "Contenedores configurados"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Preparando FM"
@@ -5228,10 +5387,6 @@ msgstr "Categoría de temas"
 msgid "Assign"
 msgstr "Asignar"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "Limpiar"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "Limpiar todo"
@@ -6092,27 +6247,19 @@ msgstr "Sombra caida"
 msgid "Run Command Dialog"
 msgstr "Diálogo Ejecutar comando"
 
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount error"
-msgstr "Error de montado"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr "Fallo al montar dispositivo"
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
 msgstr "Inicio"
 
-#: src/modules/fileman/e_mod_main.c:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
 msgstr "Administrador"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -6123,7 +6270,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -6139,96 +6286,104 @@ msgstr ""
 "ejecutando. Esto esta mal<br>como precaución su configuración ha sido "
 "restablecida a los<br>valores por defecto. Perdone por las molestias<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
 msgstr "Configuraciones de Fileman actualizadas"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr "Configuraciones del módulo de Archivos"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Tamaño del icono"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 #, fuzzy
 msgid "View"
 msgstr "Modo de vista"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr "Abrir directorios en el lugar"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "Ordenar directorios antes"
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Tamaño base"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "Usar clic sencillo"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr "Mostrar la extensión del icono"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "Mostrar la ruta completa"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr "Mostrar los iconos del escritorio"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr "Mostrar barra de herramientas"
 
-#: src/modules/fileman/e_mod_config.c:257
-msgid "Show HAL icons on desktop"
-msgstr "Mostrar los iconos HAL del escritorio"
-
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
 msgstr "Comportamiento"
 
-#: src/modules/fileman/e_fwin.c:1187
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr "Mostrar los iconos HAL del escritorio"
+
+#: 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:1462
 msgid "Go to Parent Directory"
 msgstr "Ir al directorio padre"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "Añadir aplicación..."
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Abrir"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Abrir con..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "Aplicaciones"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Aplicaciones específicas"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr "Comando personalizado"
 
@@ -6317,39 +6472,39 @@ msgstr "Ventana anterior"
 msgid "Select a window"
 msgstr "Elija una ventana"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
 msgstr "Configuraciones de IBar"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Fuente de la barra seleccionada"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Etiquetas del icono"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Mostrar etiqueta del icono"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "Mostrar nombre de la aplicación"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "Mostrar comentario de la aplicación"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "Mostrar aplicación genérica"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "Crear una nueva fuente IBar"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "Ingrese un nombre para esta nueva fuente:"
 
@@ -6366,27 +6521,27 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "¿Está seguro de querer borrar la fuente de esta barra?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Cambiar propiedades del icono"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Remover icono"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr "Añadir Un Icono"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr "Crear Un Icono Nuevo"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Añadir Aplicación"
 
@@ -6438,89 +6593,89 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr "Opciones del paginador"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 msgid "Flip desktop on mouse wheel"
 msgstr "Cambiar de escritorios con la rueda del mouse"
 
-#: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:164
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 msgid "Show desktop names"
 msgstr "Mostrar los nombres de los escritorios"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr "Opciones del paginador emergente"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr "Mostrar emergente al cambiar de escritorio"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr "Mostrar emergente en ventanas urgentes"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr "Botón para Elegir y Desplazar"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "Pulsa para establecer"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr "Botón de Arrastrar y Soltar"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr "Arrastrar escritorios completos"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr "Acción de teclado altura de emerger"
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "Resistencia al arrastre"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr "Altura del paginador emergente"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr "Velocidad a que emerge"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f segundos"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr "Opciones urgentes de ventanas"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr "Mostrar menú emergente en ventana urgente"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 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:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr "Botón para obtener del Paginador"
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6528,11 +6683,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:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr "Atención"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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 "
@@ -6542,29 +6697,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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Botón %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr "Mostrar Paginador Emergente"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr "Emerger Escritorio Derecha"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr "Emerger Escritorio Izquierda"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr "Emerger Escritorio Arriba"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr "Emerger Escritorio Abajo"
 
@@ -6810,7 +6965,7 @@ msgstr "Izquierda:"
 msgid "Right:"
 msgstr "Derecha:"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr "Silenciar"
 
@@ -6850,11 +7005,11 @@ msgstr "Preferencias del módulo mezclador"
 msgid "Mixer Settings Updated"
 msgstr "Preferencias del mezclador actualizadas"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
 msgstr "Controles"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6891,6 +7046,22 @@ msgstr "Dispositivo especifico"
 msgid "Networks"
 msgstr "Redes"
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "Sistema"
+
+#~ msgid "Mount of device failed"
+#~ msgstr "Fallo al montar dispositivo"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Configurar escritorios virtuales"
 
@@ -7107,9 +7278,6 @@ msgstr "Redes"
 #~ "\t-psychotic\n"
 #~ "\t\tSer psicótico.\n"
 
-#~ msgid "Setup Grab Input HAnding"
-#~ msgstr "Preparando el capturador de entradas"
-
 #~ msgid "Shutting down of your system failed."
 #~ msgstr "Falló el apagado de su sistema"
 
diff --git a/po/fi.gmo b/po/fi.gmo
index 8039fe5..a4085a6 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index 86e5925..0c7bcf6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment (e17) CVS\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2008-01-23 02:45+0200\n"
 "Last-Translator: Jani väyrynen <janivayrynen at gmail.com>\n"
 "Language-Team: Finnish <janivayrynen at gmail.com>\n"
@@ -18,20 +18,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Tietoa Enlightenmentista"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -78,53 +78,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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Ei"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Haluatko varmasti poistua?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Haluatko varmasti uloskirjautua?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Haluatko varmasti sammuttaa?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Haluatko varmasti uudelleenkäynnistää?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -132,7 +134,7 @@ msgstr ""
 "Vaadit tietokoneesi uudelleenkäynnistämistä.<br><br>Haluatko varmasti "
 "uudelleenkäynnistää?"
 
-#: src/bin/e_actions.c:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -140,11 +142,11 @@ msgstr ""
 "Vaadit tietokoneesi asettamista valmiustilaan.<br><br>Haluatko varmasti "
 "asettua valmiustilaan?"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Haluatko varmasti asettua lepotilaan?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -152,338 +154,338 @@ msgstr ""
 "Vaadit koneesi asettamista lepotilaan.<br><br>Haluatko varmasti asettua "
 "lepotilaan?"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Ikkuna : Toiminnot"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Siirrä"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Muuta kokoa"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Valikko"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Ikkunavalikko"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Nosta"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Laske"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Tapa"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Ikkuna : Tila"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Tarttuva tila"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Ikonisoitu tila"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Koko ruudun -tila"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maksimoi"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Maksimoi korkeussuunnassa"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Maksimoi leveyssuunnasa"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Maksimoi Koko ruudun -tila"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Maksimointitila \"Älykäs\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Maksimointitila \"Laajennus\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Maksimointitila \"Täyttö\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Varjo ylhäällä"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Varjo alhaalla"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "Varjo vasemmalla"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Varjo oikealla"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Varjo"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Kehyksetön tila"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "Kiinnitetty tila"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Työpöytä"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Vaihda vasemmanpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Vaihda oikeanpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Vaihda yläpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Vaihda alapuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Vaihda työpöytä..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Näytä työpöytä"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "Näytä työpöytä"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Vaihda työpöytään..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Vaihda työpöytä lineaarisesti..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "vaihda työpöytään 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "vaihda työpöytään 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "vaihda työpöytään 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "vaihda työpöytään 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "vaihda työpöytään 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "vaihda työpöytään 6"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "vaihda työpöytään 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "vaihda työpöytään 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "vaihda työpöytään 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "vaihda työpöytään 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "vaihda työpöytään 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "vaihda työpöytään 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "vaihda työpöytään..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Vaihda vasemmanpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Vaihda oikeanpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Vaihda yläpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Vaihda alapuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Vaihda työpöytä..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Vaihda työpöytään..."
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Vaihda työpöytä lineaarisesti..."
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "Vaihda työpöytään..."
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "vaihda työpöytään 0"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "vaihda työpöytään 1"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "vaihda työpöytään 2"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "vaihda työpöytään 3"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "vaihda työpöytään 4"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "vaihda työpöytään 6"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "vaihda työpöytään 6"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "vaihda työpöytään 7"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "vaihda työpöytään 8"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "vaihda työpöytään 9"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "vaihda työpöytään 10"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "vaihda työpöytään 11"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "vaihda työpöytään..."
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -493,103 +495,118 @@ msgstr "vaihda työpöytään..."
 msgid "Screen"
 msgstr "Näyttö"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Lähetä hiiri näytölle 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Lähetä hiiri näytölle 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Lähetä hiiri näytölle..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Lähetä hiiri ruudun verran eteenpäin"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Lähetä hiiri ruudun verran taaksepäin"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Lähetä hiiri eteenpäin/taaksepäin..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Ikkuna : Siiretään"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "Seuraavalle työpöydälle"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Edelliselle työpöydälle"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "Työpöydältä #..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Työpöydälle..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Näytä päävalikko"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Näytä Suosikkisovellukset-valikko"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Näytä Kaikki sovellukset -valikko"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Näytä Asiakkaat-valikko"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Näytä valikko..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Komento"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Sovellus"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Käynnistä uudelleen"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Poistu"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 #, fuzzy
 msgid "Exit Now"
 msgstr "Poistu"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenmentin %s-moduuli"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Koko ruudun -tila"
+
+#: src/bin/e_actions.c:2813
+#, fuzzy
+msgid "Offline Mode Toggle"
+msgstr "Varjo"
+
+#: 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -602,58 +619,58 @@ msgstr "Poistu"
 msgid "System"
 msgstr "Järjestelmä"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Uloskirjaudu"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Käynnistä uudelleen"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Valmiustila"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Lepotila"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 #, fuzzy
 msgid "Lock"
 msgstr "Lukot"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Siivoa ikkunat"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "Ikkuna : Toiminnot"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Delayed Action"
 msgstr "Valitut sovellukset"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Aseta taustakuvaksi"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "Työpöytätiedostojen skannaus valmis"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "Työpöytätiedostojen skannaus"
 
@@ -662,13 +679,14 @@ msgstr "Työpöytätiedostojen skannaus"
 msgid "Color Selector"
 msgstr "Profiilin valitsin"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -683,7 +701,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -695,7 +713,7 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -714,7 +732,7 @@ msgstr ""
 "korjaavat tämän lisäämällä nämä uudet<br>ominaisuudet. Voit tehdä haluamasi "
 "asetukset uudelleen.<br>Olemme pahoillamme häiriöstä.<br>"
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -730,12 +748,12 @@ msgstr ""
 "asetuksesi on nytpalautettu<br> oletusasetuksiin. Olemme pahoillamme "
 "häiriöstä.<br>"
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "Työpöydän asetukset"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, fuzzy, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -746,7 +764,7 @@ msgstr ""
 "ei voitu tunnistaa<br><br>Tiedosto, jossa virhe ilmeni,oli:<br>%"
 "s<br><br>Tämä tiedosto on poistettu korruptoituneen datan välttämiseksi.<br>"
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, fuzzy, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -761,7 +779,7 @@ msgstr ""
 "asetukset.<br><br>Tiedosto, jossa virhe ilmeni, oli:<br>%s<br><br>Tämä "
 "tiedosto on poistettu korruptoituneen datan välttämiseksi.<br>"
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, fuzzy, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -774,7 +792,7 @@ msgstr ""
 "<br><br>Tiedosto, jossa virhe ilmeni, oli:<br>%s<br><br>Tämä tiedosto on "
 "poistettu korruptoituneen datan välttämiseksi.<br>"
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, fuzzy, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -788,7 +806,7 @@ msgstr ""
 "oli:<br>%s<br><br>Tämä tiedosto on poistettu korruptoituneen datan "
 "välttämiseksi.<br>"
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, fuzzy, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -800,12 +818,12 @@ msgstr ""
 "ilmeni, oli:<br>%s<br><br>Tämä tiedosto on poistettu korruptoituneen datan "
 "välttämiseksi.<br>"
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenmentin asetusten kirjoitusongelmat"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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,7 +849,7 @@ msgid "Modules"
 msgstr "Moduulit"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Lisäosat"
 
@@ -840,22 +858,22 @@ msgstr "Lisäosat"
 msgid "Container %d"
 msgstr "Säiliö %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Virhe - ei PAM-tukea"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 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:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Lukitseminen epäonnistui"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -863,15 +881,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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Syötä lukituksen avaava salasanasi, kiitos"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Todennusjärjestelmän virhe"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -882,6 +900,25 @@ 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
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Epätäydelliset ikkunan ominaisuudet"
@@ -981,23 +1018,23 @@ msgstr "Valitse kuvake"
 msgid "Select an Executable"
 msgstr "Valitse suoritettava ohjelma"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Poista"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Kopioi"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Liitä"
 
@@ -1031,268 +1068,322 @@ msgstr ""
 "Enlightenment ei voinut suorittaa sovellusta:<br><br>%s<br><br>Sovelluksen "
 "käynnistys epäonnistui."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Sovelluksen suoritusvirhe"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "Sovelluksen %s suoritus loppui odottamatta."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Lopetuskoodi %i palautettiin sovelluksesta %s."
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s keskeytyi keskeytyssignaaliin."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s keskeytyi lopetussignaaliin."
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s keskeytyi poikkeussignaaliin."
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s keskeytyi liukulukuvirheeseen."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, 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:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s keskeytyi segmentointivirheeseen."
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s keskeytyi rikkoutuneeseen putkeen."
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s keskeytyi terminaatiosignaaliin."
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s keskeytyi väylävirheeseen."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s keskeytyi signaaliin %i."
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 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:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Virhelogit"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Virheviestiä ei ollut."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Tallenna tämä viesti"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, 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:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Virheinfo"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Virhesignaalin info"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Tulosteen data"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Tulostetta ei ollut."
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 #, fuzzy
 msgid "Nonexistent path"
 msgstr "Puuttuva polku"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, fuzzy, c-format
 msgid "%s doesn't exist."
 msgstr "%s ei ole olemassa"
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Ajovirhe"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Ajovirhe"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Ajovirhe"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i tiedostoa"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 #, fuzzy
 msgid "Link"
 msgstr "Lineaarinen"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 #, fuzzy
 msgid "Abort"
 msgstr "Tietoa"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Valinnan asetukset"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Näkymän tila"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Päivitä näkymä"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Näytä piilotiedostot"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "Muista järjestys"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Lajittele nyt"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Uusi hakemisto"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Valikon kohteiden tekstit"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 #, fuzzy
 msgid "Use default"
 msgstr "Käytä oletusta"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Ruudukoidut kuvakkeet"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Mukautetut kuvakkeet"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Listaa"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "Kuvakkeen koko"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Aseta taustakuvaksi"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "Hyllyn sisältö"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Poista käytöstä"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Luo uusi hakemisto"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Uuden hakemiston nimi:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Uudelleennimeä %s:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Uudelleennimeä tiedosto"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 #, fuzzy
 msgid "Retry"
 msgstr "Käynnistä uudelleen"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 #, fuzzy
 msgid "Error"
 msgstr "Ajovirhe"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "Aloitetaan"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Haluatko varmasti poistaa tiedoston<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Vahvista poisto"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, 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:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1353,8 +1444,8 @@ msgid "Preview"
 msgstr "Esikatselu"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Oletus"
 
@@ -1363,7 +1454,7 @@ msgid "Thumbnail"
 msgstr "Pikkukuva"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Mukautettu"
 
@@ -1379,70 +1470,70 @@ msgstr "Linkin info"
 msgid "Select an Image"
 msgstr "Valitse kuva"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu Tt"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu Gt"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu Mt"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu Kt"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu t"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr "Tuntematon tilavuus"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "Irroitettava laita"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Paljas"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Upotettu"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Ulkoasu"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Vieritä sisältöä automaattisesti"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Koko muutettavissa"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Vempain: siirrä/muuta kokoa"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Poista tämä vempain"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "Vempain: lopeta siirtäminen/koon muuttaminen"
 
@@ -1493,8 +1584,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1502,7 +1593,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Pinoutuminen"
 
@@ -1685,12 +1776,12 @@ msgstr "Koko näyttö"
 msgid "Window List"
 msgstr "Ikkunalista"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Sivuttaja"
 
@@ -1970,11 +2061,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 #, fuzzy
 msgid "Settings"
 msgstr "Työpöydän asetukset"
@@ -2010,8 +2101,8 @@ msgstr "Käytössä olevat moduulit"
 msgid "Unload Module"
 msgstr "Poista moduuli käytöstä"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2041,13 +2132,13 @@ msgstr "Valitut vempaimet"
 msgid "Remove Gadget"
 msgstr "Poista vempain"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 #, fuzzy
 msgid "Toolbar Settings"
 msgstr "Ponnahduksen setukset"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Asettelu"
 
@@ -2133,122 +2224,122 @@ msgstr "(Ei ikkunoita)"
 msgid "No name!!"
 msgstr "Ei nimeä!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(Ei hyllyjä)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Hylly #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Lisää hylly"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Poista hylly"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Hyllyn asetukset"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Pikkuruinen"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Keskiarvoinen"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Suuri"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Valtava"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Hyllyn sisältö"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Kaiken päällä"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Ikkunoiden alla"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Kaiken alla"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "Salli ikkunoidenn limittyä hyllyn kanssa"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Kutista sisältöä vastaavaksi"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pikseliä"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Tyylit"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "Automaattinen piilotus"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "Piilota hylly automaattisesti"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "Näytä hiiren hiirenheilautuksella"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "Näytä hiirenklikkauksella"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "Piiloutumisen viive"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekuntia"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "Piiloutumisen kesto"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "Näytä kaikilla työpöydillä"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "Näytä määritetyillä työpöydillä"
 
@@ -2637,7 +2728,7 @@ msgstr "Enlightenment ei voi asettaa Drag & Drop -järjestelmäänsä."
 
 #: src/bin/e_main.c:867
 #, fuzzy
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr "Aseta syötteenkaappauksen hallinta"
 
 #: src/bin/e_main.c:872
@@ -2831,30 +2922,37 @@ msgstr "Enlightenmentin %s-moduuli"
 msgid "Would you like to unload this module?<br>"
 msgstr "Haluaisitko poistaa käytöstä tämän moduulin?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 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:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Lopeta kohteiden siirtäminen/koon muuttaminen"
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Aloita kohteiden siirtäminen/koon muuttaminen"
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Hyllyn sisältö"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Poista tämä hylly"
 
@@ -3026,7 +3124,7 @@ msgstr "Tietoa teemasta"
 msgid "Set As Theme"
 msgstr "Aseta teemaksi"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Työkalurivin sisältö"
@@ -3045,67 +3143,67 @@ 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:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f tavua"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f kt"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f Mt"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f Gt"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "Tulevaisuudessa"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "Viimeisimmän minuutin aikana"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li vuotta sitten"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li kuukautta sitten"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li viikkoa sitten"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li päivää sitten"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li tuntia sitten"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minuuttia sitten"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3117,7 +3215,7 @@ msgstr "Tuntematon"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Lisää"
 
@@ -3140,7 +3238,7 @@ msgid "Add to Favorites"
 msgstr "Lisää Suosikkeihin"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3261,6 +3359,7 @@ msgid "Internal"
 msgstr "Sisäinen"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
@@ -3273,25 +3372,25 @@ msgstr ""
 msgid "Battery"
 msgstr "Akku"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "Näytä varoitus akun ollessa vähänä"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr "Akkumittari"
 
@@ -3300,11 +3399,26 @@ msgid "Clock"
 msgstr "Kello"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 #, fuzzy
 msgid "Settings Panel"
 msgstr "Työpöydän asetukset"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Työpöydän asetukset"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "Sammutuksen viive"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Moduulit"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3327,7 +3441,7 @@ msgid "Restart Applications"
 msgstr "Uudelleenkäynnistyksen sovellukset"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "Kaikki sovellukset"
 
@@ -3701,42 +3815,55 @@ msgstr "Valitse"
 msgid "Desk"
 msgstr "Työpöytä"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "Näytön lukituksen asetukset"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Automaattinen lukitus"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 #, fuzzy
 msgid "Lock when Enlightenment starts"
 msgstr "Käytä Enlightenmentin kursoria"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: 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:180
+#: 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"
+
+#: 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 sekuntia"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
 msgid "Lock when idle time exceeded"
 msgstr "Lukitse joutoajan ylittyessä"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:184
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
 msgid "Idle time to exceed"
 msgstr "Joutoaika"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 minuuttia"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3747,27 +3874,27 @@ msgstr "%1.0f minuuttia"
 msgid "Personal"
 msgstr "Oma"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Sisäänkirjautumisikkunan asetukset"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
 msgstr "Näytä kaikilla näytön alueilla"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr "Näytä nykyisen näytön alueella"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
 msgstr "Näytä näytön alueella #:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3776,29 +3903,49 @@ msgstr "Näytä näytön alueella #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Taustakuvatila"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:358
+#: 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:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "Käytä teeman taustakuvaa"
+
+#: 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 "Mukautettu ruudun lukitus"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "Käytä mukautettua ruudun lukitusta"
 
@@ -3806,59 +3953,74 @@ msgstr "Käytä mukautettua ruudun lukitusta"
 msgid "Screen Lock"
 msgstr "Näytön lukitus"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "Virtuaalityöpöytien asetukset"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Työpöytien lukumäärä"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Työpöydän vaihto hiirellä"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "Animoitu vaihto"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Työpöydät"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: 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"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: src/modules/conf_desks/e_int_config_desks.c:298
 msgid "Wrap desktops around when flipping"
 msgstr "Kierrätä työpöytiä vaihdettaessa"
 
-#: src/modules/conf_desks/e_int_config_desks.c:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "Vaihdon animaatio"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Pois"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "Vieritys sivuilta"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Vieritys kulmista"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 sekuntia"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Taustakuvan vaihto"
+
+#: 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 "Virtuaalityöpöydät"
@@ -3874,8 +4036,8 @@ msgstr "Valintaikkunan asetukset"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -4052,24 +4214,24 @@ msgstr "Nykyisellä näyttöpalvelimells ei ole<br>DPMS-laajennusta."
 msgid "Display Power Management Settings"
 msgstr "Näytä virranhallinnan asetukset"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
 msgid "Enable Display Power Management"
 msgstr "Ota käyttöön näytön virranhallinta"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 #, fuzzy
 msgid "Timers"
 msgstr "Ajastimet"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "Valmiustilan viive"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "Lepotilan viive"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "Sammutuksen viive"
 
@@ -4675,7 +4837,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pikseliä"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4897,7 +5059,7 @@ msgid "Select an Edj File"
 msgstr "Valitse edj-tiedosto"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Tiedostot"
 
@@ -5257,55 +5419,50 @@ msgstr "Maksimikoko"
 msgid "Scaling"
 msgstr "Pinoutuminen"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Näytönsäästäjän asetukset"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 "Ota käyttöön X-näytönsäästäjä"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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 "Näytönsäästäjän ajastimet:"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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-näytönsäästäjän alkamisen viive"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
 msgstr "X-näytönsäästäjän vaihtumisen viive"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f sekuntia"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "Ruudunpimennys"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Mielellään"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "Ei mielellään"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr "Grafiikanpaljastukset"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Salli"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "Älä salli"
 
@@ -5318,7 +5475,7 @@ msgid "Configured Shelves"
 msgstr "Muokatut hyllyt"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Aseta tiedostonhallinta"
@@ -5366,10 +5523,6 @@ msgstr "Teeman osa-alueet"
 msgid "Assign"
 msgstr "Ota käyttöön"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "Poista käytöstä"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "Poista kaikki käytöstä"
@@ -6247,30 +6400,21 @@ msgstr "Ikkunavarjo"
 msgid "Run Command Dialog"
 msgstr "Suorita komento -valintaikkuna"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "Ajovirhe"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: 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:332
+#: src/modules/fileman/e_mod_main.c:322
 #, fuzzy
 msgid "Favorites"
 msgstr "Suosikkisovellukset-valikko"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 #, fuzzy
 msgid "Root"
 msgstr "Käynnistä uudelleen"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: src/modules/fileman/e_mod_main.c:431
 #, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
@@ -6290,7 +6434,7 @@ msgstr ""
 "toiminnallisuuden. Voit asettaa asetukset<br>uudelleen mieleiseksesi. "
 "Anteeksi asetuksiesi sorkkiminen.<br>"
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -6306,98 +6450,106 @@ msgstr ""
 "ja<br> varotoimena asetuksesi on palautettu oletus arvoihin.<br>Pahoittelut "
 "aiheutetusta vaivasta.<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 #, fuzzy
 msgid "Fileman Settings Updated"
 msgstr "Filemanin asetukset"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr "Filemanin asetukset"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Kuvakkeen koko"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 #, fuzzy
 msgid "View"
 msgstr "Näkymän tila"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr "Avaa tiedostot samaan ikkunaan"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "Lajittele hakemistot ensin"
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Peruskoko"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "Käytä kertaklikkausta"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr "Näytä kuvakelaajennus"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "Näytä koko polku"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr "Näytä työpöydän kuvakkeet"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr "Näytä työkalurivi"
 
-#: src/modules/fileman/e_mod_config.c:257
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:729
+msgid "Behavior"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:270
 #, fuzzy
 msgid "Show HAL icons on desktop"
 msgstr "Näytä kaikilla työpöydillä"
 
-#: src/modules/fileman/e_mod_config.c:261
-#: src/modules/gadman/e_mod_gadman.c:729
-msgid "Behavior"
+#: 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:1187
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr "Mene isäntähakemistoon"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "Lisää sovellus"
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Avaa"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Avaa sovelluksella..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "Sovellukset"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Määritetyt sovellukset"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr "Mukautettu komento"
 
@@ -6498,40 +6650,40 @@ msgstr "Edellinen ikkuna"
 msgid "Select a window"
 msgstr "Valitse ikkuna"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 #, fuzzy
 msgid "IBar Settings"
 msgstr "Ponnahduksen setukset"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Valittu palkin lähde"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Kuvakkeiden nimikkeet"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Näytä kuvakkeen nimike"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "Näytä sovelluksen nimi"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "Näytä sovelluksen kommentti"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "Näytä sovelluksen yleisnimi"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "Luo uusi IBar-lähde"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "Anna nimi tälle uudelle lähteelle:"
 
@@ -6548,27 +6700,27 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Haluatko varmasti poistaa palkin lähteen?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Muuta kuvakkeen ominaisuukisa"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Poista kuvake"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr "Lisää kuvake"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr "Luo uusi kuvake"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Lisää sovellus"
 
@@ -6623,90 +6775,90 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr "Ponnahduksen setukset"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: 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"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr "Ponnahdusikkunan asetukset"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr "Näytä ponnahdusikkuna työpöytää vaihdettaessa"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr "Näytä ponnahdusikkina huomiota vaativille ikkunoille"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr "Valitse ja liu'uta -painike"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "Klikkaa asettaaksesi"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr "Vedä ja pudota -painike"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr "Vedä koko työpöytä"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr "Näppäintoiminnon ponnahduskorkeus"
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f pikseliä"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "Vastustus vetämiselle"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr "Ponnahdussivuttajan korkeus"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr "Ponnahdusnopeus"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekuntia"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr "Huomiota vaativan ikkunan asetukset"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr "Näytä ponnahdus huomiota vaativalle ikkunalle"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 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:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr "Sivuttaja-painikkeen kaappaus"
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6714,11 +6866,11 @@ 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:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr "Huomio"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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 "
@@ -6728,32 +6880,32 @@ msgstr ""
 "onjo koodattu<br>kontekstivalikkojen käyttöön.<br>Tämä painike toimii vain "
 "ponnahduksessa"
 
-#: src/modules/pager/e_mod_config.c:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Painike %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "Vaihda oikeanpuoleiseen työpöytään"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "Vaihda vasemmanpuoleiseen työpöytään"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "Ponnahdusnopeus"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "Vaihda alapuoleiseen työpöytään"
@@ -7024,7 +7176,7 @@ msgstr ""
 msgid "Right:"
 msgstr "Vaalea"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 #, fuzzy
 msgid "Mute"
 msgstr "Valikon kohteiden tekstit"
@@ -7071,12 +7223,12 @@ msgstr "Moduulien asetukset"
 msgid "Mixer Settings Updated"
 msgstr "Filemanin asetukset päivitetty"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 #, fuzzy
 msgid "Controls"
 msgstr "Aseta järjestelmän kontrollit"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -7115,6 +7267,19 @@ msgstr "Määritetyt sovellukset"
 msgid "Networks"
 msgstr ""
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "Järjestelmä"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Muokkaa virtuaalityöpöytiä"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index 867e2d2..279ba55 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 239a1df..d3cd4fa 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,17 +1,15 @@
-# French translation for Enlightenment DR17
+# French translation for Enlightenment DR17.
 # This file is put in the public domain.
-#  'Caro' <EMAIL at ADDRESS>, 2005.
+# 'Caro' <EMAIL at ADDRESS>,2005.
 # batden <batden at orange.fr>, 2009.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
-"PO-Revision-Date: 2009-04-20 18:52+0400\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
+"PO-Revision-Date: 2009-06-08 08:55+0400\n"
 "Last-Translator: batden <batden at orange.fr>\n"
-"Language-Team: Enlightenment i18n French <enlightenment-intl at lists."
-"sourceforge.net>\n"
+"Language-Team: French <Enlightenment i18n French>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,20 +20,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "À propos de Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -82,46 +80,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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Oui"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Non"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Êtes-vous sûr de vouloir quitter ?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Êtes-vous sûr de vouloir fermer votre session ?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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 ?"
 
-#: src/bin/e_actions.c:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Êtes-vous sûr de vouloir éteindre ?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -129,11 +129,11 @@ msgstr ""
 "Vous avez demandé à éteindre votre ordinateur.<br><br>Êtes-vous sûr de "
 "vouloir l'éteindre ?"
 
-#: src/bin/e_actions.c:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Êtes-vous sûr de vouloir redémarrer ?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -141,7 +141,7 @@ msgstr ""
 "Vous avez demandé à redémarrer votre ordinateur.<br><br>Êtes-vous sûr de "
 "vouloir le redémarrer ?"
 
-#: src/bin/e_actions.c:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -149,11 +149,11 @@ msgstr ""
 "Vous avez demandé à mettre votre ordinateur en veille.<br><br>Êtes-vous sûr "
 "de vouloir le mettre en veille ?"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Êtes-vous sûr de vouloir mettre en hibernation ?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -161,316 +161,316 @@ msgstr ""
 "Vous avez demandé à mettre votre ordinateur en hibernation.<br><br>Êtes-vous "
 "sur de vouloir le mettre en hibernation ?"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Fenêtre: Actions"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Déplacer"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Redimensionner"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Menu de la fenêtre"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Placer dessus"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Placer dessous"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Tuer"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Fenêtre: État"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Activer/Désactiver l'ancrage"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Activer/Désactiver l'iconique"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Activer/Désactiver le mode plein écran"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Maximiser verticalement"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Maximiser horizontalement"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Maximisation en plein écran"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximisation en mode \"Intelligent\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximisation en mode \"Expansion\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximisation en mode \"Remplissage\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Activer/Désactiver l'ombre vers le haut"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Activer/Désactiver l'ombre vers le bas"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "Activer/Désactiver l'ombre vers la gauche"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Activer/Désactiver l'ombre vers la droite"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Activer/Désactiver l'enroulement"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Activer/Désactiver le mode sans bordure"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "Activer/Désactiver l'épinglage"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Bureau"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Bascule vers le bureau gauche"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Bascule vers le bureau droit"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Bascule vers le bureau du dessus"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Bascule vers le bureau du dessous"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Basculer le bureau de..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Afficher le bureau"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
 msgstr "Afficher le rack"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Basculer le bureau vers..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Basculer le bureau linéairement..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Passer au bureau 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Passer au bureau 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Passer au bureau 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Passer au bureau 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Passer au bureau 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Passer au bureau 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Passer au bureau 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Passer au bureau 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Passer au bureau 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Passer au bureau 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Passer au bureau 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Passer au bureau 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Passer au bureau..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Basculer vers le bureau gauche (tous les écrans)"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Basculer vers le bureau droit (tous les écrans)"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Basculer vers le bureau du dessus (tous les écrans)"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Basculer vers le bureau du dessous (tous les écrans)"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Basculer le bureau de... (tous les écrans)"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Basculer le bureau vers... (tous les écrans)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Basculer linéairement le bureau... (tous les écrans)"
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
 msgstr "Basculer le bureau avec..."
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Passer au bureau 0 (tous les écrans)"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Passer au bureau 1 (tous les écrans)"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Passer au bureau 2 (tous les écrans)"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Passer au bureau 3 (tous les écrans)"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Passer au bureau 4 (tous les écrans)"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Passer au bureau 5 (tous les écrans)"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Passer au bureau 6 (tous les écrans)"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Passer au bureau 7 (tous les écrans)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Passer au bureau 8 (tous les écrans)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Passer au bureau 9 (tous les écrans)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Passer au bureau 10 (tous les écrans)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Passer au bureau 11 (tous les écrans)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Passer au bureau... (tous les écrans)"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -480,102 +480,114 @@ msgstr "Passer au bureau... (tous les écrans)"
 msgid "Screen"
 msgstr "Écran"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Envoyer la souris à l'écran 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Envoyer la souris à l'écran 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Envoyer la souris à l'écran..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Envoyer la souris à l'écran suivant"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Envoyer la souris à l'écran précédent"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Déplacer la souris de ... écrans"
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Fenêtre: Déplacement"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "Vers le bureau suivant"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Vers le bureau précédent"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "Par le bureau #..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Vers le bureau..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Afficher le menu principal"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Afficher le menu des favoris"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Afficher le menu des applications"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Afficher le menu des clients"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Afficher le menu..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Commande"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Application"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
 msgstr "Quitter à l'instant"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment: Mode"
+
+#: src/bin/e_actions.c:2808
+msgid "Presentation Mode Toggle"
+msgstr "Activer/Désactiver le mode présentation"
+
+#: src/bin/e_actions.c:2813
+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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -588,55 +600,55 @@ msgstr "Quitter à l'instant"
 msgid "System"
 msgstr "Système"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Se déconnecter"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr "Éteindre à l'instant"
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr "Éteindre"
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Mettre en veille"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Hiberner"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 msgid "Lock"
 msgstr "Verrouiller"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Réorganiser les fenêtres"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr "Générique: Actions"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
 msgstr "Action reportée"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Utiliser comme fond d'écran"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "Analyse des fichiers desktop effectuée"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "Analyse des fichiers desktop"
 
@@ -644,13 +656,14 @@ 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:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -665,7 +678,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -677,7 +690,7 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 "
@@ -695,7 +708,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:746
+#: src/bin/e_config.c:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -710,11 +723,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:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
 msgstr "Configuration mise à niveau"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -726,7 +739,7 @@ msgstr ""
 "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:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -742,7 +755,7 @@ msgstr ""
 "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:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -756,7 +769,7 @@ msgstr ""
 "%s<br><br>Ce fichier a été supprimé pour éviter la corruption<br>des données."
 "<br>"
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -770,7 +783,7 @@ msgstr ""
 "<br>%s<br><br>Ce fichier a été supprimé pour éviter la corruption<br>des "
 "données.<br>"
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -782,11 +795,11 @@ msgstr ""
 "<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:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problèmes d'écriture de la configuration de Enlightenment"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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
@@ -812,7 +825,7 @@ 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Extensions"
 
@@ -821,22 +834,22 @@ msgstr "Extensions"
 msgid "Container %d"
 msgstr "Conteneur %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Erreur: Pas de support PAM"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 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:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Échec du verrouillage"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -845,15 +858,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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Veuillez entrer votre mot de passe de déverrouillage"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Erreur du système d'authentification"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -864,6 +877,28 @@ 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
+msgid "Activate Presentation Mode?"
+msgstr "Activer le mode présentation ?"
+
+#: src/bin/e_desklock.c:1040
+msgid ""
+"You unlocked desktop too fast.<br><br>Would you like to enable "
+"<b>presentation</b> mode and temporarily disable screen saver, lock and "
+"power saving?"
+msgstr ""
+"Vous avez déverrouillé 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 ?"
+
+#: src/bin/e_desklock.c:1051 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
+msgid "No, and stop asking"
+msgstr "Non, et ne plus demander"
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Propriétés de la fenêtre incomplètes"
@@ -963,23 +998,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:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Couper"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Copier"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Coller"
 
@@ -1013,261 +1048,309 @@ 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:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Erreur lors de l'exécution de l'application"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s s'est arrêté de façon inattendue."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, 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:442
+#: src/bin/e_exec.c:443
 #, 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:444
+#: src/bin/e_exec.c:445
 #, 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:448
+#: src/bin/e_exec.c:449
 #, 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:451
+#: src/bin/e_exec.c:452
 #, 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:454
+#: src/bin/e_exec.c:455
 #, 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:457
+#: src/bin/e_exec.c:458
 #, 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:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s a été interrompu par un tube cassé."
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, 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:466
+#: src/bin/e_exec.c:467
 #, 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:469
+#: src/bin/e_exec.c:470
 #, 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:525
+#: src/bin/e_exec.c:528
 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:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Journaux des erreurs"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Il n'y a eu aucun message d'erreur."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Sauvegarder ce message"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, 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:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Information sur l'erreur"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Information sur le signal d'erreur"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Données de sortie"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Il n'y a eu aucune sortie."
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr "Chemin inexistant"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s n'existe pas."
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+msgid "Mount Error"
+msgstr "Erreur au montage"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr "Impossible de monter le périphérique"
+
+#: src/bin/e_fm.c:3047
+msgid "Unmount Error"
+msgstr "Erreur au démontage"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr "Impossible de démonter le périphérique"
+
+#: src/bin/e_fm.c:3062
+msgid "Eject Error"
+msgstr "Erreur pendant l'éjection"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr "Impossible d'éjecter le périphérique"
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i Fichiers"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
 msgstr " Lien "
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr "Annuler"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
 msgstr "Hériter des propriétés du parent"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Mode d'affichage"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Rafraîchir"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Afficher les fichiers cachés"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "Mémoriser l'ordre"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Classer maintenant"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nouveau dossier"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr "Démonter"
+
+#: src/bin/e_fm.c:8063
+msgid "Mount"
+msgstr "Monter"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr "Éjecter"
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
 msgstr "Valeur par défaut"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Icones alignés"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Icones personnalisés"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Liste"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Taille de l'icone (%d)"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+msgid "Set background..."
+msgstr "Définir le fond d'écran..."
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+msgid "Set overlay..."
+msgstr "Définir l'incrustation..."
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Effacer"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Créer un nouveau dossier"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Nom du nouveau dossier:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renommer %s en:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Renommer le fichier"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr "Réessayer"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Erreur"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr "Non pour tout"
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr "Oui pour tout"
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Le fichier existe déjà, écraser ?<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr "Ignorer"
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr "Ignorer tout"
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, 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:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Confirmer la suppression"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, 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:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1328,8 +1411,8 @@ msgid "Preview"
 msgstr "Aperçu"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: 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"
 
@@ -1338,7 +1421,7 @@ msgid "Thumbnail"
 msgstr "Vignette"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Personnalisé"
 
@@ -1354,70 +1437,70 @@ msgstr "Information sur le lien"
 msgid "Select an Image"
 msgstr "Sélectionner une image"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu Tio"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu Gio"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu Mio"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu Kio"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu o"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volume inconnu"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "Périphérique amovible"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "En plein"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "En creux"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Apparence"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Défilement automatique du contenu"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Permettre le redimensionnement"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Activer le déplacement/redimensionnement de ce gadget"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Supprimer ce gadget"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "Arrêter de déplacer/redimensionner ce gadget"
 
@@ -1471,8 +1554,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1480,7 +1563,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Empilement"
 
@@ -1658,12 +1741,12 @@ msgstr "Plein écran"
 msgid "Window List"
 msgstr "Liste des fenêtres"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Pager"
 
@@ -1942,11 +2025,11 @@ msgstr "Toujours focaliser au démarrage"
 #: 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr "Configuration"
 
@@ -1980,8 +2063,8 @@ msgstr "Modules activés"
 msgid "Unload Module"
 msgstr "Désactiver le module"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2011,12 +2094,12 @@ msgstr "Gadgets sélectionnés"
 msgid "Remove Gadget"
 msgstr "Supprimer ce gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 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:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Présentation"
 
@@ -2101,121 +2184,121 @@ msgstr "(Aucune fenêtre)"
 msgid "No name!!"
 msgstr "Pas de nom !!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(Aucun rack)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Rack #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Ajouter un rack"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Supprimer un rack"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: 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:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Minuscule"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Moyen"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grand"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Énorme"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 msgid "Set Contents..."
 msgstr "Définir le contenu..."
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Au-dessus de tout"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Sous les fenêtres"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "En dessous de tout"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "Autoriser les fenêtres à recouvrir ce rack"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Redimensionner à la taille du contenu"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Styles"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "Auto-masquage"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "Auto-masquage du rack"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "Afficher au passage de la souris"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "Afficher avec un clic de souris"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "Délai avant masquage"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f secondes"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "Vitesse du masquage"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "Afficher sur tous les bureaux"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "Afficher sur les bureaux spécifiés"
 
@@ -2615,7 +2698,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment ne peut pas configurer son système de glissé-déposé."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr "Configuration des périphériques d'entrée"
 
 #: src/bin/e_main.c:872
@@ -2811,11 +2894,21 @@ msgstr "Module %s de Enlightenment"
 msgid "Would you like to unload this module?<br>"
 msgstr "Voulez-vous désactiver ce module ?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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 ""
+"Vous avez désactivé l'écran de veille trop vite.<br><br>Voulez-vous activer "
+"le mode <b>présentation</b> et désactiver temporairement l'écran de veille, "
+"le verrouillage et la gestion de l'énergie ?"
+
+#: src/bin/e_shelf.c:1272 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 ?"
 
-#: src/bin/e_shelf.c:1259
+#: src/bin/e_shelf.c:1273
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -2823,19 +2916,19 @@ msgstr ""
 "Vous avez demandé à supprimer ce rack.<br><br>Êtes-vous sûr de vouloir le "
 "supprimer ?"
 
-#: src/bin/e_shelf.c:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 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:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Déplacer/Redimensionner des éléments"
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 msgid "Set Shelf Contents"
 msgstr "Définir le contenu du rack"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Supprimer ce rack"
 
@@ -2991,7 +3084,7 @@ msgstr "À propos de ce thème"
 msgid "Set As Theme"
 msgstr "Utiliser ce thème"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 msgid "Set Toolbar Contents"
 msgstr "Définir le contenu de la barre d'outils"
 
@@ -3009,67 +3102,67 @@ msgstr ""
 "Cependant<br>Enlightenment n'autorisera pas une 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:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f octets"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f Ko"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f Mo"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f Go"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "Dans le futur"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "Durant la dernière minute"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "il y a %li année(s)"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "il y a %li mois"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "il y a %li semaines"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "il y a %li jours"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "il y a %li heures"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "il y a %li minutes"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3081,7 +3174,7 @@ msgstr "Inconnu"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Ajouter"
 
@@ -3104,7 +3197,7 @@ msgid "Add to Favorites"
 msgstr "Ajouter aux favoris"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3218,6 +3311,7 @@ msgid "Internal"
 msgstr "Interne"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
@@ -3229,24 +3323,24 @@ msgstr "Interface"
 msgid "Battery"
 msgstr "Batterie"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr "La batterie est faible !"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr "Branchement sur le secteur recommandé."
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr "ERREUR"
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr "Surveillance de la batterie"
 
@@ -3255,10 +3349,22 @@ msgid "Clock"
 msgstr "Horloge"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
 msgstr "Panneau de configuration"
 
+#: src/modules/conf/e_mod_main.c:234
+msgid "Presentation"
+msgstr "Présentation"
+
+#: src/modules/conf/e_mod_main.c:241
+msgid "Offline"
+msgstr "Hors ligne"
+
+#: src/modules/conf/e_mod_main.c:269
+msgid "Modes"
+msgstr "Modes"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3281,7 +3387,7 @@ msgid "Restart Applications"
 msgstr "Applications à redémarrer"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "Toutes les applications"
 
@@ -3636,41 +3742,53 @@ msgstr "Définir"
 msgid "Desk"
 msgstr "Bureau"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "Paramétrage du verrouillage d'écran"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Verrouillage automatique"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 msgid "Lock when Enlightenment starts"
-msgstr "verrouiller au démarrage de Enlightenment"
+msgstr "Verrouiller au démarrage de Enlightenment"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
 msgstr "Verrouiller au démarrage de l'écran de veille"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+msgid "Time after screensaver activated"
+msgstr "Délai après activation de l'écran de veille"
+
+#: 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 secondes"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
 msgid "Lock when idle time exceeded"
 msgstr "Verrouiller quand le temps d'attente est dépassé"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:184
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
 msgid "Idle time to exceed"
 msgstr "Durée d'inactivité à dépasser"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 minutes"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3681,27 +3799,27 @@ msgstr "%1.0f minutes"
 msgid "Personal"
 msgstr "Personnel"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Paramétrage de la boîte de login"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
 msgstr "Afficher sur toutes les zones d'écran"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr "Afficher sur la zone d'écran actuelle"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
 msgstr "Afficher sur la zone d'écran #:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3710,29 +3828,48 @@ msgstr "Afficher sur la zone d'écran #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Type de fond d'écran"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
 #: src/modules/gadman/e_mod_config.c:149
 msgid "Theme Defined"
 msgstr "Défini par le thème"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Fond d'écran du thème"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+msgid "User Wallpaper"
+msgstr "Fond d'écran utilisateur"
+
+#: 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 "Entrer en mode présentation"
+
+#: 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 "Suggérer l'entrée en mode présentation"
+
+#: 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 "Si désactivé avant"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:457
 msgid "Custom Screenlock"
 msgstr "Verrouillage personnalisé"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "Utiliser un verrouillage d'écran personnalisé"
 
@@ -3740,59 +3877,73 @@ msgstr "Utiliser un verrouillage d'écran personnalisé"
 msgid "Screen Lock"
 msgstr "Verrouillage de l'écran"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "Paramétrage des bureaux virtuels"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Nombre de bureaux"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Basculement des bureaux à la souris"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "Basculement animé"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Bureaux"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Basculer lors du déplacement d'objets au bord de l'écran"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: src/modules/conf_desks/e_int_config_desks.c:298
 msgid "Wrap desktops around when flipping"
 msgstr "Tourner en boucle lors du basculement"
 
-#: src/modules/conf_desks/e_int_config_desks.c:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "Animation du basculement"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Aucune"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "Vitre"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 s"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+msgid "Background panning"
+msgstr "Fond d'écran panoramique"
+
+#: src/modules/conf_desks/e_int_config_desks.c:321
+#, c-format
+msgid "%.2f X-axis pan factor"
+msgstr "Facteur horizontal %.2f"
+
+#: src/modules/conf_desks/e_int_config_desks.c:325
+#, c-format
+msgid "%.2f Y-axis pan factor"
+msgstr "Facteur vertical %.2f"
+
 #: src/modules/conf_desks/e_mod_main.c:35
 msgid "Virtual Desktops"
 msgstr "Bureaux virtuels"
@@ -3808,8 +3959,8 @@ msgstr "Paramétrage des boîtes de dialogues"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -3982,23 +4133,23 @@ msgstr "L'affichage actuel n'a pas le support<br>DPMS."
 msgid "Display Power Management Settings"
 msgstr "Paramétrage de la gestion de l'énergie"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
 msgid "Enable Display Power Management"
 msgstr "Activer la gestion de l'énergie"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
 msgstr "Minuteurs"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "Délai de mise en veille"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "Délai d'hibernation"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "Extinction"
 
@@ -4263,12 +4414,12 @@ msgstr "Paramétrage de la position"
 #: 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 "Alignement sur l'axe X"
+msgstr "Alignement horizontal"
 
 #: 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 "Alignement sur l'axe Y"
+msgstr "Alignement vertical"
 
 #: 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
@@ -4579,7 +4730,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pixels"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr "Seuil d'application de l'impulsion"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4801,7 +4952,7 @@ msgid "Select an Edj File"
 msgstr "Sélectionner un fichier edj"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Fichiers"
 
@@ -4866,7 +5017,7 @@ msgstr "Conteneur"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Manager"
-msgstr "Manager"
+msgstr "Gestionnaire"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:1272
 msgid "Mouse Binding Sequence"
@@ -5145,55 +5296,50 @@ msgstr "Maximum"
 msgid "Scaling"
 msgstr "Mise à l'échelle"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Paramétrage de l'économiseur d'écran"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 "Activer l'écran de veille de X"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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 "Minuteur(s) de l'écran de veille"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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 "Délai avant le démarrage de l'écran de veille de X"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
 msgstr "Délai avant le changement d'écran de veille de X"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f secondes"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "Masquer"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Préféré"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "Non préféré"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr "Événements d'exposition"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Autoriser"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "Ne pas autoriser"
 
@@ -5206,7 +5352,7 @@ msgid "Configured Shelves"
 msgstr "Racks configurés"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 msgid "Setup"
 msgstr "Configurer"
 
@@ -5252,10 +5398,6 @@ msgstr "Catégories de thèmes"
 msgid "Assign"
 msgstr "Assigner"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "Effacer"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "Tout effacer"
@@ -6114,27 +6256,19 @@ msgstr "Ombre portée"
 msgid "Run Command Dialog"
 msgstr "Fenêtre de commande"
 
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount error"
-msgstr "Erreur de montage"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr "Impossible de monter le périphérique"
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
 msgstr "Dossier personnel"
 
-#: src/modules/fileman/e_mod_main.c:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
 msgstr "Favoris"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
 msgstr "Root"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -6152,7 +6286,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/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -6169,92 +6303,100 @@ msgstr ""
 "mesure de précaution, votre configuration a été remise à zéro.<br> Désolé "
 "pour les désagréments.<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
 msgstr "Configuration de EFM à jour"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr "Paramétrage de EFM"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Taille de l'icone"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
 msgstr "Affichage"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr "Ne pas ouvrir dans une nouvelle fenêtre"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "Afficher les dossiers en premier"
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 msgid "Case Sensitive"
 msgstr "Sensible à la casse"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "Utiliser le clic simple"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr "Utiliser des critères de sélection alternatifs"
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr "Montrer l'extension de l'icone"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "Montrer le chemin complet"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr "Afficher les icones du bureau"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr "Montrer la barre d'outils"
 
-#: src/modules/fileman/e_mod_config.c:257
-msgid "Show HAL icons on desktop"
-msgstr "Afficher les icones HAL sur le bureau"
-
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
 msgstr "Comportement"
 
-#: src/modules/fileman/e_fwin.c:1187
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr "Afficher les icones HAL sur le bureau"
+
+#: src/modules/fileman/e_mod_config.c:273
+msgid "Mount volumes on insert"
+msgstr "Monter les volumes à l'insertion"
+
+#: src/modules/fileman/e_mod_config.c:276
+msgid "Open filemanager on mount"
+msgstr "Ouvrir le gestionnaire de fichiers au montage"
+
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr "Aller au dossier parent"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 msgid "Other application..."
 msgstr "Autre application..."
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Ouvrir avec..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 msgid "Known Applications"
 msgstr "Applications disponibles"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Applications spécifiques"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr "Commande personnalisée"
 
@@ -6343,39 +6485,39 @@ msgstr "Fenêtre précédente"
 msgid "Select a window"
 msgstr "Sélectionner une fenêtre"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
 msgstr "Paramétrage de l'IBar"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Sélection de la source"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Étiquettes de l'icone"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Montrer l'étiquette de l'icone"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "Afficher le nom de l'application"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "Afficher le commentaire de l'application"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "Afficher l'information générique de l'application"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "Créer une nouvelle source"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "Entrer un nom pour cette nouvelle source:"
 
@@ -6392,27 +6534,27 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Êtes-vous sûr de vouloir supprimer cette source ?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Changer les propriétés de l'icone"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Supprimer l'icone"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr "Ajouter un icone"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr "Créer un nouvel icone"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Ajouter une application"
 
@@ -6464,89 +6606,89 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr "Paramétrage du Pager"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 msgid "Flip desktop on mouse wheel"
 msgstr "Changer de bureau avec la molette de la souris"
 
-#: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:164
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 msgid "Show desktop names"
 msgstr "Afficher le nom des bureaux"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr "Paramétrage du pop-up"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr "Afficher un pop-up lors du changement de bureau"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr "Afficher le pop-up pour les fenêtres urgentes"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr "Bouton de sélectionné-glissé"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "Cliquer pour configurer"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr "Bouton de glissé-déposé"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr "Faire glisser le bureau"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr "Hauteur du pop-up de l'élément"
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f pixels"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "Résistance du glissé"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr "Hauteur du pop-up du pager"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr "Vitesse du pop-up"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f secondes"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr "Paramétrage de la fenêtre urgente"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr "Afficher les pop-up sur les fenêtres urgentes"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 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:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr "Bouton de capture du Pager"
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6555,11 +6697,11 @@ msgstr ""
 "hilight> pour annuler.<br>Ou<br><hilight>Suppr</hilight>pour réinitialiser "
 "le bouton."
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr "Attention"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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 "
@@ -6570,29 +6712,29 @@ msgstr ""
 "interne<br>pour les menus contextuels. <br>Ce bouton fonctionne uniquement "
 "dans le pop-up."
 
-#: src/modules/pager/e_mod_config.c:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Bouton %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr "Afficher le pop-up du Pager"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr "Pop-up du bureau droit"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr "Pop-up du bureau gauche"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr "Pop-up du bureau au-dessus"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr "Pop-up du bureau en dessous"
 
@@ -6838,7 +6980,7 @@ msgstr "Gauche:"
 msgid "Right:"
 msgstr "Droit:"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr "Sourdine"
 
@@ -6878,11 +7020,11 @@ msgstr "Paramétrage du module de mixage"
 msgid "Mixer Settings Updated"
 msgstr "Configuration du mélangeur à jour"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
 msgstr "Contrôleurs"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6919,6 +7061,23 @@ msgstr "Périphérique spécifique"
 msgid "Networks"
 msgstr "Réseaux"
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr "Il y a déjà une zone de notification"
+
+#: src/modules/systray/e_mod_main.c:872
+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:1070
+msgid "Systray"
+msgstr "Zone de notification"
+
+#~ msgid "Mount of device failed"
+#~ msgstr "Impossible de monter le périphérique"
+
 #~ msgid "Shelf Size"
 #~ msgstr "Taille du rack"
 
diff --git a/po/fr_CH.gmo b/po/fr_CH.gmo
index da1dc23..a617445 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 33c4bd0..e4be332 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-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2007-06-04 11:27+0100\n"
 "Last-Translator: Antoine Giniès <aginies.cooker at gmail.com>\n"
 "Language-Team: Enlightenment i18n French <enlightenment-intl at lists."
@@ -42,20 +42,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "À propos d'Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -103,46 +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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Oui"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Non"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Êtes-vous sûr de vouloir quitter ?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Êtes-vous sur de vouloir fermer votre session ?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Êtes-vous sur de vouloir éteindre ?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -150,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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Êtes-vous sûr de vouloir redémarrer ?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -162,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:2047
+#: src/bin/e_actions.c:2061
 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:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Êtes-vous sur de vouloir hiberner ?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -181,338 +183,338 @@ msgstr ""
 "Vous avez demandé à hiberner votre ordinateur.<br><br>Êtes-vous sur de "
 "vouloir le mettre en hibernation ?"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Fenêtre : actions"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Déplacer"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Changer la taille (resize)"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Menu de la fenêtre"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Monter"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Descendre"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Tuer"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Fenêtre : état"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Ancrage (on/off)"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Iconifier (on/off)"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Plein écran (on/off)"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Maximiser verticalement"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Maximiser horizontalement"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Maximiser en mode \"plein écran\""
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximiser en mode \"intelligent\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximiser en mode \"expansion\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximiser en mode \"remplissage\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Ombre vers le haut (on/off)"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Ombre vers le bas (on/off)"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "Ombre vers la gauche (on/off)"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Ombre vers la droite (on/off)"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Enroulement (on/off)"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Sans bordure (on/off)"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "Ancrage (on/off)"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Bureau"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Vers le bureau à gauche"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Vers le bureau à droite"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Vers le bureau au dessus"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Vers le bureau en dessous"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Se déplacer de ... bureaux"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Afficher le bureau"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "Afficher le bureau"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Aller au bureau ..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Se déplacer linéairement de ... bureaux"
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Aller au bureau 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Aller au bureau 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Aller au bureau 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Aller au bureau 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Aller au bureau 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Aller au bureau 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Aller au bureau 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Aller au bureau 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Aller au bureau 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Aller au bureau 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Aller au bureau 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Aller au bureau 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Aller au bureau..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Vers le bureau à gauche"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Vers le bureau à droite"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Vers le bureau au dessus"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Vers le bureau en dessous"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Se déplacer de ... bureaux"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Aller au bureau ..."
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Se déplacer linéairement de ... bureaux"
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "Aller au bureau ..."
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Aller au bureau 0"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Aller au bureau 1"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Aller au bureau 2"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Aller au bureau 3"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Aller au bureau 4"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Aller au bureau 5"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Aller au bureau 6"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Aller au bureau 7"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Aller au bureau 8"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Aller au bureau 9"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Aller au bureau 10"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Aller au bureau 11"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Aller au bureau..."
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -522,103 +524,118 @@ msgstr "Aller au bureau..."
 msgid "Screen"
 msgstr "Écran"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Envoyer la souris à l'écran 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Envoyer la souris à l'écran 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Envoyer la souris à l'écran..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Envoyer la souris à l'écran suivant"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Envoyer la souris à l'écran précédent"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Envoyer la souris ... écrans plus loin"
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Fenêtre : déplacement"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "Déplacer vers le bureau suivant"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Déplacer vers le bureau précédent"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "Déplacer vers de ... bureaux"
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Déplacer vers le bureau..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Afficher le menu principal"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Afficher le menu des applications favorites"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Afficher le menu des applications"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Afficher le menu des clients"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Afficher le menu..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Commande"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Application"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 #, fuzzy
 msgid "Exit Now"
 msgstr "Quitter"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Module %s d'Enlightenment"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Plein écran (on/off)"
+
+#: src/bin/e_actions.c:2813
+#, 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -631,60 +648,60 @@ msgstr "Quitter"
 msgid "System"
 msgstr "Système"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Fermer la session"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Roupiller"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Hiberner"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 #, fuzzy
 msgid "Lock"
 msgstr "Verrous"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Ré-arranger les fenêtres"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "Fenêtre : actions"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Delayed Action"
 msgstr "Actions de module"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 #, fuzzy
 msgid "Set As Background"
 msgstr "Fonds d'écran"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 #, fuzzy
 msgid "Desktop files scan done"
 msgstr "Scan des fichiers du bureau terminé"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "Scan des fichiers du bureau"
@@ -694,13 +711,14 @@ 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:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -715,7 +733,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -727,7 +745,7 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -748,7 +766,7 @@ msgstr ""
 "reconfigurer tout à votre goût comme avant.<br>Désolé pour le désagrément "
 "occasionné.<br>"
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -764,12 +782,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:1629
+#: src/bin/e_config.c:1689
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "Paramètre du bureau"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, fuzzy, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -781,7 +799,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:1663
+#: src/bin/e_config.c:1723
 #, fuzzy, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -797,7 +815,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:1676
+#: src/bin/e_config.c:1736
 #, fuzzy, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -811,7 +829,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:1687
+#: src/bin/e_config.c:1747
 #, fuzzy, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -825,7 +843,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:1699
+#: src/bin/e_config.c:1759
 #, fuzzy, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -836,12 +854,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:1724
+#: src/bin/e_config.c:1784
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problèmes d'écriture de la configuration d'Enlightenment"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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,7 +885,7 @@ 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Extensions"
 
@@ -876,22 +894,22 @@ msgstr "Extensions"
 msgid "Container %d"
 msgstr "Conteneur %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Erreur - pas de support PAM"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 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:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Échec du verrouillage"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -900,15 +918,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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Veuillez entrer votre mot de passe pour dévérouiller"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Erreur du gestionnaire d'authentification"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -920,6 +938,25 @@ 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
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Propriétés de fenêtre incomplètes"
@@ -1022,23 +1059,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:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Couper"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Copier"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Coller"
 
@@ -1072,271 +1109,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:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Erreur lors de l'exécution de l'application"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s c'est arrêté de façon inattendue."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, 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:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s a été interrompu avec SIGINT"
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s a été interrompu avec SIGQUIT."
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s a été interrompu avec SIGABRT."
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, 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:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s a été interrompu avec SIGKILL."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, 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:460
+#: src/bin/e_exec.c:461
 #, 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:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s a été interrompu avec SIGTERM."
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, 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:469
+#: src/bin/e_exec.c:470
 #, 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:525
+#: src/bin/e_exec.c:528
 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:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Historique des erreurs"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Il n'y a eu aucun message d'erreur."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Sauver ce message"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, 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:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Informations sur l'erreur"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Information sur le signal d'erreur"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Données de sortie"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Il n'y a eu aucune sortie."
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Erreur d'exécution"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Erreur d'exécution"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Erreur"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i fichiers"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 #, fuzzy
 msgid "Link"
 msgstr "Linéaire"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 #, fuzzy
 msgid "Abort"
 msgstr "À propos"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Paramètres de sélection"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 #, fuzzy
 msgid "View Mode"
 msgstr "Mode de vue"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Rafraîchir la vue"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Afficher les fichiers cachés"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "Se souvenir de l'ordre"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Classer maintenant"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nouveau dossier"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Élément de menu"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 #, fuzzy
 msgid "Use default"
 msgstr "Utiliser Valeurs par défaut"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 #, fuzzy
 msgid "Grid Icons"
 msgstr "Grille d'icônes"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 #, fuzzy
 msgid "Custom Icons"
 msgstr "Personnalisé"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 #, fuzzy
 msgid "List"
 msgstr "Liste de fenêtres"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "Taille de l'icône"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Fonds d'écran"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "Contenu du tablar"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+#, fuzzy
+msgid "Clear"
+msgstr "Supprimer"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Créer un nouveau dossier"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Nom du nouveau dossier :"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renommer %s en :"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Renommer le fichier"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 #, fuzzy
 msgid "Retry"
 msgstr "Redémarrer"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Erreur"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "Démarrage de %s"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, 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:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Confirmer la suppression"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, 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:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1397,8 +1489,8 @@ msgid "Preview"
 msgstr "Pré-visualisation"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: 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"
 
@@ -1407,7 +1499,7 @@ msgid "Thumbnail"
 msgstr "Miniature"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Personnalisé"
 
@@ -1423,70 +1515,70 @@ msgstr "Informations sur le lien"
 msgid "Select an Image"
 msgstr "Sélectionner une image"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "volume inconnu"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "Périphérique amovible"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Tel quel"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Encart"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Apparence"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Défilement automatique du contenu"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Permettre le redimensionnement"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Déplacer / redimensionner ce gadget"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Supprimer ce gadget"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "Arrêter de Déplacer/redimensionner ce gadget"
 
@@ -1537,8 +1629,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1546,7 +1638,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Empilement"
 
@@ -1732,12 +1824,12 @@ msgstr "Plein écran"
 msgid "Window List"
 msgstr "Liste des fenêtres"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Pager"
 
@@ -2015,11 +2107,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 #, fuzzy
 msgid "Settings"
 msgstr "Paramètre du bureau"
@@ -2060,8 +2152,8 @@ msgstr "Modules chargés"
 msgid "Unload Module"
 msgstr "Décharger le module"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2092,13 +2184,13 @@ msgstr "Gadgets sélectionnés"
 msgid "Remove Gadget"
 msgstr "Supprimer ce gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 #, fuzzy
 msgid "Toolbar Settings"
 msgstr "Paramètres d'apparition"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Positionnement"
 
@@ -2184,125 +2276,125 @@ msgstr "(Aucune fenêtre)"
 msgid "No name!!"
 msgstr "Aucun Nom !"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(Aucun tablar)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Tablar #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Ajouter tablar"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Supprimer un tablar"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: 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:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Miquelet"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Moyen"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grand"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Énorme"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Contenu du tablar"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Au-dessus de tout"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Sous les fenêtres"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "En-dessous de tout"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "Autoriser les fenêtres à cacher ce tablar"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Redimensionner à la taille du contenu"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Styles"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 #, fuzzy
 msgid "Auto Hide"
 msgstr "Caché automatiquement"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "Cacher automatiquement le tablar"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 #, fuzzy
 msgid "Show on mouse in"
 msgstr "Afficher sur la zone d'écran :"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "Afficher avec un clic souris"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "Délai pour cacher"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%1.1f secondes"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "Caché durant.."
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 #, fuzzy
 msgid "Show on all Desktops"
 msgstr "Sur tous les bureaux"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 #, fuzzy
 msgid "Show on specified Desktops"
 msgstr "Afficher le bureau spécifiés"
@@ -2712,7 +2804,7 @@ msgstr ""
 
 #: src/bin/e_main.c:867
 #, fuzzy
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr "Réservation de périphériques d'entrée (grab input handling)"
 
 #: src/bin/e_main.c:872
@@ -2925,11 +3017,18 @@ msgstr "Module %s d'Enlightenment"
 msgid "Would you like to unload this module?<br>"
 msgstr "Voulez-vous décharger ce module ?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -2937,20 +3036,20 @@ msgstr ""
 "Vous avez demandé à supprimer ce tablar.<br><br>Êtes-vous sur de vouloir la "
 "supprimer ?"
 
-#: src/bin/e_shelf.c:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 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:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 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:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Contenu du tablar"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Supprimer ce tablar"
 
@@ -3131,7 +3230,7 @@ msgstr "À propos de ce thème"
 msgid "Set As Theme"
 msgstr "Sélectionner un thème..."
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Configurer le contenu du tablar"
@@ -3150,67 +3249,67 @@ 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:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f bytes"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "Dans le futur"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "Durant la dernière minute"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "il y a %li année(s)"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "il y a %li mois"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "il y a %li semaines"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "il y a %li jours"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "il y a %li heures"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "il y a %li minutes"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3222,7 +3321,7 @@ msgstr "Inconnu"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Ajouter"
 
@@ -3246,7 +3345,7 @@ msgid "Add to Favorites"
 msgstr "Ajouter aux favoris"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3368,6 +3467,7 @@ msgid "Internal"
 msgstr "Interne"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
@@ -3380,25 +3480,25 @@ msgstr ""
 msgid "Battery"
 msgstr "Batterie"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "Afficher une alerte dès que la batterie est faible"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 #, fuzzy
 msgid "Battery Meter"
 msgstr "Batterie"
@@ -3408,11 +3508,26 @@ msgid "Clock"
 msgstr "Horloge"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 #, fuzzy
 msgid "Settings Panel"
 msgstr "Paramètre du bureau"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Paramètre du bureau"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "Délai avant d'éteindre"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Modules"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3435,7 +3550,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:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "Toutes les applications"
 
@@ -3799,42 +3914,55 @@ msgstr "Tout selectionner"
 msgid "Desk"
 msgstr "Bureau"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "Paramètres de verrouillage d'écran"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Verrouillage automatique"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 #, fuzzy
 msgid "Lock when Enlightenment starts"
 msgstr "Utiliser le curseur d'Enlightenment"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
 msgstr "Verrouiller lors du démarrage de l'écran de veille"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+msgid "Time after screensaver activated"
+msgstr "Délai avant le changement d'écran de veille"
+
+#: 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 secondes"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
 msgid "Lock when idle time exceeded"
 msgstr "Verrouillé quand le temps d'attente est dépassé"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:184
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
 msgid "Idle time to exceed"
 msgstr "Temps de non activité à dépassé"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 minutes"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3845,27 +3973,27 @@ msgstr "%1.0f minutes"
 msgid "Personal"
 msgstr "Personnel"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Paramètres de la box de Login"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
 msgstr "Afficher sur toutes les zones d'écran"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr "Afficher sur la zone d'écran courante"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
 msgstr "Afficher sur la zone d'écran :"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3874,29 +4002,49 @@ msgstr "Afficher sur la zone d'écran :"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Type de fond d'écran"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
 #: src/modules/gadman/e_mod_config.c:149
 msgid "Theme Defined"
 msgstr "Défini par le thème"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Fond d'écran du thème"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "Utiliser le fond d'écran du thème"
+
+#: 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 "Verrouillage d'écran personnel"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "Utilisé un verrouillage d'écran personnel"
 
@@ -3904,60 +4052,75 @@ msgstr "Utilisé un verrouillage d'écran personnel"
 msgid "Screen Lock"
 msgstr "Verrouillage d'écran"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "Configuration des Bureaux virtuels"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Nombre de bureaux"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Feuilletage des bureaux à la souris"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "Feuilletage animé"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 #, fuzzy
 msgid "Desktops"
 msgstr "Bureau"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Feuilleter lors de déplacements d'objets au bord de l'écran"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: src/modules/conf_desks/e_int_config_desks.c:298
 msgid "Wrap desktops around when flipping"
 msgstr "Tourner en boucle lors du feuilletage"
 
-#: src/modules/conf_desks/e_int_config_desks.c:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "Animation du feuilletage"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Aucune"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "Vitre"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 s"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Changement de fond d'écran"
+
+#: 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 "Bureaux virtuels"
@@ -3974,8 +4137,8 @@ msgstr "Paramètres des fenêtres de configuration"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -4154,24 +4317,24 @@ msgstr "L'affichage courant n'a pas le support<br>DPMS."
 msgid "Display Power Management Settings"
 msgstr "Afficher la gestion d'énergie"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
 msgid "Enable Display Power Management"
 msgstr "Activé l'affiche de la gestion d'énergie"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 #, fuzzy
 msgid "Timers"
 msgstr "Compte à rebours"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "Délai avant roupillon"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "Délai avant hibernation"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "Délai avant d'éteindre"
 
@@ -4768,7 +4931,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pixels"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4994,7 +5157,7 @@ msgid "Select an Edj File"
 msgstr "Sélectionner un fichier 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Fichiers"
 
@@ -5360,55 +5523,50 @@ msgstr "Taille maximale"
 msgid "Scaling"
 msgstr "Empilement"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Paramètres de l'écran de veille"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 "Activer l'écran de veille"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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 "Délais de l'écran de veille"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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 "Délai avant le démarrage de l'écran de veille"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
 msgstr "Délai avant le changement d'écran de veille"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f secondes"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "Eteindre (blanking)"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Préféré"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "Non préféré"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr "Evenement d'exposition"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Autoriser"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "Ne pas autoriser"
 
@@ -5421,7 +5579,7 @@ msgid "Configured Shelves"
 msgstr "tablars configurés"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Gestionnaire de fichiers"
@@ -5471,11 +5629,6 @@ msgstr "Catégories"
 msgid "Assign"
 msgstr "Atitrer"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-#, fuzzy
-msgid "Clear"
-msgstr "Supprimer"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 #, fuzzy
 msgid "Clear All"
@@ -6364,29 +6517,20 @@ msgstr "Ombre portée"
 msgid "Run Command Dialog"
 msgstr "Fenêtre d'exécution de commande"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "Erreur d'exécution"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: 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:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
 msgstr "Favoris"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 #, fuzzy
 msgid "Root"
 msgstr "Redémarrer"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: src/modules/fileman/e_mod_main.c:431
 #, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
@@ -6407,7 +6551,7 @@ msgstr ""
 "reconfigurer tout à votre goût comme avant.<br>Désolé pour le désordre "
 "occasionné.<br>"
 
-#: src/modules/fileman/e_mod_main.c:454
+#: src/modules/fileman/e_mod_main.c:444
 #, fuzzy
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
@@ -6424,102 +6568,110 @@ msgstr ""
 "sain et par précaution votre<br>configuration a été remise à zéro. Désolé "
 "pour les désagréments.<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 #, fuzzy
 msgid "Fileman Settings Updated"
 msgstr "Paramètres du gestionnaire de fichiers"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 #, fuzzy
 msgid "Fileman Settings"
 msgstr "Paramètres du gestionnaire de fichiers"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 #, fuzzy
 msgid "Icon Size"
 msgstr "Taille de l'icône"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
 msgstr "Voir"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr "Ne pas ouvrir dans une nouvelle fenêtre"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "Afficher les répertoires en premier"
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Taille de base"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "Utiliser un simple clic"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 #, fuzzy
 msgid "Show Icon Extension"
 msgstr "Afficher l'extension du fichier"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "Afficher le chemin complet"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 #, fuzzy
 msgid "Show Desktop Icons"
 msgstr "Afficher les icônes sur le bureau"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 #, fuzzy
 msgid "Show Toolbar"
 msgstr "Couleur de l'ombre"
 
-#: src/modules/fileman/e_mod_config.c:257
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:729
+msgid "Behavior"
+msgstr "Comportement"
+
+#: src/modules/fileman/e_mod_config.c:270
 #, fuzzy
 msgid "Show HAL icons on desktop"
 msgstr "Sur tous les bureaux"
 
-#: src/modules/fileman/e_mod_config.c:261
-#: src/modules/gadman/e_mod_gadman.c:729
-msgid "Behavior"
-msgstr "Comportement"
+#: 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:1187
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr "Aller au dossier parent"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "Ajouter une application..."
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Ouvrir avec..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "Applications"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Applications spécifiques"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 #, fuzzy
 msgid "Custom Command"
 msgstr "Exécuter une commande"
@@ -6621,40 +6773,40 @@ msgstr "Fenêtre précédente"
 msgid "Select a window"
 msgstr "Sélectionner une fenêtre"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 #, fuzzy
 msgid "IBar Settings"
 msgstr "Paramètres d'apparition"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Source de Bar sélectionnée"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Description de l'icône"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Montrer la description de l'icone"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "Afficher le nom de l'application"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "Afficher le commentaire de l'application"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "Afficher l'information générique de l'application"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "Créer une source IBar"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "Entrer un nom pour la source :"
 
@@ -6671,29 +6823,29 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Êtes-vous sûr de vouloir supprimer cette source de barre ?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Changer les propriétés de l'icône"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Supprimer l'icône"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 #, fuzzy
 msgid "Add An Icon"
 msgstr "Ajouter une applications"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 #, fuzzy
 msgid "Create New Icon"
 msgstr "Créer une icône"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Ajouter une applications"
 
@@ -6747,99 +6899,99 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr "Paramètres du Pager"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 msgid "Flip desktop on mouse wheel"
 msgstr "Changer de bureau avec la molette de la souris"
 
-#: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:164
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 #, fuzzy
 msgid "Show desktop names"
 msgstr "Afficher les icônes sur le bureau"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 #, fuzzy
 msgid "Popup Settings"
 msgstr "Paramètres de popup du Pager"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 #, fuzzy
 msgid "Show popup on desktop change"
 msgstr "Afficher un message lors changement bureau"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 #, fuzzy
 msgid "Show popup for urgent windows"
 msgstr "Afficher les Popup sur le fenêtre urgente"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr "Bouton de 'sélectionner/glisser'"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "Cliquer pour configurer"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 #, fuzzy
 msgid "Drag and Drop button"
 msgstr "Bouton de glisser/déposer"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 #, fuzzy
 msgid "Drag whole desktop"
 msgstr "Bureau virtuel"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f pixels"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "Résistance aux glisser:"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 #, fuzzy
 msgid "Popup pager height"
 msgstr "Vitesse du popup"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 #, fuzzy
 msgid "Popup speed"
 msgstr "Vitesse du popup"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f secondes"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 #, fuzzy
 msgid "Urgent Window Settings"
 msgstr "Paramètres de la liste de fenêtres"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 #, fuzzy
 msgid "Show popup on urgent window"
 msgstr "Afficher les Popup sur le fenêtre urgente"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 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:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr "Capture de la touche pour le pager"
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6848,12 +7000,12 @@ msgstr ""
 "hilight> pour annuler.<br>Ou<br><hilight>Suppr</hilight>pour ré-initialisé "
 "le bouton."
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:343
 #, fuzzy
 msgid "Attetion"
 msgstr "Action"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 #, fuzzy
 msgid ""
 "You cannot use the right mouse button in the<br>shelf for this as it is "
@@ -6863,33 +7015,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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Bouton %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 #, fuzzy
 msgid "Show Pager Popup"
 msgstr "Paramètres de popup du Pager"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "Vers le bureau à droite"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "Vers le bureau à gauche"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "Vers le bureau au dessus"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "Vers le bureau en dessous"
@@ -7160,7 +7312,7 @@ msgstr ""
 msgid "Right:"
 msgstr "Clair"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 #, fuzzy
 msgid "Mute"
 msgstr "Élément de menu"
@@ -7207,12 +7359,12 @@ msgstr "Paramètres du module"
 msgid "Mixer Settings Updated"
 msgstr "Configuration du gestionnaire de fichiers mise à jour"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 #, fuzzy
 msgid "Controls"
 msgstr "Fixer le controleur"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -7251,6 +7403,19 @@ msgstr "Applications spécifiques"
 msgid "Networks"
 msgstr ""
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "Système"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Configurer les bureaux virtuels"
 
diff --git a/po/he.gmo b/po/he.gmo
index f5c2918..58cfa0a 100644
Binary files a/po/he.gmo and b/po/he.gmo differ
diff --git a/po/he.po b/po/he.po
index e99b705..d8bae5f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2009-02-18 16:40+0000\n"
 "Last-Translator: Yaron <sh.yaron at gmail.com>\n"
 "Language-Team: Hebrew <he at li.org>\n"
@@ -18,20 +18,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "אודות Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -74,68 +74,70 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "האם אתה בטוח שברצונך לחסל חלון זה?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "כן"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "לא"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "האם אתה בטוח שברצונך לצאת?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "ביקשת לצאת מ־Enlightenment.<br><br>האם אתה בטוח שברצונך לצאת?"
 
-#: src/bin/e_actions.c:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "אתה בטוח שברצונך להתנתק?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "האם אתה בטוח שברצונך לכבות?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "האם אתה בטוח שברצונך לאתחל?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 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:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "ביקשת להשהות את המחשב שלך.<br><br>האם אתה בטוח שברצונך להשהות?"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "האם אתה בטוח שברצונך לעבור למצב המתנה?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -143,316 +145,316 @@ msgstr ""
 "ביקשת להעביר את המחשב למצב המתנה.<br><br>האם אתה בטוח שברצונך להשהות אל "
 "הכונן?"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "חלון : פעולות"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "העבר"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "שנה גודל"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "תפריט"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "תפריט החלון"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "הגבה"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "הנמך"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "חסל"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "חלון : מצב"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "החלפת מצב הדבקה"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "החלפת מצב ממוזער"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "החלפת מצב מסך מלא"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "הגדל"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "הגדל אנכית"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "הגדל אופקית"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "הגדל למסך מלא"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "מצב הגדלה \"חכם\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "מצב הגדלה \"הרחבה\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "מצב הגדלה \"מילוי\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "החלפת מצב הצללה"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "החלפת מצב הצללה תחתית"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "החלפת מצב הצללה שמאלית"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "החלפת מצב הצללה ימנית"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "החלפת מצב ההצללה"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "החלפת מצב המסגרת"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "החלפת מצב הנעיצה"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "שולחן העבודה"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "הפוך את שולחן העבודה שמאלה"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "הפוך את שולחן העבודה ימינה"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "הפוך את שולחן העבודה למעלה"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "הפוך את שולחן העבודה למטה"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "הפוך את שולחן העבודה ב־..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "הצג את שולחן העבודה"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
 msgstr ""
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "הפוך את שולחן העבודה אל..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "הפוך את שולחן העבודה קווית..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "החלף לשולחן העבודה 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "החלף לשולחן העבודה 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "החלף לשולחן העבודה 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "החלף לשולחן העבודה 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "החלף לשולחן העבודה 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "החלף לשולחן העבודה 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "החלף לשולחן העבודה 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "החלף לשולחן העבודה 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "החלף לשולחן העבודה 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "החלף לשולחן העבודה 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "החלף לשולחן העבודה 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "החלף לשולחן העבודה 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "החלף לשולחן העבודה..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
 msgstr "הפוך את שולחן העבודה שמאלה (כל המסכים)"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr "הפוך את שולחן העבודה ימינה (כל המסכים)"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
 msgstr "הפוך את שולחן העבודה למעלה (כל המסכים)"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
 msgstr "הפוך את שולחן העבודה למטה (כל המסכים)"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr "הפוך את שולחן העבודה ב־... (כל המסכים)"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr "הפוך את שולחן העבודה אל... (כל המסכים)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "הפוך את שולחן העבודה קווית... (כל המסכים)"
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "החלף לשולחן העבודה 0 (כל המסכים)"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "החלף לשולחן העבודה 1 (כל המסכים)"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "החלף לשולחן העבודה 2 (כל המסכים)"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "החלף לשולחן העבודה 3 (כל המסכים)"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "החלף לשולחן העבודה 4 (כל המסכים)"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "החלף לשולחן העבודה 5 (כל המסכים)"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "החלף לשולחן העבודה 6 (כל המסכים)"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "החלף לשולחן העבודה 7 (כל המסכים)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "החלף לשולחן העבודה 8 (כל המסכים)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "החלף לשולחן העבודה 9 (כל המסכים)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "החלף לשולחן העבודה 10 (כל המסכים)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "החלף לשולחן העבודה 11 (כל המסכים)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
 msgstr "החלף לשולחן העבודה... (כל המסכים)"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -462,102 +464,117 @@ msgstr "החלף לשולחן העבודה... (כל המסכים)"
 msgid "Screen"
 msgstr "מסך"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "שלח את העכבר למסך 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "שלח את העכבר למסך 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "שלח את העכבר למסך..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "שלח את העכבר מסך 1 קדימה"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "שלח את העכבר מסך 1 אחורה"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "שלח את העכבר קדימה/אחורה בין המסכים..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "חלון : בתנועה"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "לשולחן העבודה הבא"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "לשולחן העבודה הקודם"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "לפי מס' שולחן העבודה..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "לשולחן העבודה..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "הצג תפריט ראשי"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "הצג תפריט מועדפים"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "הצג תפריט כל היישומים"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "הצג תפריט לקוחות"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "הצג תפריט..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "פקודה"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "יישום"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "הפעל מחדש"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "יציאה"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "מודול ה־%s של Enlightenment"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "החלפת מצב מסך מלא"
+
+#: src/bin/e_actions.c:2813
+#, 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -570,55 +587,55 @@ msgstr ""
 msgid "System"
 msgstr "מערכת"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "התנתק"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "הפעלה מחדש"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "השהיה"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr ""
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 msgid "Lock"
 msgstr ""
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "ניקוי החלונות"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr "כללי : פעולות"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
 msgstr "פעולה מעוכבת"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "הגדרה כרקע"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "סריקת קבצי שולחן העבודה הושלמה"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "סריקת קבצי שולחן העבודה"
 
@@ -626,13 +643,14 @@ msgstr "סריקת קבצי שולחן העבודה"
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -647,7 +665,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -659,7 +677,7 @@ msgstr "אישור"
 msgid "Cancel"
 msgstr "ביטול"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 "
@@ -670,7 +688,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -679,11 +697,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
 msgstr "ההגדרות שודרגו"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -694,7 +712,7 @@ msgstr ""
 "את<br>מקור השגיאה.<br><br>הקובץ בו ארעה השגיאה הינו:<br>%s<br><br>קובץ זה "
 "נמחק מחשש לנתונים פגומים.<br>"
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -704,7 +722,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -713,7 +731,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -722,7 +740,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -730,11 +748,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr "בעיות בכתיבה להגדרות Enlightenment"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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,7 +778,7 @@ 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "הרחבות"
 
@@ -769,21 +787,21 @@ msgstr "הרחבות"
 msgid "Container %d"
 msgstr "מיכל %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "שגיאה - אין תמיכה ב־PAM"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "לא הוטמעה תמיכת PAM ב־Enlightenment, לכן<br>נעילת שולחן העבודה אינה פעילה."
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "הנעילה נכשלה"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -791,15 +809,15 @@ msgstr ""
 "נעילת שולחן העבודה נכשלה כיוון שאחד היישומים<br>לכד את המקלדת או העכבר או את "
 "שניהם<br>ולא ניתן לשחרר את לכידתם."
 
-#: src/bin/e_desklock.c:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "נא הזינו את סיסמת השיחרור"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "שגיאה במערכת האימות"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -810,6 +828,25 @@ msgstr ""
 "<hilight>%i</hilight>.<br>מצב זה הינו בעייתי ולא אמור לקרות. אנא דווחו על "
 "תקלה זו."
 
+#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "מאפייני החלון אינם מלאים"
@@ -904,23 +941,23 @@ msgstr "בחר סמל"
 msgid "Select an Executable"
 msgstr "בחר קובץהפעלה"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "מחק"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "גזור"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "העתק"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "הדבק"
 
@@ -954,260 +991,314 @@ msgstr ""
 "Enlightenment לא הצליחה להפעיל את היישום:<br><br>%s<br><br>הפעלת היישום "
 "נכשלה."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "שגיאה בהפעלת היישום"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "פעולת %s נעצרה באופן בלתי צפוי."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "נתקבל קוד היציאה %i מ־%s."
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות הפרעה."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות יציאה."
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות ביטול."
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "התרחשה הפרעה ליישום %s על ידי שגיאת נקודת ציפה."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות חיסול ללא־פסק."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "התרחשה הפרעה ליישום %s על ידי כשל קיטוע."
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "התרחשה הפרעה ליישום %s על ידי מחרוזת קטועה."
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות חיסול."
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "התרחשה הפרעה ליישום %s על ידי שגיאת אפיק."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות מספר %i."
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***שאר הפלט נקטע. שמור את הפלט כדי להציג את השאר.****\n"
 
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "יומני שגיאות"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "אין הודעת שגיאה"
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "שמור הודעה זו"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "יומן שגיאות זה יישמר כ־%s/%s.log"
 
-#: src/bin/e_exec.c:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "נתוני השגיאה"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "נתוני אות השגיאה"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "נתוני הפלט"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "אין פלט."
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr "נתיב לא קיים"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s לא קיים."
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "שגיאת הפעלה"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "שגיאת הפעלה"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "שגיאה"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i קבצים"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr "בטל"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "מצב תצוגה"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "רענן תצוגה"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "הצג קבצים מוסתרים"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "זכור את הסדר"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "סדר כעת"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "תיקייה חדשה"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "שינוי שם"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "אודות"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "מאפיינים"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
 msgstr "השתמש בברירת המחדל"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "רשת סמלים"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "סמלים מותאמים אישית"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "רשימה"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "גודל הסמל (%d)"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "הגדרה כרקע"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "תכני המדף"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr ""
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "יצירת תיקייה חדשה"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "שם התיקייה החדשה:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "שנה את שמה של %s ל־:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "שנה את שם הקובץ"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr "נסה שוב"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr "לא להכול"
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr "כן להכול"
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "מתחיל"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "האם אתה בטוח שברצונך למחוק את<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr "התעלם מזה"
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr "התעלם מהכול"
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "ארעה שגיאה בעת ביצוע פעולה.<br>%s"
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "אישור מחיקה"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "האם אתה בטוח שברצונך למחוק את<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1268,8 +1359,8 @@ msgid "Preview"
 msgstr "תצוגה מקדימה"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "ברירת מחדל"
 
@@ -1278,7 +1369,7 @@ msgid "Thumbnail"
 msgstr "תמונה ממוזערת"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "מותאם אישית"
 
@@ -1294,70 +1385,70 @@ msgstr "נתוני הקישור"
 msgid "Select an Image"
 msgstr "בחר תמונה"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu ט\"ב"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu ג\"ב"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu מ\"ב"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu ק\"ב"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu ב'"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr "נפח לא ידוע"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "התקן נתיק"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "פשוט"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "צמצום"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "חזות"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "גלול את התוכן אוטומטית"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "בעל גודל הניתן לשינוי"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "התחל בהזזת/שינוי הגודל של חפיץ זה"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "הסר חפיץ זה"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "הפסקת הזזת/שינוי הגודל של חפיץ זה"
 
@@ -1408,8 +1499,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1417,7 +1508,7 @@ msgstr "גודל"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
 #: src/bin/e_int_border_menu.c:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "איסוף בערימה"
 
@@ -1595,12 +1686,12 @@ msgstr "מסך מלא"
 msgid "Window List"
 msgstr "רשימת חלונות"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "מחליף סביבות עבודה"
 
@@ -1850,11 +1941,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr "הגדרות"
 
@@ -1888,8 +1979,8 @@ msgstr "מודולים שנטענו"
 msgid "Unload Module"
 msgstr "פריקת מודול"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1919,12 +2010,12 @@ msgstr "יישומונים נבחרים"
 msgid "Remove Gadget"
 msgstr "הסרת יישומון"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: 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:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "פריסה"
 
@@ -2007,122 +2098,122 @@ msgstr "(אין חלונות)"
 msgid "No name!!"
 msgstr "אין שם!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(אין מדפים)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "מדף מס'"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "הוסף מדף"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "מחק מדף"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "הגדרות מדף"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "זעיר"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "בינוני"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "גדול"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "ענק"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "תכני המדף"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "מעל להכל"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "מתחת לחלונות"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "מתחת להכל"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "אפשר לחלונות לחפוף מעל למדף"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "צמצמם לגודל התוכן"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f פיקסלים"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "סגנונות"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "הסתר אוטומטית"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "הסתר את המדף אוטומטית"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "הצג עם כניסת העכבר"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "הצג עם לחיצת העכבר"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "משך הזמן עד להסתרה"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f שניות"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "מסך ההסתרה"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "הצג על כל שולחנות העבודה"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "הצג בשולחנות עבודה מסויימים"
 
@@ -2473,7 +2564,8 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת ה־dnd שלה."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+#, fuzzy
+msgid "Setup Grab Input Handling"
 msgstr "הגדרת הטיפול בקלט הגרירה"
 
 #: src/bin/e_main.c:872
@@ -2660,30 +2752,37 @@ msgstr "מודול ה־%s של Enlightenment"
 msgid "Would you like to unload this module?<br>"
 msgstr "האם ברצונך לפרוק מודול זה?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 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:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "הפסקת הזזה/שינוי גודל לפריטים"
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "התחלת הזזה/שינוי גודל לפריטים"
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "תכני המדף"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "מחיקת מדף זה"
 
@@ -2827,7 +2926,7 @@ msgstr "אודות ערכות הנושא"
 msgid "Set As Theme"
 msgstr "הגדרה כערכת נושא"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "תכני סרגל הכלים"
@@ -2845,67 +2944,67 @@ msgstr ""
 "לכמה מהחלונות נותרה נעילת משך החיים. כלומר<br>ש־Enlightenment לא תרשה לעצמה "
 "לצאת עד שחלונות אלו<br>יסגרו או שתוסר נעילת משך החיים.<br>"
 
-#: src/bin/e_utils.c:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f בתים"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f ק\"ב"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f מ\"ב"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f ג\"ב"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "בעתיד"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "בדקה האחרונה"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "לפני %li שנים"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "לפני %li חודשים"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "לפני %li שבועות"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "לפני %li ימים"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "לפני %li שעות"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "לפני %li דקות"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -2917,7 +3016,7 @@ msgstr "לא ידוע"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "הוסף"
 
@@ -2940,7 +3039,7 @@ msgid "Add to Favorites"
 msgstr "הוסף למועדפים"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3054,6 +3153,7 @@ msgid "Internal"
 msgstr "פנימי"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
@@ -3065,24 +3165,24 @@ msgstr ""
 msgid "Battery"
 msgstr "סוללה"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr "הסוללה שלך חלשה!"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr "מומלץ לחבר לרשת החשמל."
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr "לא זמין"
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr "שגיאה"
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr "מד הסוללה"
 
@@ -3091,10 +3191,24 @@ msgid "Clock"
 msgstr "שעון"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
 msgstr "פאנל ההגדרות"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "מיקום"
+
+#: src/modules/conf/e_mod_main.c:241
+msgid "Offline"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+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"
@@ -3117,7 +3231,7 @@ msgid "Restart Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "כל היישומים"
 
@@ -3473,41 +3587,53 @@ msgstr ""
 msgid "Desk"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: 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:176
+#: 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:180
+#: 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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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:240
+#: 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
@@ -3518,27 +3644,27 @@ msgstr "%1.0f דקות"
 msgid "Personal"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: 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:337
+#: 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:341
+#: 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:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3547,29 +3673,49 @@ msgstr ""
 #: 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/fileman/e_mod_config.c:220
+#: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+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:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr ""
 
@@ -3577,59 +3723,73 @@ msgstr ""
 msgid "Screen Lock"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: 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:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 ""
@@ -3645,8 +3805,8 @@ msgstr ""
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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 ""
@@ -3796,23 +3956,23 @@ msgstr ""
 msgid "Display Power Management Settings"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: 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:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr ""
 
@@ -4381,7 +4541,7 @@ msgid "%1.0f pixels"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4598,7 +4758,7 @@ 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr ""
 
@@ -4940,55 +5100,50 @@ msgstr ""
 msgid "Scaling"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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:168
+#: 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:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f שניות"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr ""
 
@@ -5001,7 +5156,7 @@ msgid "Configured Shelves"
 msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "הגדרת מנהל הקבצים"
@@ -5046,10 +5201,6 @@ msgstr ""
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr ""
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr ""
@@ -5888,27 +6039,19 @@ msgstr ""
 msgid "Run Command Dialog"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount error"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: 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:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -5919,7 +6062,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -5929,96 +6072,104 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 #, fuzzy
 msgid "View"
 msgstr "מצב תצוגה"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "הגודל הבסיסי"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:257
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:729
+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:261
-#: src/modules/gadman/e_mod_gadman.c:729
-msgid "Behavior"
+#: 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:1187
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "הוסף יישום..."
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "יישומים"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr ""
 
@@ -6107,39 +6258,39 @@ msgstr ""
 msgid "Select a window"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr ""
 
@@ -6154,27 +6305,27 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr ""
 
@@ -6226,128 +6377,128 @@ msgstr ""
 msgid "Pager Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: 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:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 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:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6590,7 +6741,7 @@ msgstr ""
 msgid "Right:"
 msgstr ""
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr ""
 
@@ -6630,11 +6781,11 @@ msgstr ""
 msgid "Mixer Settings Updated"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6668,6 +6819,19 @@ msgstr ""
 msgid "Networks"
 msgstr ""
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "מערכת"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "הגדר שולחנות עבודה וירטואליים"
 
diff --git a/po/hr.gmo b/po/hr.gmo
new file mode 100644
index 0000000..0cd0123
Binary files /dev/null and b/po/hr.gmo differ
diff --git a/po/hr.po b/po/hr.po
new file mode 100644
index 0000000..7e6338d
--- /dev/null
+++ b/po/hr.po
@@ -0,0 +1,7084 @@
+# Croatian translation for enlightenment
+# This file is distributed under the same license as the enlightenment package.
+# Miro Glavic <glavicmiro at gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
+"PO-Revision-Date: 2009-04-08 01:16+0000\n"
+"Last-Translator: Miro Glavic <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"
+
+#: 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:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
+#: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
+#: src/modules/conf/e_conf.c:178
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_theme/e_int_config_theme_web.c:130
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
+#: src/modules/fileman/e_fwin.c:1876 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:666
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
+#: src/modules/wizard/page_000.c:27
+msgid "Enlightenment"
+msgstr "Enlightenment"
+
+#: src/bin/e_about.c:26
+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 ""
+"Sva prava pridržana; 1999-2008, 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 "
+"COPYING i COPYING_PLAIN licencne datoteke instalirane u vašem sustavu."
+"<br><br>Enlightenment je u fazi <hilight>NAPREDNOG RAZVOJA</hilight> i nije "
+"stabilan. Mnoge značajke su nekompletne ili čak nedostaju i mogu kriti puno "
+"problema. Vi ste <hilight>UPOZORENI!</hilight>"
+
+#: src/bin/e_about.c:50
+msgid "<title>The Team</title>"
+msgstr "<title>Tim</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 ""
+"Vi namjeravate ugasiti %s.<br><br>Imajte na umu da svi podaci na ovom "
+"prozoru,<br>koji nisu pohranjeni, će biti izgubljeni!<br><br>Jeste li "
+"sigurni da hoćete zatvoriti ovaj prozor?"
+
+#: src/bin/e_actions.c:357
+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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+msgid "No"
+msgstr "Ne"
+
+#: src/bin/e_actions.c:1769
+msgid "Are you sure you want to exit?"
+msgstr "Jeste li sigurni da želite izaći?"
+
+#: src/bin/e_actions.c:1771
+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
+msgid "Are you sure you want to log out?"
+msgstr "Jeste li sigurni da se želite odjaviti?"
+
+#: src/bin/e_actions.c:1869
+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
+msgid "Are you sure you want to turn off?"
+msgstr "Jeste li sigurni da želite ugasiti?"
+
+#: src/bin/e_actions.c:1933
+msgid ""
+"You requested to turn off your Computer.<br><br>Are you sure you want to "
+"shut down?"
+msgstr ""
+"Tražili ste da ugasite vaše Računalo.<br><br>Jeste li sigurni da želite "
+"ugasiti?"
+
+#: src/bin/e_actions.c:1995
+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
+msgid ""
+"You requested to reboot your Computer.<br><br>Are you sure you want to "
+"restart it?"
+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
+msgid ""
+"You requested to suspend your Computer.<br><br>Are you sure you want to "
+"suspend?"
+msgstr ""
+"Zatražili ste da suspendirate svoje Računalo.<br><br>Jeste li sigurni da "
+"želite suspendirati?"
+
+#: src/bin/e_actions.c:2123
+msgid "Are you sure you want to hibernate?"
+msgstr "Jeste li sigurni da želite hibernirati?"
+
+#: src/bin/e_actions.c:2125
+msgid ""
+"You requested to hibernate your Computer.<br><br>Are you sure you want to "
+"suspend to disk?"
+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
+msgid "Window : Actions"
+msgstr "Prozor: Akcije"
+
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
+msgid "Move"
+msgstr "Premjesti"
+
+#: src/bin/e_actions.c:2470
+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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
+msgid "Menu"
+msgstr "Izbornik"
+
+#: src/bin/e_actions.c:2481
+msgid "Window Menu"
+msgstr "Prozorni Izbornik"
+
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
+msgid "Raise"
+msgstr "Uzdigni"
+
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
+msgid "Lower"
+msgstr "Spusti"
+
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
+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
+msgid "Window : State"
+msgstr "Prozor: Stanje"
+
+#: src/bin/e_actions.c:2509
+msgid "Sticky Mode Toggle"
+msgstr "Preklopnik Ljepljivog Moda"
+
+#: src/bin/e_actions.c:2516
+msgid "Iconic Mode Toggle"
+msgstr "Preklopnik Ikoniziranog Moda"
+
+#: src/bin/e_actions.c:2523
+msgid "Fullscreen Mode Toggle"
+msgstr "Preklopnik Moda Cijelog Zaslona"
+
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
+#: src/bin/e_int_border_menu.c:350
+msgid "Maximize"
+msgstr "Maksimiziraj"
+
+#: src/bin/e_actions.c:2532
+msgid "Maximize Vertically"
+msgstr "Maksimiziraj Vertikalno"
+
+#: src/bin/e_actions.c:2535
+msgid "Maximize Horizontally"
+msgstr "Maksimiziraj horizontalno"
+
+#: src/bin/e_actions.c:2538
+msgid "Maximize Fullscreen"
+msgstr "Maksimiziraj Cijeli Ekran"
+
+#: src/bin/e_actions.c:2540
+msgid "Maximize Mode \"Smart\""
+msgstr "Maksimiziraj \"Pametan\" Mod"
+
+#: src/bin/e_actions.c:2542
+msgid "Maximize Mode \"Expand\""
+msgstr "Maksimiziraj Mod \"Proširiti\""
+
+#: src/bin/e_actions.c:2544
+msgid "Maximize Mode \"Fill\""
+msgstr "Maksimiziraj Mod \"Popuni\""
+
+#: src/bin/e_actions.c:2551
+msgid "Shade Up Mode Toggle"
+msgstr "Preklopnik Moda Gornje Sjenke"
+
+#: src/bin/e_actions.c:2553
+msgid "Shade Down Mode Toggle"
+msgstr "Preklopnik Moda Donje Sjenke"
+
+#: src/bin/e_actions.c:2555
+msgid "Shade Left Mode Toggle"
+msgstr "Preklopnik Moda Lijeve Sjenke"
+
+#: src/bin/e_actions.c:2557
+msgid "Shade Right Mode Toggle"
+msgstr "Preklopnik Moda Desne Sjenke"
+
+#: src/bin/e_actions.c:2559
+msgid "Shade Mode Toggle"
+msgstr "Preklopnik Moda Sjenke"
+
+#: src/bin/e_actions.c:2566
+msgid "Toggle Borderless State"
+msgstr "Preklopnik Bezrubnog Stanja"
+
+#: src/bin/e_actions.c:2571
+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: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:687
+#: 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
+msgid "Desktop"
+msgstr "Radna površina"
+
+#: src/bin/e_actions.c:2576
+msgid "Flip Desktop Left"
+msgstr "Okreni Radnu Površinu Lijevo"
+
+#: src/bin/e_actions.c:2578
+msgid "Flip Desktop Right"
+msgstr "Okreni Radnu Površinu Desno"
+
+#: src/bin/e_actions.c:2580
+msgid "Flip Desktop Up"
+msgstr "Okreni Radnu Površinu Gore"
+
+#: src/bin/e_actions.c:2582
+msgid "Flip Desktop Down"
+msgstr "Okreni Radnu Površinu Dolje"
+
+#: src/bin/e_actions.c:2584
+msgid "Flip Desktop By..."
+msgstr "Okreni Radnu Površinu Za..."
+
+#: src/bin/e_actions.c:2590
+msgid "Show The Desktop"
+msgstr "Prikaži Radnu Površinu"
+
+#: src/bin/e_actions.c:2595
+msgid "Show The Shelf"
+msgstr "Prikaži Policu"
+
+#: src/bin/e_actions.c:2600
+msgid "Flip Desktop To..."
+msgstr "Okreni Radnu Površinu Na..."
+
+#: src/bin/e_actions.c:2606
+msgid "Flip Desktop Linearly..."
+msgstr "Okreni Radnu Površinu Linearno"
+
+#: src/bin/e_actions.c:2612
+msgid "Switch To Desktop 0"
+msgstr "Prebaci na Radnu Površinu 0"
+
+#: src/bin/e_actions.c:2614
+msgid "Switch To Desktop 1"
+msgstr "Prebaci na Radnu Površinu 1"
+
+#: src/bin/e_actions.c:2616
+msgid "Switch To Desktop 2"
+msgstr "Prebaci na Radnu Površinu 2"
+
+#: src/bin/e_actions.c:2618
+msgid "Switch To Desktop 3"
+msgstr "Prebaci na Radnu Površinu 3"
+
+#: src/bin/e_actions.c:2620
+msgid "Switch To Desktop 4"
+msgstr "Prebaci na Radnu Površinu 4"
+
+#: src/bin/e_actions.c:2622
+msgid "Switch To Desktop 5"
+msgstr "Prebaci na Radnu Površinu 5"
+
+#: src/bin/e_actions.c:2624
+msgid "Switch To Desktop 6"
+msgstr "Prebaci na Radnu Površinu 6"
+
+#: src/bin/e_actions.c:2626
+msgid "Switch To Desktop 7"
+msgstr "Prebaci na Radnu Površinu 7"
+
+#: src/bin/e_actions.c:2628
+msgid "Switch To Desktop 8"
+msgstr "Prebaci na Radnu Površinu 8"
+
+#: src/bin/e_actions.c:2630
+msgid "Switch To Desktop 9"
+msgstr "Prebaci na Radnu Površinu 9"
+
+#: src/bin/e_actions.c:2632
+msgid "Switch To Desktop 10"
+msgstr "Prebaci na Radnu Površinu 10"
+
+#: src/bin/e_actions.c:2634
+msgid "Switch To Desktop 11"
+msgstr "Prebaci na Radnu Površinu 11"
+
+#: src/bin/e_actions.c:2636
+msgid "Switch To Desktop..."
+msgstr "Prebaci na Radnu Površinu..."
+
+#: src/bin/e_actions.c:2642
+msgid "Flip Desktop Left (All Screens)"
+msgstr "Okreni Radnu Površinu Lijevo (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2644
+msgid "Flip Desktop Right (All Screens)"
+msgstr "Okreni Radnu Površinu Desno (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2646
+msgid "Flip Desktop Up (All Screens)"
+msgstr "Okreni Radnu Površinu Gore (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2648
+msgid "Flip Desktop Down (All Screens)"
+msgstr "Okreni Radnu Površinu Dolje (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2650
+msgid "Flip Desktop By... (All Screens)"
+msgstr "Okreni Radnu Površinu Za... (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2656
+msgid "Flip Desktop To... (All Screens)"
+msgstr "Okreni Radnu Površinu Na... (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2662
+msgid "Flip Desktop Linearly... (All Screens)"
+msgstr "Okreni Radnu Površinu Linearno... (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2668
+msgid "Flip Desktop In Direction..."
+msgstr "Preokreni Radnu Površinu U Smjeru..."
+
+#: src/bin/e_actions.c:2673
+msgid "Switch To Desktop 0 (All Screens)"
+msgstr "Prebaci Na Radnu Površinu 0 (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2675
+msgid "Switch To Desktop 1 (All Screens)"
+msgstr "Prebaci Na Radnu Površinu 1 (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2677
+msgid "Switch To Desktop 2 (All Screens)"
+msgstr "Prebaci Na Radnu Površinu 2 (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2679
+msgid "Switch To Desktop 3 (All Screens)"
+msgstr "Prebaci Na Radnu Površinu 3 (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2681
+msgid "Switch To Desktop 4 (All Screens)"
+msgstr "Prebaci Na Radnu Površinu 4 (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2683
+msgid "Switch To Desktop 5 (All Screens)"
+msgstr "Prebaci Na Radnu Površinu 5 (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2685
+msgid "Switch To Desktop 6 (All Screens)"
+msgstr "Prebaci Na Radnu Površinu 6 (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2687
+msgid "Switch To Desktop 7 (All Screens)"
+msgstr "Prebaci Na Radnu Površinu 7 (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2689
+msgid "Switch To Desktop 8 (All Screens)"
+msgstr "Prebaci Na Radnu Površinu 8 (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2691
+msgid "Switch To Desktop 9 (All Screens)"
+msgstr "Prebaci Na Radnu Površinu 9 (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2693
+msgid "Switch To Desktop 10 (All Screens)"
+msgstr "Prebaci Na Radnu Površinu 10 (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2695
+msgid "Switch To Desktop 11 (All Screens)"
+msgstr "Prebaci Na Radnu Površinu 11 (Svi Zasloni)"
+
+#: src/bin/e_actions.c:2697
+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/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
+msgid "Screen"
+msgstr "Zaslon"
+
+#: src/bin/e_actions.c:2704
+msgid "Send Mouse To Screen 0"
+msgstr "Pošalji Miša Na Zaslon 0"
+
+#: src/bin/e_actions.c:2706
+msgid "Send Mouse To Screen 1"
+msgstr "Pošalji Miša Na Zaslon 1"
+
+#: src/bin/e_actions.c:2708
+msgid "Send Mouse To Screen..."
+msgstr "Pošalji Miša Na Zaslon..."
+
+#: src/bin/e_actions.c:2713
+msgid "Send Mouse Forward 1 Screen"
+msgstr "Pošalji Miša Naprijed 1 Zaslon"
+
+#: src/bin/e_actions.c:2715
+msgid "Send Mouse Back 1 Screen"
+msgstr "Pošalji Miša Nazad 1 Zaslon"
+
+#: src/bin/e_actions.c:2717
+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
+msgid "Window : Moving"
+msgstr "Prozor: Pomjeranje"
+
+#: src/bin/e_actions.c:2755
+msgid "To Next Desktop"
+msgstr "Na Slijedeću Radnu Površinu"
+
+#: src/bin/e_actions.c:2757
+msgid "To Previous Desktop"
+msgstr "Na Prethodnu Radnu Površinu"
+
+#: src/bin/e_actions.c:2759
+msgid "By Desktop #..."
+msgstr "Po Radnoj Površini #..."
+
+#: src/bin/e_actions.c:2765
+msgid "To Desktop..."
+msgstr "Na Radnu Površinu..."
+
+#: src/bin/e_actions.c:2771
+msgid "Show Main Menu"
+msgstr "Prikaži Glavni Izbornik"
+
+#: src/bin/e_actions.c:2773
+msgid "Show Favorites Menu"
+msgstr "Prikaži Omiljeni Izbornik"
+
+#: src/bin/e_actions.c:2775
+msgid "Show All Applications Menu"
+msgstr "Prikaži Izbornik Svih Aplikacija"
+
+#: src/bin/e_actions.c:2777
+msgid "Show Clients Menu"
+msgstr "Prikaži Izbornik Klijenata"
+
+#: src/bin/e_actions.c:2779
+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:139 src/modules/conf/e_mod_main.c:163
+#: 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
+msgid "Command"
+msgstr "Naredba"
+
+#: src/bin/e_actions.c:2791
+msgid "Application"
+msgstr "Aplikacija"
+
+#: src/bin/e_actions.c:2795 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
+msgid "Exit"
+msgstr "Izlaz"
+
+#: src/bin/e_actions.c:2803
+msgid "Exit Now"
+msgstr "Izađi Odmah"
+
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment %s Modul"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Preklopnik Moda Cijelog Zaslona"
+
+#: src/bin/e_actions.c:2813
+#, fuzzy
+msgid "Offline Mode Toggle"
+msgstr "Preklopnik Moda Sjenke"
+
+#: 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_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_wallpaper/e_int_config_wallpaper.c:513
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: 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
+msgid "Log Out"
+msgstr "Odjava"
+
+#: src/bin/e_actions.c:2821
+msgid "Power Off Now"
+msgstr "Ugasi Odmah"
+
+#: src/bin/e_actions.c:2825
+msgid "Power Off"
+msgstr "Ugasi"
+
+#: src/bin/e_actions.c:2829
+msgid "Reboot"
+msgstr "Ponovno podigni sustav"
+
+#: src/bin/e_actions.c:2833
+msgid "Suspend"
+msgstr "Suspendiraj"
+
+#: src/bin/e_actions.c:2837
+msgid "Hibernate"
+msgstr "Hibernirati"
+
+#: src/bin/e_actions.c:2845
+msgid "Lock"
+msgstr "Zaključaj"
+
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+msgid "Cleanup Windows"
+msgstr "Očisti Prozore"
+
+#: src/bin/e_actions.c:2855
+msgid "Generic : Actions"
+msgstr "Uopćeno : Akcije"
+
+#: src/bin/e_actions.c:2855
+msgid "Delayed Action"
+msgstr "Odgođena Akcija"
+
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+msgid "Set As Background"
+msgstr "Postavi Kao Pozadinu"
+
+#: src/bin/e_border.c:5080
+msgid "Desktop files scan done"
+msgstr "Skeniranje datoteka radne površine je gotovo"
+
+#: src/bin/e_border.c:5092
+msgid "Desktop file scan"
+msgstr "Skeniranje datoteka radne površine"
+
+#: src/bin/e_color_dialog.c:29
+msgid "Color Selector"
+msgstr "Odabirač Boja"
+
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
+#: src/bin/e_config_dialog.c:249 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:323
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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_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/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:777
+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:8531
+#: src/bin/e_fm_prop.c:514 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_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/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:778
+msgid "Cancel"
+msgstr "Poništi"
+
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
+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 ""
+"Postavni podaci su trebali nadogradnju. Vaše stare postavke<br>su izbrisane "
+"i novi set zadanih vrijednosti je inicijaliziran. <br>Ovo će se normalno "
+"događati tijekom razvoja, te nemojte prijavljivati<br>problem. Ovo prosto "
+"znači da Enlightenment redovno treba nove postavne podatke<br>za korisničku "
+"funkcionalnost koju vaše stare postavke prosto nisu<br>imale. Ovaj novi set "
+"zadanih vrijednosti će ovo riješiti dodavanjem istih. Sad možete "
+"rekonfigurirati  stvari<br>po vašoj želji. Izvinjavamo se zbog problema sa "
+"vašim postavkama.<br>"
+
+#: src/bin/e_config.c:760
+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 ""
+"Vaše postavke su NOVIJE nego Enlightenment. Ovo je vrlo<br>čudno. Ovo se "
+"nije smjelo dogoditi ako niste unazadili<br>Enlightenment ili kopirali vaše "
+"postavke sa mjesta gdje<br>je novija inačica bila aktivna. Ovo nije<br>dobro "
+"i radi predostrožnosti vaše postavke su vraćene u<br>originalno stanje. "
+"Izvinjavamo se zbog neugodnosti.<br>"
+
+#: src/bin/e_config.c:1689
+msgid "Settings Upgraded"
+msgstr "Postavke Unaprijeđene"
+
+#: src/bin/e_config.c:1712
+#, 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 ""
+"Greška se dogodila tijekom pohrane Enlightenmentovih<br>postavki na disk. "
+"Vrsta greške nije utvrđena.<br><br>Datoteka u kojoj je greška pronađena je:"
+"<br>%s<br><br>Ova datoteka je uklonjena da bi se izbjegla korupcija podataka."
+"<br>"
+
+#: src/bin/e_config.c:1723
+#, 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 ""
+"Postavne datoteke za Enlightenment su prevelike<br>za datotečni sustav u "
+"koji su pohranjivane.<br>Ova greška je vrlo čudna jer bi ove datoteke "
+"trebale biti izuzetno malene.<br>Molimo provjerite postavke svojega izvronog "
+"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:1736
+#, 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 ""
+"Izlazna greška je otkrivena prilikom ispisa datoteka<br>za postavke za "
+"Enlightenment. Vi imate probleme sa<br>vašim diskom kojeg vjerojatno morate "
+"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:1747
+#, 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 ""
+"Elnightenment ne može ispisati svoje datoteke<br>postavki jer nema prostora "
+"da zapiše datoteku.<br>Vama vjerojatnol nedostaje prostora na disku<br>ili "
+"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:1759
+#, 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 datoteke postavki koje su bile ispisivane<br>su se neočekivano "
+"zatvorile. Ovo je vrlo neuobičajeno.<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:1784
+msgid "Enlightenment Settings Write Problems"
+msgstr "Problemi Pisanja Enlightenment Postavki"
+
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
+#: 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 "Napredno"
+
+#: src/bin/e_config_dialog.c:228
+msgid "Basic"
+msgstr "Osnovno"
+
+#: src/bin/e_config_dialog.c:251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+msgid "Apply"
+msgstr "Primijeni"
+
+#: 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
+msgid "Modules"
+msgstr "Moduli"
+
+#: 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:1076
+msgid "Extensions"
+msgstr "Nastavci"
+
+#: src/bin/e_container.c:117
+#, c-format
+msgid "Container %d"
+msgstr "Kontejner %d"
+
+#: src/bin/e_desklock.c:174
+msgid "Error - no PAM support"
+msgstr "Greška - bez PAM podrške"
+
+#: src/bin/e_desklock.c:175
+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
+msgid "Lock Failed"
+msgstr "Neuspjelo Zaključavanje"
+
+#: src/bin/e_desklock.c:242
+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 ""
+"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
+msgid "Please enter your unlock password"
+msgstr "Molimo unesite vašu lozinku za otključavanje"
+
+#: src/bin/e_desklock.c:709
+msgid "Authentication System Error"
+msgstr "Greška Sistema Autorizacije"
+
+#: src/bin/e_desklock.c:710
+#, 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 autorizacija je imala greške postavljajući autorizacionu sesiju. Šifra "
+"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
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:158
+msgid "Incomplete Window Properties"
+msgstr "Nekompletna Svojstva Prozora"
+
+#: 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 ""
+"Prozor za koji kreirate ikonu ne sadrži<br>ime i klasna svojstva prozora,"
+"<br>te se potrebna svojstva ikone koja će biti uptrijebljena<br>za ovaj "
+"prozor ne mogu nagađati. Umjesto ovoga<br>trebate upotrijebiti naslov "
+"prozora. Ovo je u redu<br>jedino onda kad je naslov prozora isti u "
+"momentu<br>podizanja, i ako se ne mijenja."
+
+#: src/bin/e_eap_editor.c:215
+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/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_mime/e_int_config_mime_edit.c:145
+msgid "Icon"
+msgstr "Ikona"
+
+#: src/bin/e_eap_editor.c:472
+#: src/modules/conf_mime/e_int_config_mime_edit.c:136
+msgid "Basic Info"
+msgstr "Osnovne Informacije"
+
+#: 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 "Ime"
+
+#: src/bin/e_eap_editor.c:479
+msgid "Executable"
+msgstr "Izvršna"
+
+#: src/bin/e_eap_editor.c:487
+msgid "Comment"
+msgstr "Komentar"
+
+#: src/bin/e_eap_editor.c:512
+msgid "General"
+msgstr "Općenito"
+
+#: src/bin/e_eap_editor.c:515
+msgid "Generic Name"
+msgstr "Općenito Ime"
+
+#: src/bin/e_eap_editor.c:520
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:105
+msgid "Window Class"
+msgstr "Klasa Prozora"
+
+#: src/bin/e_eap_editor.c:524 src/modules/conf_mime/e_int_config_mime.c:179
+msgid "Categories"
+msgstr "Kategorije"
+
+#: src/bin/e_eap_editor.c:528
+msgid "Mime Types"
+msgstr "Mime tipovi"
+
+#: src/bin/e_eap_editor.c:534
+msgid "Options"
+msgstr "Opcije"
+
+#: src/bin/e_eap_editor.c:535
+msgid "Startup Notify"
+msgstr "Početna Obavijest"
+
+#: src/bin/e_eap_editor.c:537
+msgid "Run in Terminal"
+msgstr "Izvodi u Terminalu"
+
+#: src/bin/e_eap_editor.c:539
+msgid "Show in Menus"
+msgstr "Prikaži u Izbornicima"
+
+#: src/bin/e_eap_editor.c:543
+msgid "Desktop file"
+msgstr "Datoteka Radne Površine"
+
+#: src/bin/e_eap_editor.c:544
+msgid "Filename"
+msgstr "Naziv datoteke"
+
+#: src/bin/e_eap_editor.c:573
+msgid "Select an Icon"
+msgstr "Odaberi Ikonu"
+
+#: src/bin/e_eap_editor.c:642
+msgid "Select an Executable"
+msgstr "Odaberi Izvršni"
+
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
+#: src/modules/conf_applications/e_int_config_apps.c:269
+#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: 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:7938
+msgid "Cut"
+msgstr "Izreži"
+
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
+msgid "Copy"
+msgstr "Kopiraj"
+
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
+msgid "Paste"
+msgstr "Zalijepi"
+
+#: src/bin/e_entry.c:529
+msgid "Select All"
+msgstr "Odaberi sve"
+
+#: src/bin/e_exec.c:220 src/bin/e_utils.c:201
+#: 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:221 src/bin/e_utils.c:202
+#: 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:314
+msgid "Application run error"
+msgstr "Greška izvođenja aplikacije"
+
+#: src/bin/e_exec.c:316
+#, c-format
+msgid ""
+"Enlightenment was unable to run the application:<br><br>%s<br><br>The "
+"application failed to start."
+msgstr ""
+"Enlightenment nije u mogućnosti da izvede aplikaciju:<br><br>%"
+"s<br><br>Neuspješan start aplikacije."
+
+#: src/bin/e_exec.c:418
+msgid "Application Execution Error"
+msgstr "Greška Izvršenja Aplikacije"
+
+#: src/bin/e_exec.c:430
+#, c-format
+msgid "%s stopped running unexpectedly."
+msgstr "%s je neočekivano zaustavio izvođenje"
+
+#: src/bin/e_exec.c:436
+#, 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:443
+#, c-format
+msgid "%s was interrupted by an Interrupt Signal."
+msgstr "%s je prekinut Interrupt Signalom"
+
+#: src/bin/e_exec.c:445
+#, c-format
+msgid "%s was interrupted by a Quit Signal."
+msgstr "%s je prekinut Quit Signalom"
+
+#: src/bin/e_exec.c:449
+#, c-format
+msgid "%s was interrupted by an Abort Signal."
+msgstr "%s je prekinut Abort Signalom"
+
+#: src/bin/e_exec.c:452
+#, c-format
+msgid "%s was interrupted by a Floating Point Error."
+msgstr "%s je prekinut Floating Point Greškom"
+
+#: src/bin/e_exec.c:455
+#, c-format
+msgid "%s was interrupted by an Uninterruptable Kill Signal."
+msgstr "%s je prekinut Uninterruptable Kill Signalom"
+
+#: src/bin/e_exec.c:458
+#, c-format
+msgid "%s was interrupted by a Segmentation Fault."
+msgstr "%s je prekinut Segmentation Greškom"
+
+#: src/bin/e_exec.c:461
+#, c-format
+msgid "%s was interrupted by a Broken Pipe."
+msgstr "%s je prekinut od Slomljene Cijevi"
+
+#: src/bin/e_exec.c:464
+#, c-format
+msgid "%s was interrupted by a Termination Signal."
+msgstr "%s je prekinut Termination Signalom"
+
+#: src/bin/e_exec.c:467
+#, c-format
+msgid "%s was interrupted by a Bus Error."
+msgstr "%s je prekinut Bus Greškom"
+
+#: src/bin/e_exec.c:470
+#, c-format
+msgid "%s was interrupted by the signal number %i."
+msgstr "%s je prekinut signalom broj %i."
+
+#: src/bin/e_exec.c:528
+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:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
+msgid "Error Logs"
+msgstr "Pogrešni Logovi"
+
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
+msgid "There was no error message."
+msgstr "Nema poruke o grešci."
+
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
+msgid "Save This Message"
+msgstr "Pohrani Ovu Poruku"
+
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
+#, 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:631
+msgid "Error Information"
+msgstr "Informacije o Grešci"
+
+#: src/bin/e_exec.c:639
+msgid "Error Signal Information"
+msgstr "Informacije o Signalu Greške"
+
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
+msgid "Output Data"
+msgstr "Izlazni Podaci"
+
+#: src/bin/e_exec.c:657
+msgid "There was no output."
+msgstr "Nije bilo izlaza."
+
+#: src/bin/e_fm.c:934
+msgid "Nonexistent path"
+msgstr "Nepostojeći put"
+
+#: src/bin/e_fm.c:937
+#, c-format
+msgid "%s doesn't exist."
+msgstr "%s ne postoji."
+
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Greška kod montiranja"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Greška kod montiranja"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Greška"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
+#, c-format
+msgid "%i Files"
+msgstr "%i Datoteke"
+
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
+msgid "Link"
+msgstr "Link"
+
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
+msgid "Abort"
+msgstr "Odustani"
+
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
+msgid "Inherit parent settings"
+msgstr "Preuzmi izvorne postavke"
+
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
+msgid "View Mode"
+msgstr "Pregled"
+
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
+msgid "Refresh View"
+msgstr "Osvježi Pogled"
+
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
+msgid "Show Hidden Files"
+msgstr "Prikaži Skrivene Datoteke"
+
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
+msgid "Remember Ordering"
+msgstr "Zapamti Redoslijed"
+
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
+msgid "Sort Now"
+msgstr "Sortiraj Sada"
+
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
+#: src/modules/conf_paths/e_int_config_paths.c:208
+msgid "New Directory"
+msgstr "Novi Direktorij"
+
+#: src/bin/e_fm.c:8039
+msgid "Rename"
+msgstr "Preimenuj"
+
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Bezvučan"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
+msgid "Properties"
+msgstr "Svojstva"
+
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
+msgid "Use default"
+msgstr "Upotrijebi zadane vrijednosti"
+
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
+msgid "Grid Icons"
+msgstr "Mrežne Ikone"
+
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
+msgid "Custom Icons"
+msgstr "Posebne Ikone"
+
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
+msgid "List"
+msgstr "Lista"
+
+#: src/bin/e_fm.c:8380
+#, c-format
+msgid "Icon Size (%d)"
+msgstr "Veličinia Ikone (%d)"
+
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Postavi Kao Pozadinu"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+msgid "Set overlay..."
+msgstr ""
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Očisti"
+
+#: src/bin/e_fm.c:8754
+msgid "Create a new Directory"
+msgstr "Kreiraj"
+
+#: src/bin/e_fm.c:8755
+msgid "New Directory Name:"
+msgstr "Naziv Novog Direktorija:"
+
+#: src/bin/e_fm.c:8809
+#, c-format
+msgid "Rename %s to:"
+msgstr "Preimenuj %s na:"
+
+#: src/bin/e_fm.c:8811
+msgid "Rename File"
+msgstr "Preimenuj Datoteku"
+
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
+msgid "Retry"
+msgstr "Ponovi"
+
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
+msgid "Error"
+msgstr "Greška"
+
+#: src/bin/e_fm.c:8957
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: src/bin/e_fm.c:9009
+msgid "No to all"
+msgstr "Ne za sve"
+
+#: src/bin/e_fm.c:9011
+msgid "Yes to all"
+msgstr "Da za sve"
+
+#: src/bin/e_fm.c:9014
+#, fuzzy
+msgid "Warning"
+msgstr "Početak"
+
+#: src/bin/e_fm.c:9017
+#, fuzzy, c-format
+msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
+msgstr "Jeste li sigurni da želite obrisati<br><hilight>%s</hilight> ?"
+
+#: src/bin/e_fm.c:9089
+msgid "Ignore this"
+msgstr "Ignoriraj ovo"
+
+#: src/bin/e_fm.c:9090
+msgid "Ignore all"
+msgstr "Ignoriraj sve"
+
+#: src/bin/e_fm.c:9095
+#, 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:9240
+msgid "Confirm Delete"
+msgstr "Potvrda Brisanja"
+
+#: src/bin/e_fm.c:9245
+#, 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:9251
+#, c-format
+msgid ""
+"Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
+"hilight> ?"
+msgstr ""
+"Jeste li sigurni da želite ukloniti<br>%d odabrane datoteke u:<br><hilight>%"
+"s</hilight> ?"
+
+#: src/bin/e_fm_prop.c:108
+msgid "File Properties"
+msgstr "Svojstva datoteke"
+
+#: src/bin/e_fm_prop.c:338
+msgid "File:"
+msgstr "Datoteka:"
+
+#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+msgid "Size:"
+msgstr "Veličina:"
+
+#: src/bin/e_fm_prop.c:352
+msgid "Last Modified:"
+msgstr "Zadnja Promjena:"
+
+#: src/bin/e_fm_prop.c:359
+msgid "File Type:"
+msgstr "Vrsta Datoteke:"
+
+#: src/bin/e_fm_prop.c:366
+msgid "Permissions"
+msgstr "Dozvole"
+
+#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+msgid "Owner:"
+msgstr "Vlasnik:"
+
+#: src/bin/e_fm_prop.c:373
+msgid "Others can read"
+msgstr "Ostali mogu čitati"
+
+#: src/bin/e_fm_prop.c:375
+msgid "Others can write"
+msgstr "Ostali mogu pisati"
+
+#: src/bin/e_fm_prop.c:377
+msgid "Owner can read"
+msgstr "Vlasnik može čitati"
+
+#: src/bin/e_fm_prop.c:379
+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/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/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
+msgid "Thumbnail"
+msgstr "Sličica"
+
+#: src/bin/e_fm_prop.c:438
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
+msgid "Custom"
+msgstr "Prilagođeni"
+
+#: src/bin/e_fm_prop.c:448
+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
+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
+msgid "Select an Image"
+msgstr "Odaberi Sliku"
+
+#: src/bin/e_fm_hal.c:189
+#, c-format
+msgid "%llu TiB"
+msgstr "%llu TiB"
+
+#: src/bin/e_fm_hal.c:191
+#, c-format
+msgid "%llu GiB"
+msgstr "%llu GiB"
+
+#: src/bin/e_fm_hal.c:193
+#, c-format
+msgid "%llu MiB"
+msgstr "%llu MiB"
+
+#: src/bin/e_fm_hal.c:195
+#, c-format
+msgid "%llu KiB"
+msgstr "%llu KiB"
+
+#: src/bin/e_fm_hal.c:197
+#, c-format
+msgid "%llu B"
+msgstr "%llu B"
+
+#: src/bin/e_fm_hal.c:228
+#, c-format
+msgid "Unknown Volume"
+msgstr "Nepoznata Jačina"
+
+#: src/bin/e_fm_hal.c:322
+msgid "Removable Device"
+msgstr "Odstranjiv Uređaj"
+
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
+msgid "Plain"
+msgstr "Običan"
+
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
+msgid "Inset"
+msgstr "Umetak"
+
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:701
+msgid "Appearance"
+msgstr "Izgled"
+
+#: src/bin/e_gadcon.c:1291
+msgid "Automatically scroll contents"
+msgstr "Automatski listaj sadržaj"
+
+#: src/bin/e_gadcon.c:1298
+msgid "Able to be resized"
+msgstr "Moguće promijeniti veličinu"
+
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
+msgid "Begin move/resize this gadget"
+msgstr "Počni pomakni/promjeni veličinu ovog aparata"
+
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
+msgid "Remove this gadget"
+msgstr "Ukloni ovaj aparat"
+
+#: src/bin/e_gadcon.c:1749
+msgid "Stop move/resize this gadget"
+msgstr "Zaustavi pomjeranje/promjenu veličine ovog aparata"
+
+#: src/bin/e_hints.c:151
+msgid ""
+"A previous instance of Enlightenment is still active\n"
+"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:564
+msgid "Window Locks"
+msgstr "Prozorske Brave"
+
+#: src/bin/e_int_border_locks.c:285
+msgid "Generic Locks"
+msgstr "Generičke Brave"
+
+#: src/bin/e_int_border_locks.c:286
+msgid "Lock the Window so it does only what I tell it to"
+msgstr "Zaključaj Prozor tako da uradi samo ono što mu naredim"
+
+#: src/bin/e_int_border_locks.c:288
+msgid "Protect this window from me accidentally changing it"
+msgstr "Zaštiti ovaj prozor da ga ne bih slučajno promijenio"
+
+#: src/bin/e_int_border_locks.c:290
+msgid ""
+"Protect this window from being accidentally closed because it is important"
+msgstr "Zaštiti ovaj prozor da ga ne bih slučajno zatvorio jer je značajan"
+
+#: src/bin/e_int_border_locks.c:292
+msgid "Do not allow the border to change on this window"
+msgstr "Ne dozvoli promjenu bordure na ovom prozoru"
+
+#: src/bin/e_int_border_locks.c:295
+msgid "Remember these Locks for this window next time it appears"
+msgstr "Zapamti ove Brave za ovaj prozor kad se slijedeći put pojavi"
+
+#: src/bin/e_int_border_locks.c:308
+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
+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:522
+#: src/bin/e_int_shelf_config.c:612
+#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: 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:536 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
+msgid "Stacking"
+msgstr "Slaganje"
+
+#: src/bin/e_int_border_locks.c:315 src/bin/e_int_border_locks.c:334
+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
+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
+msgid "Shaded state"
+msgstr "Sjenčeno stanje"
+
+#: src/bin/e_int_border_locks.c:321 src/bin/e_int_border_locks.c:340
+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
+msgid "Fullscreen state"
+msgstr "Stanje cijelog ekrna"
+
+#: src/bin/e_int_border_locks.c:327
+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
+msgid "Border style"
+msgstr "Vrsta Bordure"
+
+#: src/bin/e_int_border_locks.c:348
+msgid "Stop me from:"
+msgstr "Zaustavi me kod:"
+
+#: src/bin/e_int_border_locks.c:349
+msgid "Closing the window"
+msgstr "Zatvaram prozor"
+
+#: src/bin/e_int_border_locks.c:351
+msgid "Exiting my login with this window open"
+msgstr "Napuštam moj login sa ovim prozorom otvorenim"
+
+#: src/bin/e_int_border_locks.c:355
+msgid "Remember these Locks"
+msgstr "Zapamti ove Brave"
+
+#: src/bin/e_int_border_menu.c:72
+msgid "Edit Icon"
+msgstr "Uredi Ikonu"
+
+#: src/bin/e_int_border_menu.c:77
+msgid "Add Application..."
+msgstr "Dodaj Aplikaciju..."
+
+#: src/bin/e_int_border_menu.c:88
+msgid "Create Icon"
+msgstr "Kreiraj Ikonu"
+
+#: src/bin/e_int_border_menu.c:98
+msgid "Send to Desktop"
+msgstr "Pošalji na Radnu Površinu"
+
+#: src/bin/e_int_border_menu.c:110
+msgid "Pin to Desktop"
+msgstr "Pribodi na Radnu Površinu"
+
+#: src/bin/e_int_border_menu.c:121
+msgid "Unpin from Desktop"
+msgstr "Skini sa Radne Površine"
+
+#: src/bin/e_int_border_menu.c:130
+msgid "More..."
+msgstr "Više..."
+
+#: src/bin/e_int_border_menu.c:164
+msgid "Iconify"
+msgstr "Ikonizirati"
+
+#: src/bin/e_int_border_menu.c:361
+msgid "Maximize vertically"
+msgstr "Maksimiziraj vertikalno"
+
+#: src/bin/e_int_border_menu.c:372
+msgid "Maximize horizontally"
+msgstr "Maksimiziraj horizontalno"
+
+#: src/bin/e_int_border_menu.c:383
+msgid "Unmaximize"
+msgstr "Odmaksimiziraj"
+
+#: src/bin/e_int_border_menu.c:484
+msgid "Keyboard Shortcut"
+msgstr "Tipkovnička Prečica"
+
+#: src/bin/e_int_border_menu.c:490
+msgid "To Favorites Menu"
+msgstr "Do Omiljenog Izbornika"
+
+#: src/bin/e_int_border_menu.c:495
+msgid "To Launcher"
+msgstr "Ka Pokretaču"
+
+#: src/bin/e_int_border_menu.c:517 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:526
+msgid "Skip"
+msgstr "Preskoči"
+
+#: src/bin/e_int_border_menu.c:545 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:556
+msgid "Remember"
+msgstr "Zapamti"
+
+#: src/bin/e_int_border_menu.c:572 src/bin/e_int_border_prop.c:75
+msgid "Window Properties"
+msgstr "Svojstva Prozora"
+
+#: src/bin/e_int_border_menu.c:784
+msgid "Always On Top"
+msgstr "Uvijek na vrhu"
+
+#: src/bin/e_int_border_menu.c:795
+#: 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:806
+msgid "Always Below"
+msgstr "Uvijek Ispod"
+
+#: src/bin/e_int_border_menu.c:898
+msgid "Select Border Style"
+msgstr "Odaberi Vrstu Bordure"
+
+#: src/bin/e_int_border_menu.c:910
+msgid "Use E17 Default Icon Preference"
+msgstr "Upotrijebi E17 Standardne Postavke Ikone"
+
+#: src/bin/e_int_border_menu.c:919
+msgid "Use Application Provided Icon "
+msgstr "Upotrijebi Ikonu Snabdjevenu Aplikacijom "
+
+#: src/bin/e_int_border_menu.c:927
+msgid "Use User Defined Icon"
+msgstr "Upotrijebi Ikonu Definiranu od Korisnika"
+
+#: src/bin/e_int_border_menu.c:988 src/bin/e_int_border_prop.c:473
+msgid "Shaded"
+msgstr "Sjenčeno"
+
+#: src/bin/e_int_border_menu.c:1001 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "Ljepljivo"
+
+#: src/bin/e_int_border_menu.c:1014 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:1039 src/modules/conf_winlist/e_mod_main.c:35
+msgid "Window List"
+msgstr "Lista Prozora"
+
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
+msgid "Pager"
+msgstr "Preglednik"
+
+#: src/bin/e_int_border_menu.c:1059
+msgid "Taskbar"
+msgstr "Taskbar"
+
+#: 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 Svojstva"
+
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+msgid "Title"
+msgstr "Naslov"
+
+#: src/bin/e_int_border_prop.c:421
+msgid "Class"
+msgstr "Klasa"
+
+#: src/bin/e_int_border_prop.c:422 src/bin/e_int_border_prop.c:468
+msgid "Icon Name"
+msgstr "Ime Ikone"
+
+#: src/bin/e_int_border_prop.c:423
+msgid "Machine"
+msgstr "Stroj"
+
+#: src/bin/e_int_border_prop.c:424
+msgid "Role"
+msgstr "Uloga"
+
+#: src/bin/e_int_border_prop.c:426
+msgid "Minimum Size"
+msgstr "Minimalna Veličina"
+
+#: src/bin/e_int_border_prop.c:427
+msgid "Maximum Size"
+msgstr "Maksimalna Veličina"
+
+#: src/bin/e_int_border_prop.c:428
+msgid "Base Size"
+msgstr "Osnovna Veličina"
+
+#: src/bin/e_int_border_prop.c:429
+msgid "Resize Steps"
+msgstr "Promijeni Veličinu Koraka"
+
+#: src/bin/e_int_border_prop.c:431
+msgid "Aspect Ratio"
+msgstr "Omjer Aspekta"
+
+#: src/bin/e_int_border_prop.c:432
+msgid "Initial State"
+msgstr "Početno Stanje"
+
+#: src/bin/e_int_border_prop.c:434
+msgid "Window ID"
+msgstr "ID Prozora"
+
+#: src/bin/e_int_border_prop.c:435
+msgid "Window Group"
+msgstr "Grupa Prozora"
+
+#: src/bin/e_int_border_prop.c:436
+msgid "Transient For"
+msgstr "Privremen Za"
+
+#: src/bin/e_int_border_prop.c:437
+msgid "Client Leader"
+msgstr "Klijentov Predvodnik"
+
+#: src/bin/e_int_border_prop.c:438
+msgid "Gravity"
+msgstr "Gravitacija"
+
+#: src/bin/e_int_border_prop.c:441
+msgid "Take Focus"
+msgstr "Uzmi Fokus"
+
+#: src/bin/e_int_border_prop.c:442
+msgid "Accepts Focus"
+msgstr "Prihvati Fokus"
+
+#: src/bin/e_int_border_prop.c:443
+msgid "Urgent"
+msgstr "Hitno"
+
+#: src/bin/e_int_border_prop.c:444
+msgid "Request Delete"
+msgstr "Zahtijevaj Brisanje"
+
+#: src/bin/e_int_border_prop.c:445
+msgid "Request Position"
+msgstr "Zahtijevaj Poziciju"
+
+#: src/bin/e_int_border_prop.c:466
+msgid "NetWM Properties"
+msgstr "NetWM Svojstva"
+
+#: src/bin/e_int_border_prop.c:471
+msgid "Modal"
+msgstr "Modalni"
+
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+msgid "Skip Taskbar"
+msgstr "Preskoči Alatnu Traku"
+
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+msgid "Skip Pager"
+msgstr "Izostavi Preglednika"
+
+#: src/bin/e_int_border_prop.c:476
+msgid "Hidden"
+msgstr "Skriven"
+
+#: src/bin/e_int_border_remember.c:75
+msgid "Window Remember"
+msgstr "Zapamti Prozor"
+
+#: src/bin/e_int_border_remember.c:244
+msgid "Window properties are not a unique match"
+msgstr "Svojstva prozora nemaju jedinstvenu podudarnost"
+
+#: src/bin/e_int_border_remember.c:247
+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 ""
+"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>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:333 src/bin/e_int_border_remember.c:363
+msgid "No match properties set"
+msgstr "Podudarna svojstva nisu postavljena"
+
+#: src/bin/e_int_border_remember.c:336
+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 ""
+"Vi zahtijevate da Enlightenment zapamti da primijeni<br>svojstva (kao "
+"veličinu, lokaciju, vrstu obruba itd.) za<br>prozor<hilight>bez "
+"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
+msgid "Nothing"
+msgstr "Ništa"
+
+#: src/bin/e_int_border_remember.c:445
+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
+msgid "Locks"
+msgstr "Brave"
+
+#: src/bin/e_int_border_remember.c:449
+msgid "Size, Position and Locks"
+msgstr "Veličina, Pozicija i Brave"
+
+#: src/bin/e_int_border_remember.c:451
+msgid "Everything"
+msgstr "Sve"
+
+#: src/bin/e_int_border_remember.c:464
+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:490
+msgid "Window Role"
+msgstr "Funkcija prozora"
+
+#: src/bin/e_int_border_remember.c:499
+msgid "Window type"
+msgstr "Vrsta prozora"
+
+#: src/bin/e_int_border_remember.c:506
+msgid "Transience"
+msgstr "Prolaznost"
+
+#: src/bin/e_int_border_remember.c:510
+msgid "Properties to remember"
+msgstr "Zapamti svojstva"
+
+#: src/bin/e_int_border_remember.c:521
+msgid "Icon Preference"
+msgstr "Postavke ikone"
+
+#: src/bin/e_int_border_remember.c:525
+msgid "Virtual Desktop"
+msgstr "Virtualna Radna Površina"
+
+#: src/bin/e_int_border_remember.c:531
+msgid "Current Screen"
+msgstr "Aktualni Ekran"
+
+#: src/bin/e_int_border_remember.c:533
+msgid "Skip Window List"
+msgstr "Preskoči Listu Prozora"
+
+#: src/bin/e_int_border_remember.c:541
+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
+msgid "Always focus on start"
+msgstr "Uvijek fokusiraj na start"
+
+#: 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:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
+msgid "Settings"
+msgstr "Postavke"
+
+#: 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 "Upravitelj datoteka"
+
+#: src/bin/e_int_config_modules.c:44
+msgid "Shelf"
+msgstr "Polica"
+
+#: src/bin/e_int_config_modules.c:120
+msgid "Module Settings"
+msgstr "Postavke Modula"
+
+#: src/bin/e_int_config_modules.c:181
+msgid "Available Modules"
+msgstr "Raspoloživi Moduli"
+
+#: src/bin/e_int_config_modules.c:188
+msgid "Load Module"
+msgstr "Unesi Modul"
+
+#: src/bin/e_int_config_modules.c:195
+msgid "Loaded Modules"
+msgstr "Unešeni Moduli"
+
+#: src/bin/e_int_config_modules.c:202
+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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
+#: src/bin/e_int_gadcon_config.c:178
+msgid "Description: Unavailable"
+msgstr "Opis: Nedostupan"
+
+#: src/bin/e_int_gadcon_config.c:32
+msgid "Shelf Contents"
+msgstr "Sadržaj Police"
+
+#: src/bin/e_int_gadcon_config.c:38
+msgid "Toolbar Contents"
+msgstr "Sadržaj Alatne Trake"
+
+#: src/bin/e_int_gadcon_config.c:93 src/modules/gadman/e_mod_config.c:106
+msgid "Available Gadgets"
+msgstr "Dostupni Aparati"
+
+#: src/bin/e_int_gadcon_config.c:100 src/modules/gadman/e_mod_config.c:117
+msgid "Add Gadget"
+msgstr "Dodaj Aparat"
+
+#: src/bin/e_int_gadcon_config.c:106
+msgid "Selected Gadgets"
+msgstr "Odabrani Aparati"
+
+#: src/bin/e_int_gadcon_config.c:113
+msgid "Remove Gadget"
+msgstr "Ukloni Aparat"
+
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+msgid "Toolbar Settings"
+msgstr "Postavke Alatne Trake"
+
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
+msgid "Layout"
+msgstr "Raspored"
+
+#: src/bin/e_intl.c:361
+msgid "Input Method Error"
+msgstr "Greška u Metodu Unosa"
+
+#: 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 ""
+"Greška kod pokretanja izvršitelja metode unosa<br><br>molimo provjerite da "
+"je konfiguracija vaše<br>metode unosa ispravna i da je<br>izvršitelj vaše "
+"konfiguracije u vašem PATH<br>"
+
+#: src/bin/e_int_menus.c:89
+msgid "Main"
+msgstr "Glavni"
+
+#: src/bin/e_int_menus.c:106
+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
+msgid "Applications"
+msgstr "Aplikacije"
+
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: 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 "Prozori"
+
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+msgid "Lost Windows"
+msgstr "Izgubljeni Prozori"
+
+#: src/bin/e_int_menus.c:170
+msgid "About"
+msgstr "O"
+
+#: 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 "Tema"
+
+#: src/bin/e_int_menus.c:262
+msgid "Virtual"
+msgstr "Virtualno"
+
+#: 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 "Police"
+
+#: src/bin/e_int_menus.c:278
+msgid "Show/Hide All Windows"
+msgstr "Prikaži/Sakrij Sve Prozore"
+
+#: src/bin/e_int_menus.c:575
+msgid "(No Applications)"
+msgstr "(Nema Aplikacija)"
+
+#: src/bin/e_int_menus.c:709
+#, fuzzy
+msgid "Set Virtual Desktops"
+msgstr "Virtualne Radne Površine"
+
+#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+msgid "(No Windows)"
+msgstr "(Nema Prozora)"
+
+#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+msgid "No name!!"
+msgstr "Nema imena!!"
+
+#: src/bin/e_int_menus.c:1375
+msgid "(No Shelves)"
+msgstr "(Nema Polica)"
+
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/modules/conf_shelves/e_int_config_shelf.c:132
+msgid "Shelf #"
+msgstr "Polica #"
+
+#: src/bin/e_int_menus.c:1441
+msgid "Add A Shelf"
+msgstr "dodaj Policu"
+
+#: src/bin/e_int_menus.c:1448
+msgid "Delete A Shelf"
+msgstr "Ukloni Policu"
+
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
+#: src/modules/conf_shelves/e_int_config_shelf.c:43
+msgid "Shelf Settings"
+msgstr "Postavke Police"
+
+#: src/bin/e_int_shelf_config.c:524
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
+msgid "Tiny"
+msgstr "Sićušno"
+
+#: src/bin/e_int_shelf_config.c:526
+#: 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:528 src/modules/dropshadow/e_mod_config.c:126
+msgid "Medium"
+msgstr "Srednji"
+
+#: src/bin/e_int_shelf_config.c:530
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
+msgid "Large"
+msgstr "Velik"
+
+#: src/bin/e_int_shelf_config.c:532
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
+msgid "Huge"
+msgstr "Ogroman"
+
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
+#, fuzzy
+msgid "Set Contents..."
+msgstr "Sadržaj Police"
+
+#: src/bin/e_int_shelf_config.c:562
+msgid "Above Everything"
+msgstr "Iznad Svega"
+
+#: src/bin/e_int_shelf_config.c:564
+msgid "Below Windows"
+msgstr "Ispod Prozora"
+
+#: src/bin/e_int_shelf_config.c:566
+msgid "Below Everything"
+msgstr "Ispod Svega"
+
+#: src/bin/e_int_shelf_config.c:568
+msgid "Allow windows to overlap the shelf"
+msgstr "Dozvoli da prozori prekriju police"
+
+#: src/bin/e_int_shelf_config.c:602
+msgid "Shrink to Content Size"
+msgstr "Stisni do Veličine Sadržaja"
+
+#: src/bin/e_int_shelf_config.c:613
+#, c-format
+msgid "%3.0f pixels"
+msgstr "%3.0f piksela"
+
+#: src/bin/e_int_shelf_config.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Styles"
+msgstr "Stilovi"
+
+#: src/bin/e_int_shelf_config.c:655
+msgid "Auto Hide"
+msgstr "Automatski Sakrij"
+
+#: src/bin/e_int_shelf_config.c:656
+msgid "Auto-hide the shelf"
+msgstr "Auto-sakrij policu"
+
+#: src/bin/e_int_shelf_config.c:659
+msgid "Show on mouse in"
+msgstr "Prikaži kad je miš u"
+
+#: src/bin/e_int_shelf_config.c:663
+msgid "Show on mouse click"
+msgstr "Prikaži pri kliku miša"
+
+#: src/bin/e_int_shelf_config.c:667
+msgid "Hide timeout"
+msgstr "Sakrij vrijeme neaktivnosti"
+
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f sekundi"
+
+#: src/bin/e_int_shelf_config.c:675
+msgid "Hide duration"
+msgstr "Sakrij trajanje"
+
+#: src/bin/e_int_shelf_config.c:689
+msgid "Show on all Desktops"
+msgstr "Prikaži na svim Radnim Površinama"
+
+#: src/bin/e_int_shelf_config.c:691
+msgid "Show on specified Desktops"
+msgstr "Prikaži na specificiranim Radnim Površinama"
+
+#: 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 ""
+"Moguć Hakerski Napad na IPC. IPC bazni\n"
+"direktorij već postoji ALI ima dozvole\n"
+"koje su preslobodne (čitanje i pisanje\n"
+"moraju biti dozvoljeni samo vlasniku)\n"
+"ili vi niste vlasnik. Molimo provjerite:\n"
+"%s/enlighenment-%s\n"
+
+#: 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 ""
+"Direktorij IPC utičnice ne može biti kreiran ili\n"
+"istražen.\n"
+"Molimo provjerite:\n"
+"%s/enlightenment-%s\n"
+
+#: src/bin/e_main.c:326
+#, fuzzy, c-format
+msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800"
+"+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+"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"
+"\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\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\tBudi dobar.\n"
+"\t-loš\n"
+"\t\tBudi loš.\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"
+
+#: src/bin/e_main.c:389
+msgid ""
+"Enlightenment cannot Initialize Ecore!\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Enlightenment ne može inicijalizirati Ecore!\n"
+"Možda vam nedostaje memorije?"
+
+#: src/bin/e_main.c:415
+msgid ""
+"Enlightenment cannot initialize the File system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Enlightenment ne može inicijalizirati Sistem datoteka.\n"
+"Možda vam nedostaje memorije?"
+
+#: src/bin/e_main.c:427
+msgid ""
+"Enlightenment cannot set up an exit signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Enlightenment ne može postaviti manipulator izlaznog signala.\n"
+"Možda vam nedostaje memorije?"
+
+#: src/bin/e_main.c:433
+msgid ""
+"Enlightenment cannot set up a HUP signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Enlightenment ne može postaviti manipulator HUP signala.\n"
+"Možda vam nedostaje memorije?"
+
+#: src/bin/e_main.c:445
+msgid ""
+"Enlightenment cannot initialize its X connection.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment ne može inicijalizirati svoju X konekciju.\n"
+"Jeste li postavili vašu PRIKAZ varijablu?"
+
+#: src/bin/e_main.c:453
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Enlightenment ne može inicijalizirati svoj sistem hitnog alarma.\n"
+"Jeste li postavili svoju PRIKAZ varijablu?"
+
+#: src/bin/e_main.c:476
+msgid ""
+"Enlightenment cannot initialize the connections system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Enlightenment ne može inicijalizirati sistem povezanosti.\n"
+"Možda vam nedostaje memorije?"
+
+#: src/bin/e_main.c:484
+msgid ""
+"Enlightenment cannot initialize the IPC system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Enlightenment ne može inicijalizirati IPC sistem.\n"
+"Možda vam nedostaje memorije?"
+
+#: src/bin/e_main.c:493
+msgid ""
+"Enlightenment cannot setup xinerama wrapping.\n"
+"This should not happen."
+msgstr ""
+"Enlightenment ne može postaviti xinerama omot.\n"
+"Ovo se nije trebalo dogoditi."
+
+#: src/bin/e_main.c:512
+msgid ""
+"Enlightenment cannot initialize the Evas system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Enlightenment ne može inicijalizirati Evas sistem.\n"
+"Možda vam nedostaje memorije?"
+
+#: src/bin/e_main.c:518
+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 je pronašao da ecore_evas ne podržava Software X11\n"
+"prikaz u Evas. Molimo provjerite instalaciju Evas i\n"
+"Ecore i provjerite da podržava Software X11 prikaznu mašinu."
+
+#: src/bin/e_main.c:525
+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 je otkrio da ecore_evas nema podršku za Softver Bufer\n"
+"koji prezentira u Evas. Molimo provjerite vašu instalaciju Evas i Ecore i \n"
+"provjerite da ovi podržavaju Softver Bufer prezentacionu mašinu."
+
+#: src/bin/e_main.c:541 src/bin/e_main.c:548
+msgid ""
+"Enlightenment cannot initialize the FDO desktop system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Enlightenment ne može inicijalizirati sistem FDO radne površine,\n"
+"Možda vam nedostaje memorije?"
+
+#: src/bin/e_main.c:562
+msgid ""
+"Enlightenment cannot create directories in your home directory.\n"
+"Perhaps you have no home directory or the disk is full?"
+msgstr ""
+"Enlightenment ne može kreirati direktorije u vašem polaznom direktoriju.\n"
+"Možda nemate polazni direktorij ili je vašdisk pun?"
+
+#: src/bin/e_main.c:572
+msgid "Enlightenment cannot set up its file registry system."
+msgstr "Enlightenment ne može postaviti svoj sistem datotečnih registara."
+
+#: src/bin/e_main.c:581
+msgid "Enlightenment cannot set up its config system."
+msgstr "Enlightenment ne može postaviti svoj Config sistem."
+
+#: src/bin/e_main.c:595
+msgid "Enlightenment cannot set up its scale system."
+msgstr "Enlightenment ne može postaviti svoj sustav promjene veličine."
+
+#: src/bin/e_main.c:603
+msgid "Enlightenment cannot set up the pointer system."
+msgstr "Enlightenment ne može postaviti svoj sustav pokazivača."
+
+#: src/bin/e_main.c:612
+msgid ""
+"Enlightenment cannot set up paths for finding files.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Enlightenment ne može postaviti puteve za pronalaženje datoteka.\n"
+"Možda nemate dovoljno memorije?"
+
+#: src/bin/e_main.c:630
+msgid "Enlightenment cannot set up its font system."
+msgstr "Enlightenment ne može postaviti svoj sistem pisma."
+
+#: src/bin/e_main.c:641
+msgid "Enlightenment cannot set up its theme system."
+msgstr "Enlightenment ne može postaviti svoj sistem tema."
+
+#: src/bin/e_main.c:646
+msgid "Starting International Support"
+msgstr "Pokretanje Međunarodne Podrške"
+
+#: src/bin/e_main.c:651
+msgid "Enlightenment cannot set up its intl system."
+msgstr "Enlightenment ne može postaviti svoj intl sistem."
+
+#: src/bin/e_main.c:662
+msgid ""
+"Enlightenment cannot set up init screen.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Enlightenment ne može postaviti init ekran.\n"
+"Možda nemate dovoljno memorije?"
+
+#: src/bin/e_main.c:674
+msgid "Testing Format Support"
+msgstr "Testiranje Podrške Formata"
+
+#: src/bin/e_main.c:685
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+"Enlightenment je otkrio da Evas ne može kreirati bafer kanvas. Molimo "
+"provjerite\n"
+"da Evas ima podršku za Softver Bafer mašinu.\n"
+
+#: src/bin/e_main.c:696
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
+"loader support.\n"
+msgstr ""
+"Enlightenment je otkrio da Evas ne može učitavati PNG datoteke. Provjeri \n"
+"da li Evas ima podršku učitavanja za PNG.\n"
+
+#: src/bin/e_main.c:705
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
+"loader support.\n"
+msgstr ""
+"Enlightenment je otkrio da Evas ne može učitavati JPEG datoteke. Provjeri \n"
+"da li Evas ima podršku učitavanja za JPEG.\n"
+
+#: src/bin/e_main.c:714
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
+"loader support.\n"
+msgstr ""
+"Enlightenment je otkrio da Evas ne može učitavati EET datoteke. Provjeri \n"
+"da li Evas ima podršku učitavanja za EET.\n"
+
+#: src/bin/e_main.c:725
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+"Enlightenment je otkrio da Evas ne može učitavati 'Sans' pismo. Provjeri \n"
+"da li Evas ima fontconfig podršku i da sustavni fontconfig definira 'Sans' "
+"pismo.\n"
+
+#: src/bin/e_main.c:735
+msgid "Setup Screens"
+msgstr "Postavi Ekrane"
+
+#: src/bin/e_main.c:740
+msgid ""
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
+msgstr ""
+"Upravitelj postavki prozora za Enlightenment za sve zaslone na vašem "
+"sustavu\n"
+"nije uspio. Možda je neki drugi upravitelj prozora aktivan?\n"
+
+#: src/bin/e_main.c:746
+msgid "Setup Screensaver"
+msgstr "Postavka Čuvara Zaslona"
+
+#: src/bin/e_main.c:751
+msgid "Enlightenment cannot configure the X screensaver."
+msgstr "Enlightenment ne može konfigurirati X čuvar zaslona."
+
+#: src/bin/e_main.c:755
+msgid "Setup Desklock"
+msgstr "Postavi Zaključavanje Radne Površine"
+
+#: src/bin/e_main.c:760
+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:773
+msgid "Setting up Paths"
+msgstr "Postavke Puteva"
+
+#: src/bin/e_main.c:790
+msgid "Setup System Controls"
+msgstr "Postavljanje Kontrola Sustava"
+
+#: src/bin/e_main.c:795
+msgid "Enlightenment cannot initialize the System Command system.\n"
+msgstr "Enlightenment ne može inicijalizirati Sustavne Naredbe\n"
+
+#: src/bin/e_main.c:800
+msgid "Setup Actions"
+msgstr "Postavi Akcije"
+
+#: src/bin/e_main.c:805
+msgid "Enlightenment cannot set up its actions system."
+msgstr "Enlightenment ne može postaviti svoj sistem akcija."
+
+#: src/bin/e_main.c:809
+msgid "Setup Execution System"
+msgstr "Postavljanje Izvršnog Sistema"
+
+#: src/bin/e_main.c:814
+msgid "Enlightenment cannot set up its exec system."
+msgstr "Enlightenment ne može postaviti svoj exec sistem."
+
+#: src/bin/e_main.c:818
+msgid "Setup Remembers"
+msgstr "Postavi Podsjetnike"
+
+#: src/bin/e_main.c:823
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment ne može postaviti postavke podsjetnika."
+
+#: src/bin/e_main.c:831
+msgid "Setup FM"
+msgstr "Postavi FM"
+
+#: src/bin/e_main.c:836
+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
+msgid "Setup Message System"
+msgstr "Postavi Sistem Poruka"
+
+#: src/bin/e_main.c:854
+msgid "Enlightenment cannot set up its msg system."
+msgstr "Enlightenment ne može postaviti svoj msg sistem."
+
+#: src/bin/e_main.c:858
+msgid "Setup DND"
+msgstr "Postavi DND"
+
+#: src/bin/e_main.c:863
+msgid "Enlightenment cannot set up its dnd system."
+msgstr "Enlightenment ne može postaviti svoj DND sistem."
+
+#: src/bin/e_main.c:867
+#, fuzzy
+msgid "Setup Grab Input Handling"
+msgstr "Postavka Rukovanja Grabljenja Unosa"
+
+#: src/bin/e_main.c:872
+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:876
+msgid "Setup Modules"
+msgstr "Postavi Module"
+
+#: src/bin/e_main.c:881
+msgid "Enlightenment cannot set up its module system."
+msgstr "Enlightenmet ne može postaviti svoj sistem modula."
+
+#: src/bin/e_main.c:885
+msgid "Setup Color Classes"
+msgstr "Postavi Klase Boja"
+
+#: src/bin/e_main.c:890
+msgid "Enlightenment cannot set up its color class system."
+msgstr "Enlightenment ne može postaviti svoj sistem klasiranja boja."
+
+#: src/bin/e_main.c:894
+msgid "Setup Gadcon"
+msgstr "Postavi Gadcon"
+
+#: src/bin/e_main.c:899
+msgid "Enlightenment cannot set up its gadget control system."
+msgstr "Enlightenment ne može postaviti svoj sistem kontrole aparata"
+
+#: src/bin/e_main.c:904
+msgid "Setup DPMS"
+msgstr "Postavi DPMS"
+
+#: src/bin/e_main.c:909
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment ne može konfigurirati DPMS postavke."
+
+#: src/bin/e_main.c:913
+msgid "Set Up Powersave modes"
+msgstr "Postavi modove Štednje energije"
+
+#: src/bin/e_main.c:917
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr "Enlightenment ne može postaviti svoje modove štednje energije."
+
+#: src/bin/e_main.c:922
+msgid "Setup Wallpaper"
+msgstr "Postavi Tapetu"
+
+#: src/bin/e_main.c:927
+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:932
+msgid "Setup Mouse"
+msgstr "Postavi Miša"
+
+#: src/bin/e_main.c:937
+msgid "Enlightenment cannot configure the mouse settings."
+msgstr "Enlightenment ne može konfigurirati postavke miša."
+
+#: src/bin/e_main.c:942
+msgid "Setup Bindings"
+msgstr "Postavljanje Poveznika"
+
+#: src/bin/e_main.c:947
+msgid "Enlightenment cannot set up its bindings system."
+msgstr "Enlightenment ne može postaviti svoj sistem poveznika"
+
+#: src/bin/e_main.c:951
+msgid "Setup Popups"
+msgstr "Postavi Pop-ups"
+
+#: src/bin/e_main.c:956
+msgid "Enlightenment cannot set up its popup system."
+msgstr "Enlightenment ne može postaviti svoj pop-up sistem."
+
+#: src/bin/e_main.c:961
+msgid "Setup Shelves"
+msgstr "Postavi Police"
+
+#: src/bin/e_main.c:966
+msgid "Enlightenment cannot set up its shelf system."
+msgstr "Enlightenment ne može postaviti svoj sistem polica."
+
+#: src/bin/e_main.c:971
+msgid "Setup Thumbnailer"
+msgstr "Postavi Urednika Sličica"
+
+#: src/bin/e_main.c:976
+msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
+msgstr "Enlightenment ne može inicijalizirati sustav Postavljanja Sličica.\n"
+
+#: src/bin/e_main.c:981
+msgid "Set Up File Ordering"
+msgstr "Postavi Raspored Datoteka"
+
+#: src/bin/e_main.c:985
+msgid "Enlightenment cannot set up its order file system."
+msgstr "Enlightenment ne može postaviti svoj sistem rasporeda datoteka."
+
+#: src/bin/e_main.c:1020
+msgid "Load Modules"
+msgstr "Unesi Module"
+
+#: src/bin/e_main.c:1028
+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 je pao na samom početku i<br>ponovo je postavljen. Svi moduli "
+"su onesposobljeni<br>i neće biti učitani da bi se lakše otkrili "
+"problemni<br>moduliu vašoj konfiguraciji. Dijalog konfiguracije modula<br>će "
+"vam omogućiti ponovni odabir vaših modula."
+
+#: src/bin/e_main.c:1035
+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:1036
+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 je pao na samom početku i ponovo je postavljen.<br>Svi moduli "
+"su onesposobljeni i neće biti učitani da bi se lakše<br>otkrili problemni "
+"moduliu vašoj konfiguraciji.<br><br>Dijalog konfiguracije modula će vam "
+"omogućiti ponovni odabir<br>vaših modula."
+
+#: src/bin/e_main.c:1044
+msgid "Configure Shelves"
+msgstr "Konfiguriraj Police"
+
+#: src/bin/e_main.c:1054
+msgid "Almost Done"
+msgstr "Skoro Gotovo"
+
+#: src/bin/e_module.c:117
+#, 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 ""
+"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
+msgid "Error loading Module"
+msgstr "Greška kod unošenja Modula"
+
+#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#, 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 ""
+"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
+msgid "Module does not contain all needed functions"
+msgstr "Modul ne sadrži sve neophodne funkcije"
+
+#: src/bin/e_module.c:164
+#, 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 ""
+"Greška API Modula.<br>Greška kod inicijaliziranja Modula: %s.<br>Ovo "
+"zahtijeva najmanju inačicu API modula: %i.<br>API modul kojeg Enlightenment "
+"reklamira je: %i.<br>"
+
+#: src/bin/e_module.c:169
+#, c-format
+msgid "Enlightenment %s Module"
+msgstr "Enlightenment %s Modul"
+
+#: src/bin/e_module.c:497
+msgid "Would you like to unload this module?<br>"
+msgstr "Da li želite isprazniti ovaj modul?<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:1272 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
+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
+msgid "Stop Moving/Resizing Items"
+msgstr "Zaustavi Pomicanje/Promjenu Veličine Stvari"
+
+#: src/bin/e_shelf.c:1690 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
+msgid "Set Shelf Contents"
+msgstr "Sadržaj Police"
+
+#: src/bin/e_shelf.c:1708
+msgid "Delete this Shelf"
+msgstr "Ukloni ovu Policu"
+
+#: src/bin/e_startup.c:66
+msgid "Starting"
+msgstr "Početak"
+
+#: src/bin/e_sys.c:170
+msgid "Checking System Permissions"
+msgstr "Provjeravanje Sustavnih Dozvola"
+
+#: 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 "Provjera Sustava Završena"
+
+#: src/bin/e_sys.c:314
+msgid "Logout problems"
+msgstr "Odjavni Problemi"
+
+#: src/bin/e_sys.c:317
+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 ""
+"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
+msgid "Logout now"
+msgstr "Odjavi se odmah"
+
+#: src/bin/e_sys.c:324
+msgid "Wait longer"
+msgstr "Čekaj još malo"
+
+#: src/bin/e_sys.c:325
+msgid "Cancel Logout"
+msgstr "Odustani od Odjave"
+
+#: src/bin/e_sys.c:363
+msgid "Logout in progress"
+msgstr "Odjava u procesu"
+
+#: src/bin/e_sys.c:366
+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
+msgid "Enlightenment is busy with another request"
+msgstr "Enlightenment je trenutno zaposlen na drugom zahtjevu."
+
+#: src/bin/e_sys.c:401
+msgid ""
+"Logging out.<br>You cannot perform other system actions<br>once a logout has "
+"begun."
+msgstr ""
+"Odjavljivanje.<br>Ne možete izvoditi druge sustavne akcije<br>kad je proces "
+"odjave već pokrenut."
+
+#: src/bin/e_sys.c:409
+msgid ""
+"Powering off.<br>You cannot do any other system actions<br>once a shutdown "
+"has been started."
+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
+msgid ""
+"Resetting.<br>You cannot do any other system actions<br>once a reboot has "
+"begun."
+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
+msgid ""
+"Suspending.<br>Until suspend is complete you cannot perform<br>any other "
+"system actions."
+msgstr ""
+"Suspendiranje.<br>Ne možete uraditi nijednu sustavnu funkciju<br>dok "
+"suspendiranje nije završeno."
+
+#: src/bin/e_sys.c:430
+msgid ""
+"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"complete."
+msgstr ""
+"Hiberniranje.<br>Ne možete uraditi nijednu sustavnu funkciju<br>dok ovo nije "
+"završeno."
+
+#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+msgid "EEK! This should not happen"
+msgstr "EEK! Ovo se nije trebalo dogoditi."
+
+#: src/bin/e_sys.c:463
+msgid "Power off failed."
+msgstr "Gašenje neuspjelo."
+
+#: src/bin/e_sys.c:468
+msgid "Reset failed."
+msgstr "Ponovno postavljanje nije uspjelo"
+
+#: src/bin/e_sys.c:473
+msgid "Suspend failed."
+msgstr "Suspendiranje nije uspjelo"
+
+#: src/bin/e_sys.c:478
+msgid "Hibernate failed."
+msgstr "Hiberniranje nije uspjelo"
+
+#: src/bin/e_sys.c:535
+msgid "Power off"
+msgstr "Gašenje"
+
+#: src/bin/e_sys.c:538
+msgid "Power off.<br><hilight>Please wait.</hilight>"
+msgstr "Gašenje.<br><hilight>Molimo čekajte.</hilight>"
+
+#: src/bin/e_sys.c:562
+msgid "Resetting"
+msgstr "Ponovno postavljanje"
+
+#: src/bin/e_sys.c:565
+msgid "Resetting.<br><hilight>Please wait.</hilight>"
+msgstr "Ponovno postavljanje.<br><hilight>Molimo pričekajte.</hilight>"
+
+#: src/bin/e_sys.c:588
+msgid "Suspending"
+msgstr "Suspendiranje"
+
+#: src/bin/e_sys.c:591
+msgid "Suspending.<br><hilight>Please wait.</hilight>"
+msgstr "Suspendiranje.<br><hilight>Molimo pričekajte.</hilight>"
+
+#: src/bin/e_sys.c:614
+msgid "Hibernating"
+msgstr "Hiberniranje"
+
+#: src/bin/e_sys.c:617
+msgid "Hibernating.<br><hilight>Please wait.</hilight>"
+msgstr "Hiberniranje.<br><hilight>Molimo pričekajte.</hilight>"
+
+#: src/bin/e_theme_about.c:17
+msgid "About Theme"
+msgstr "O Temi"
+
+#: src/bin/e_theme.c:42
+msgid "Set As Theme"
+msgstr "Postavi Kao Temu"
+
+#: src/bin/e_toolbar.c:340
+#, fuzzy
+msgid "Set Toolbar Contents"
+msgstr "Sadržaj Alatne Trake"
+
+#: src/bin/e_utils.c:246
+msgid "Cannot exit - immortal windows."
+msgstr "Nije moguće izaći - neuništivi prozori"
+
+#: src/bin/e_utils.c:247
+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 ""
+"Neki prozori su još aktivni sa osposobljenom Lifespan bravom. Ovo "
+"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:806
+#, c-format
+msgid "%'.0f Bytes"
+msgstr "%' .0f Bajta"
+
+#: src/bin/e_utils.c:810
+#, c-format
+msgid "%'.0f KB"
+msgstr "%' .0f KB"
+
+#: src/bin/e_utils.c:814
+#, c-format
+msgid "%'.0f MB"
+msgstr "%' .0f MB"
+
+#: src/bin/e_utils.c:818
+#, c-format
+msgid "%'.1f GB"
+msgstr "%'  .1f GB"
+
+#: src/bin/e_utils.c:838
+#, c-format
+msgid "In the Future"
+msgstr "Ubuduće"
+
+#: src/bin/e_utils.c:843
+#, c-format
+msgid "In the last Minute"
+msgstr "U zadnjoj Minuti"
+
+#: src/bin/e_utils.c:845
+#, c-format
+msgid "%li Years ago"
+msgstr "prije %li godina"
+
+#: src/bin/e_utils.c:847
+#, c-format
+msgid "%li Months ago"
+msgstr "prije %li Mjeseci"
+
+#: src/bin/e_utils.c:849
+#, c-format
+msgid "%li Weeks ago"
+msgstr "prije %li Tjedana"
+
+#: src/bin/e_utils.c:851
+#, c-format
+msgid "%li Days ago"
+msgstr "prije %li Dana"
+
+#: src/bin/e_utils.c:853
+#, c-format
+msgid "%li Hours ago"
+msgstr "prije %li Sati"
+
+#: src/bin/e_utils.c:855
+#, c-format
+msgid "%li Minutes ago"
+msgstr "prije %li Minuta"
+
+#: src/bin/e_utils.c:861
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: 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
+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_shelves/e_int_config_shelf.c:79
+#: src/modules/ibar/e_mod_config.c:110
+msgid "Add"
+msgstr "Dodaj"
+
+#: src/bin/e_widget_config_list.c:69
+msgid "Remove"
+msgstr "Ukloni"
+
+#: src/bin/e_widget_config_list.c:83
+#: src/modules/conf_applications/e_int_config_apps.c:258
+msgid "Up"
+msgstr "Gore"
+
+#: src/bin/e_widget_config_list.c:89
+#: src/modules/conf_applications/e_int_config_apps.c:263
+msgid "Down"
+msgstr "Dolje"
+
+#: src/bin/e_widget_fsel.c:293
+msgid "Add to Favorites"
+msgstr "Dodaj u Omiljene"
+
+#: src/bin/e_widget_fsel.c:299
+#: 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_wallpaper/e_int_config_wallpaper.c:519
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: 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
+msgid "Permissions:"
+msgstr "Dozvole:"
+
+#: src/bin/e_widget_fsel.c:376
+msgid "Modified:"
+msgstr "Modificirano:"
+
+#: src/bin/e_widget_fsel.c:615
+#, c-format
+msgid "You"
+msgstr "Vi"
+
+#: src/bin/e_widget_fsel.c:664
+#, 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
+#, c-format
+msgid "Read Only"
+msgstr "Samo za Čitanje"
+
+#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#, c-format
+msgid "Forbidden"
+msgstr "Zabranjen"
+
+#: src/bin/e_widget_fsel.c:691
+msgid "Read-Write"
+msgstr "Čitaj-Piši"
+
+#: src/modules/battery/e_mod_config.c:41
+msgid "Battery Monitor Settings"
+msgstr "Postavke Monitora Baterije"
+
+#: src/modules/battery/e_mod_config.c:92
+msgid "Basic Settings"
+msgstr "Osnovne Postavke"
+
+#: src/modules/battery/e_mod_config.c:93
+msgid "Show alert when battery is low"
+msgstr "Prikaži alarm kad je baterija niska"
+
+#: src/modules/battery/e_mod_config.c:136
+msgid "Check every:"
+msgstr "Provjeri svaki:"
+
+#: src/modules/battery/e_mod_config.c:138
+#: 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:140
+msgid "Polling"
+msgstr "Prozivanje"
+
+#: src/modules/battery/e_mod_config.c:143
+msgid "Show alert on low battery"
+msgstr "Prikaži alarm na niskoj bateriji"
+
+#: src/modules/battery/e_mod_config.c:145
+msgid "Alert when at:"
+msgstr "Alarm kad je na:"
+
+#: src/modules/battery/e_mod_config.c:147
+#, c-format
+msgid "%1.0f min"
+msgstr "%1.0f min"
+
+#: src/modules/battery/e_mod_config.c:149
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:151
+msgid "Auto dismiss in..."
+msgstr "Automatski odbaci u..."
+
+#: src/modules/battery/e_mod_config.c:153
+#, c-format
+msgid "%1.0f sec"
+msgstr "%1.0f sek"
+
+#: src/modules/battery/e_mod_config.c:155
+msgid "Alert"
+msgstr "Alarm"
+
+#: src/modules/battery/e_mod_config.c:160
+msgid "Auto Detect"
+msgstr "Automatski Otkrij"
+
+#: src/modules/battery/e_mod_config.c:162
+#: 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 "Interno"
+
+#: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
+msgid "HAL"
+msgstr "HAL"
+
+#: src/modules/battery/e_mod_config.c:167
+msgid "Hardware"
+msgstr "Hardver"
+
+#: src/modules/battery/e_mod_main.c:135
+msgid "Battery"
+msgstr "Baterija"
+
+#: src/modules/battery/e_mod_main.c:844
+msgid "Your battery is low!"
+msgstr "Baterija je niska"
+
+#: src/modules/battery/e_mod_main.c:846
+msgid "AC power is recommended."
+msgstr "AC energija je preporučena"
+
+#: src/modules/battery/e_mod_main.c:921
+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
+msgid "ERROR"
+msgstr "GREŠKA"
+
+#: src/modules/battery/e_mod_main.c:1093
+msgid "Battery Meter"
+msgstr "Baterijski Mjerač"
+
+#: src/modules/clock/e_mod_main.c:98
+msgid "Clock"
+msgstr "Sat"
+
+#: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
+msgid "Settings Panel"
+msgstr "Panel Postavki"
+
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Ponovno postavljanje"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "Isključeno Vrijeme"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Moduli"
+
+#: src/modules/conf_applications/e_int_config_apps.c:50
+#: src/modules/conf_applications/e_mod_main.c:42
+msgid "Favorites Menu"
+msgstr "Omiljeni Izborink"
+
+#: 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 "IBar Aplikacija"
+
+#: src/modules/conf_applications/e_int_config_apps.c:135
+#: src/modules/conf_applications/e_mod_main.c:38
+msgid "Startup Applications"
+msgstr "Aplikacije za Podizanje Sustava"
+
+#: src/modules/conf_applications/e_int_config_apps.c:151
+#: src/modules/conf_applications/e_mod_main.c:37
+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:1923
+msgid "All Applications"
+msgstr "Sve Aplikacije"
+
+#: src/modules/conf_applications/e_int_config_apps.c:250
+msgid "Selected Applications"
+msgstr "Odabrane Aplikacije"
+
+#: src/modules/conf_applications/e_mod_main.c:34
+msgid "Apps"
+msgstr "Apps"
+
+#: src/modules/conf_applications/e_mod_main.c:35
+msgid "New Application"
+msgstr "Nove Aplikacije"
+
+#: src/modules/conf_applications/e_mod_main.c:40
+msgid "IBar Other"
+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
+msgid "Menus"
+msgstr "Izbornici"
+
+#: src/modules/conf_borders/e_int_config_borders.c:30
+#: src/modules/conf_borders/e_int_config_borders.c:197
+msgid "Default Border Style"
+msgstr "Zadani Stil Bordure"
+
+#: src/modules/conf_borders/e_int_config_borders.c:50
+msgid "Window Border Selection"
+msgstr "Odabir Obruba Prozora"
+
+#: src/modules/conf_borders/e_int_config_borders.c:242
+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_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 "Pogledaj"
+
+#: src/modules/conf_borders/e_mod_main.c:35
+msgid "Borders"
+msgstr "Bordure"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:40
+msgid "Client List Settings"
+msgstr "Postavke Liste Klijenata"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:99
+msgid "Group By"
+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_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 "Nijedan"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:107
+msgid "Include windows from other screens"
+msgstr "Uvrsti prozore iz drugih ekrana"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:111
+msgid "Separate Groups By"
+msgstr "Odvoji Grupe Po:"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:116
+msgid "Using separator bars"
+msgstr "Korištenje razdvojnih traka"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:118
+msgid "Using menus"
+msgstr "Upotrebljavanje izbornika"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:122
+msgid "Client Sort Order"
+msgstr "Red Sortiranja Klijenata"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:126
+msgid "Alphabetical"
+msgstr "Abecedno"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:128
+msgid "Window stacking layer"
+msgstr "Sloj slaganja prozora"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:130
+msgid "Most recently used"
+msgstr "Najskorije upotrijebljen"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:134
+msgid "Iconified Windows"
+msgstr "Ikonizirani Prozori"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:136
+msgid "Group with owning desktop"
+msgstr "Ugrupiraj sa vlastiotm radnom površinom"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:138
+msgid "Group with current desktop"
+msgstr "Ugrupiraj sa aktivnom radnom površinom"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:140
+msgid "Separate group"
+msgstr "Posebna grupa"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:142
+msgid "Warp to owning desktop"
+msgstr "Uvij na vlastitu radnu površinu"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:146
+msgid "Menu Item Captions"
+msgstr "Natpisi Stavaka Izbornika"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:147
+msgid "Limit caption length"
+msgstr "Ograniči dužinu natpisa"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:149
+#, c-format
+msgid "%1.0f Chars"
+msgstr "%1.0f Karaktera"
+
+#: src/modules/conf_clientlist/e_mod_main.c:35
+msgid "Client List Menu"
+msgstr "Izbornik Liste Klijenata"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:47
+msgid "Window Manager"
+msgstr "Upravitelj Prozora"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:48
+msgid "About Dialog Title"
+msgstr "O Naslovu Dijaloga"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:49
+msgid "About Dialog Version"
+msgstr "O Inačici Dijaloga"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:50
+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"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:52
+msgid "Error Text"
+msgstr "Tekst Greške"
+
+#: 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 "Naziv Izbornika"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:54
+msgid "Menu Title Active"
+msgstr "Naslov Izbornika Aktivan"
+
+#: 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 "Element Izbornka"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:56
+msgid "Menu Item Active"
+msgstr "Aktivna Stavka Izbornika"
+
+#: 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 "Premjesti Tekst"
+
+#: 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 "Promijeni Veličinu Teksta"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:59
+msgid "Winlist Item"
+msgstr "Winlist stavka"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:60
+msgid "Winlist Label"
+msgstr "Winlist Oznaka"
+
+#: 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 "Winlist Naslov"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
+msgid "Widgets"
+msgstr "Grafički Element"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:68
+msgid "Button Text"
+msgstr "Tekst Gumba"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:69
+msgid "Button Text Disabled"
+msgstr "Tekst Gumba Onesposobljen"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:70
+msgid "Check Text"
+msgstr "Provjeri Tekst"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:71
+msgid "Check Text Disabled"
+msgstr "Tekst Potvrdnog Okvira Onesposobljen"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:72
+msgid "Entry Text"
+msgstr "Tekst Unosa"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:73
+msgid "Label Text"
+msgstr "Tekst Oznake"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:74
+msgid "List Item Text"
+msgstr "Tekst Stavke sa Liste"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:75
+msgid "List Item Odd Text"
+msgstr "Prekobrojan Tekst Stavki sa Liste"
+
+#: 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 "Zaglavlje Liste"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:77
+msgid "Radio Text"
+msgstr "Radio Tekst"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:78
+msgid "Radio Text Disabled"
+msgstr "Radio Tekst Onemogućen"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:79
+msgid "Slider Text"
+msgstr "Tekst Klizača"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:80
+msgid "Slider Text Disabled"
+msgstr "Tekst Klizača Onesposobljen"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:87
+msgid "Module Label"
+msgstr "Oznaka Modula"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:130
+#: src/modules/conf_colors/e_mod_main.c:35
+msgid "Colors"
+msgstr "Boje"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:251
+msgid "Other"
+msgstr "Ostalo"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:435
+msgid "Window Manager Colors"
+msgstr "Boje Upravitelja Prozora"
+
+#: 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 "Omogućeno"
+
+#: 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 "Onemogućeno"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:443
+msgid "Widget Colors"
+msgstr "Boje Grafičkog Elementa"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:451
+msgid "Module Colors"
+msgstr "Boje Modula"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:501
+msgid "Color Classes"
+msgstr "Klase Boja"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:529
+msgid "Object Color"
+msgstr "Boja Objekta"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:538
+msgid "Outline Color"
+msgstr "Boja Konture"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:547
+msgid "Shadow Color"
+msgstr "Boja Sjene"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:556
+msgid "Defaults"
+msgstr "Zadano"
+
+#: src/modules/conf_desk/e_int_config_desk.c:52
+msgid "Desk Settings"
+msgstr "Postavke Radne Površine"
+
+#: src/modules/conf_desk/e_int_config_desk.c:149
+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_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+msgid "Name:"
+msgstr "Naziv:"
+
+#: src/modules/conf_desk/e_int_config_desk.c:156
+msgid "Desktop Wallpaper"
+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"
+
+#: src/modules/conf_desk/e_mod_main.c:35
+msgid "Desk"
+msgstr "Radna Površina"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
+msgid "Screen Lock Settings"
+msgstr "Postavke Zaključavanja Ekrana"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
+msgid "Automatic Locking"
+msgstr "Automatsko Zaključavanje"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
+msgid "Lock when Enlightenment starts"
+msgstr "Zaključaj kad Enlightenment krene"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
+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"
+
+#: 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 sekundi"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
+msgid "Lock when idle time exceeded"
+msgstr "Zaključaj ako je prekoračeno vrijeme praznog hoda"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
+msgid "Idle time to exceed"
+msgstr "Vrijeme neaktivnosti za prekoračiti"
+
+#: 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 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_wallpaper/e_int_config_wallpaper.c:509
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/gadman/e_mod_config.c:186
+msgid "Personal"
+msgstr "Osobno"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
+msgid "Login Box Settings"
+msgstr "Postavke Prijavne Kutije"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
+msgid "Show on all screen zones"
+msgstr "Prikaži na svim zonama zaslona"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
+msgid "Show on current screen zone"
+msgstr "Prikaži na aktivnoj zoni zaslona"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
+msgid "Show on screen zone #:"
+msgstr "Prikaži na zoni zaslona #:"
+
+#: 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:109
+#: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: 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 "Tapetni Mod"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
+#: src/modules/gadman/e_mod_config.c:149
+msgid "Theme Defined"
+msgstr "Definirana Tema"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
+msgid "Theme Wallpaper"
+msgstr "Tematska Tapeta"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "Upotrijebi Tematsku Tapetu"
+
+#: 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 "Posebna Brava Zaslona"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
+msgid "Use custom screenlock"
+msgstr "Koristi posebnu bravu zaslona"
+
+#: src/modules/conf_desklock/e_mod_main.c:35
+msgid "Screen Lock"
+msgstr "Brava Zaslona"
+
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
+msgid "Virtual Desktops Settings"
+msgstr "Postavke Virtualne Radne Površine"
+
+#: src/modules/conf_desks/e_int_config_desks.c:239
+msgid "Number of Desktops"
+msgstr "Broj Radnih Površina"
+
+#: 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 "Okreni Radnu Površinu Mišom"
+
+#: src/modules/conf_desks/e_int_config_desks.c:259
+msgid "Animated flip"
+msgstr "Animirani okretaj"
+
+#: src/modules/conf_desks/e_int_config_desks.c:277
+msgid "Desktops"
+msgstr "Radne Površine"
+
+#: src/modules/conf_desks/e_int_config_desks.c:296
+msgid "Flip when dragging objects to the screen edge"
+msgstr "Okreni kod pomicanja objekata ka rubu zaslona"
+
+#: src/modules/conf_desks/e_int_config_desks.c:298
+msgid "Wrap desktops around when flipping"
+msgstr "Omotaj radne površine kod okretanja"
+
+#: src/modules/conf_desks/e_int_config_desks.c:302
+msgid "Flip Animation"
+msgstr "Animacija Okretanja"
+
+#: src/modules/conf_desks/e_int_config_desks.c:304
+msgid "Off"
+msgstr "Isključen"
+
+#: src/modules/conf_desks/e_int_config_desks.c:307
+msgid "Pane"
+msgstr "Panel"
+
+#: src/modules/conf_desks/e_int_config_desks.c:310
+msgid "Zoom"
+msgstr "Zumiranje"
+
+#: 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 sek"
+
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Promjena Pozadine"
+
+#: 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 "Virtualne Radne Površine"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+msgid "Dialog Settings"
+msgstr "Postavke Dijaloga"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: 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_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/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
+msgid "Disable Confirmation Dialogs"
+msgstr "Onesposobi Potvrdne Dijaloge"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+msgid "Normal Windows"
+msgstr "Normalni Prozori"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+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
+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
+msgid "Advanced Mode"
+msgstr "Napredni Mod"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+msgid "Default Dialog Mode"
+msgstr "Zadani Dijalog Mod"
+
+#: src/modules/conf_dialogs/e_mod_main.c:35
+msgid "Dialogs"
+msgstr "Dijalozi"
+
+#: 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 ""
+"Da li ovo izgleda u redu?<hilight>Pohrani</hilight>ako je u redu, ili Obnovi "
+"ako nije.<br>Ako ne pritisnete gumb, stara razlučivost od<br>%dx%d at %d Hz "
+"će biti obnovljena u %d sekundi."
+
+#: src/modules/conf_display/e_int_config_display.c: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 ""
+"Da li ovo izgleda u redu? <hilight>Pohrani</hilight> ako je u redu, ili "
+"Obnovi ako nije.<br>Ako ne pritisnete gumb, stara razlučivost od<br>%dx%d će "
+"biti obnovljena u %d sekundi."
+
+#: src/modules/conf_display/e_int_config_display.c: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 ""
+"Da li ovo izgleda u redu? <hilight>Pohrani</hilight> ako je u redu, ili "
+"Obnovi ako nije.<br>Ako ne pritisnete gumb, stara razlučivost od<br>%dx%d "
+"pri %d Hz će biti obnovljena <hilight>ODMAH</hilight>"
+
+#: src/modules/conf_display/e_int_config_display.c: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 ""
+"Da li ovo izgleda u redu? <hilight>Pohrani</hilight> ako je u redu, ili "
+"Obnovi ako nije.<br>Ako ne pritisnete gumb, stara razlučivost od<br>%dx%d će "
+"biti obnovljena <hilight>ODMAH</hilight>"
+
+#: src/modules/conf_display/e_int_config_display.c:190
+msgid "Resolution change"
+msgstr "Promjena razlučivosti"
+
+#: src/modules/conf_display/e_int_config_display.c:194
+msgid "Save"
+msgstr "Spremi"
+
+#: src/modules/conf_display/e_int_config_display.c:195
+msgid "Restore"
+msgstr "Obnovi"
+
+#: src/modules/conf_display/e_int_config_display.c:228
+msgid "Screen Resolution Settings"
+msgstr "Postavke Razlučivosti Ekrana"
+
+#: src/modules/conf_display/e_int_config_display.c:405
+msgid "Resolution"
+msgstr "Razlučivost"
+
+#: src/modules/conf_display/e_int_config_display.c:412
+msgid "Restore on login"
+msgstr "Obnovi kod prijavljivanja"
+
+#: src/modules/conf_display/e_int_config_display.c:416
+msgid "Refresh"
+msgstr "Osvježi"
+
+#: src/modules/conf_display/e_int_config_display.c:475
+msgid "Rotation"
+msgstr "Rotacija"
+
+#: src/modules/conf_display/e_int_config_display.c:494
+msgid "Mirroring"
+msgstr "Zrcaljenje"
+
+#: src/modules/conf_display/e_int_config_display.c:641
+msgid "Missing Features"
+msgstr "Nedostaju Značajke"
+
+#: src/modules/conf_display/e_int_config_display.c:642
+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 ""
+"Vaš X Izložbeni Poslužitelj nema podršku za<br><hilight>XRandR</hilight> (X "
+"Promjena Veličine i Rotiranje) nastavak.<br>Ne možete promijeniti rezoluciju "
+"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
+msgid "No Refresh Rates Found"
+msgstr "Brzine Osvježavanja Nisu Pronađene"
+
+#: src/modules/conf_display/e_int_config_display.c:655
+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 ""
+"Vaš X Prikazni Poslužitelj nije priopćio brzine osvježavanja.<br>Ako "
+"koristite instalirani X Prikazni Poslužitelj, onda<br>je ovo očekivano. U "
+"protivnom, trenutna brzina osvježavanja će biti upotrijebljena<br>kod "
+"postavljanja rezolucije, što može prouzrokovati<hilight>oštećenje</"
+"hilight>vašega zaslona."
+
+#: src/modules/conf_display/e_mod_main.c:35
+msgid "Screen Resolution"
+msgstr "Razlučivost Ekrana"
+
+#: 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 "Prikaži Signalizaciju Upravljanja Energijom"
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:61
+msgid "The current display server is not <br>DPMS capable."
+msgstr "Trenutačni izložbeni poslužitelj nije<br>osposobljen za DPMS."
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:82
+msgid "The current display server does not <br>have the DPMS extension."
+msgstr "Trenutačni izložbeni poslužitelj nema<br>DPMS ekstenziju."
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:112
+msgid "Display Power Management Settings"
+msgstr "Prikaži Postavke Upravljanja Energijom"
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
+msgid "Enable Display Power Management"
+msgstr "Omogući Prikaz Upravljanja Energijom"
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
+msgid "Timers"
+msgstr "Tajmeri"
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
+msgid "Standby time"
+msgstr "Pričuvno Vrijeme"
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
+msgid "Suspend time"
+msgstr "Vrijeme Suspendiranja"
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
+msgid "Off time"
+msgstr "Isključeno Vrijeme"
+
+#: src/modules/conf_dpms/e_mod_main.c:35
+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_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 "<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:"
+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
+msgid "Edge Binding Settings"
+msgstr "Postavke Povezivanja Ruba"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: 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
+msgid "Add Edge"
+msgstr "Dodaj Rub"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+msgid "Delete Edge"
+msgstr "Izbriši Rub"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+msgid "Modify Edge"
+msgstr "Promijeni Rub"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: 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_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_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_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
+msgid "General Options"
+msgstr "Generalne Opcije"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+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
+msgid "Edge Binding Sequence"
+msgstr "Sekvenca Povezivanja Ruba"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#, c-format
+msgid "%.2f seconds"
+msgstr "%.2f sekunde"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+msgid "Binding Edge Error"
+msgstr "Greška Povezivanja Ruba"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#, 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 ""
+"Ključna sekvenca povezivanja, koju ste odabrali, je već u upotrebi od "
+"<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_keybindings/e_int_config_keybindings.c:1276
+#: src/modules/gadman/e_mod_gadman.c:763
+msgid "CTRL"
+msgstr "CTRL"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
+#: src/modules/gadman/e_mod_gadman.c:768
+msgid "ALT"
+msgstr "ALT"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
+#: src/modules/gadman/e_mod_gadman.c:774
+msgid "SHIFT"
+msgstr "SHIFT"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
+#: src/modules/gadman/e_mod_gadman.c:780
+msgid "WIN"
+msgstr "WIN"
+
+#: 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 "Unos"
+
+#: src/modules/conf_engine/e_int_config_engine.c:38
+msgid "Engine Settings"
+msgstr "Postavke Stroja"
+
+#: src/modules/conf_engine/e_int_config_engine.c:95
+msgid "Enable Composite"
+msgstr "Omogući Sprezanje"
+
+#: src/modules/conf_engine/e_int_config_engine.c:102
+msgid "Default Engine"
+msgstr "Uobičajeni Stroj"
+
+#: src/modules/conf_engine/e_int_config_engine.c:131
+msgid "Enable Composite Support ?"
+msgstr "Omogući Podršku Sprezanja?"
+
+#: 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 ""
+"Odabrali ste da omogućite podršku za sprezanje,<br>ali vaš aktivni zaslon ne "
+"podržava sprezanje.<br><br>Jeste li sigurni da hoćete da omogućite podršku "
+"sprezanja?"
+
+#: src/modules/conf_engine/e_mod_main.c:35
+msgid "Engine"
+msgstr "Stroj"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:49
+msgid "Run Command Settings"
+msgstr "Izvrši Postavke Naredbi"
+
+#: 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 "Maksimalan Broj Podudarnih Aplikacija za Listiranje"
+
+#: 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 "Maksimalni Broj Uparenih Exes za Izlistati"
+
+#: 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 "Maksimalna Povijest za Izlistati"
+
+#: 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 "Postavke Klizanja"
+
+#: 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 "Animirano Klizanje"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:185
+#: src/modules/conf_winlist/e_int_config_winlist.c:272
+msgid "Scroll Speed"
+msgstr "Brzina Klizanja"
+
+#: 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 "Postavke Terminala"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:198
+msgid "Terminal Command (CTRL+RETURN to utilize)"
+msgstr "Naredba Terminala (CTRL+RETURN za upotrijebiti)"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:206
+#: src/modules/conf_winlist/e_int_config_winlist.c:295
+msgid "Size Settings"
+msgstr "Postavke Veličine"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:207
+#: src/modules/conf_winlist/e_int_config_winlist.c:296
+msgid "Minimum Width"
+msgstr "Minimalna Širina"
+
+#: 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 "Minimalna Visina"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:215
+#: src/modules/conf_winlist/e_int_config_winlist.c:304
+msgid "Maximum Width"
+msgstr "Maksimalna Širina"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:219
+#: src/modules/conf_winlist/e_int_config_winlist.c:308
+msgid "Maximum Height"
+msgstr "Maksimalna Visina"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:225
+#: src/modules/conf_winlist/e_int_config_winlist.c:284
+msgid "Position Settings"
+msgstr "Postavke Pozicije"
+
+#: 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 "X-Axis Orijentacija"
+
+#: 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 "Y-Axis Orijentacija"
+
+#: 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 "Pokreni Naredbu"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
+msgid "Core"
+msgstr "Jezgra"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
+msgid "Title Bar"
+msgstr "Naslovna Traka"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
+msgid "Textblock Plain"
+msgstr "Normalan Blok Teksta"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
+msgid "Textblock Light"
+msgstr "Lagani Blok Teksta"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
+msgid "Textblock Big"
+msgstr "Veliki Blok Teksta"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
+#, fuzzy
+msgid "Settings Heading"
+msgstr "Panel Postavki"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
+msgid "About Title"
+msgstr "O Naslovu"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
+msgid "About Version"
+msgstr "O Inačici"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
+msgid "About Text"
+msgstr "O Tekstu"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
+msgid "Desklock Title"
+msgstr "Naslov Brave Radne Površine"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
+msgid "Desklock Password"
+msgstr "Lozinka Brave Radne Površine"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
+msgid "Dialog Error"
+msgstr "Greška Dijaloga"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
+msgid "Exebuf Command"
+msgstr "exebuf Naredba"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
+msgid "Splash Title"
+msgstr "Naslov Prskanja"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
+msgid "Splash Text"
+msgstr "Tekst Prskanja"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
+msgid "Splash Version"
+msgstr "Inačica Prskanja"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
+msgid "Entry"
+msgstr "Unos"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
+msgid "Frame"
+msgstr "Okvir"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
+msgid "Label"
+msgstr "Oznaka"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
+msgid "Buttons"
+msgstr "Gumbi"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
+msgid "Slider"
+msgstr "Klizač"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
+msgid "Radio Buttons"
+msgstr "Radio Gumbi"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
+msgid "Check Buttons"
+msgstr "Gumb Potvrdnog Okvira"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
+msgid "Text List Item"
+msgstr "Stavka Tekstualne Liste"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
+msgid "List Item"
+msgstr "Stavka Liste"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
+msgid "Filemanager"
+msgstr "Upravitelj datotekama"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
+msgid "Typebuf"
+msgstr "Typebuf"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:97
+msgid "Desktop Icon"
+msgstr "Ikona Radne Površine"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:103
+msgid "Small Styled"
+msgstr "Mali Format"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:104
+msgid "Normal Styled"
+msgstr "Normalan Format"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
+msgid "Large Styled"
+msgstr "Veliki Format"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
+msgid "Font Settings"
+msgstr "Postavke Pisma"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
+msgid "Big"
+msgstr "Velik"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
+msgid "Really Big"
+msgstr "Vrlo Velik"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:292
+#, c-format
+msgid "%d pixels"
+msgstr "%d piksela"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:428
+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_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
+msgid "Basic preview text: 123: 我的天空!"
+msgstr "Osnovni tekst pregleda : 123: 我的天空!"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:604
+msgid "Font Classes"
+msgstr "Klase Pisama"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:613
+msgid "Enable Font Class"
+msgstr "Osposobi Klasu Pisma"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Hinting"
+msgstr "Savjetovanje"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
+msgid "Bytecode"
+msgstr "Bajtkod"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: 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
+msgid "Font Fallbacks"
+msgstr "Rezervne Varijante Pisma"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:662
+msgid "Fallback Name"
+msgstr "Naziv Rezervne Varijante"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:674
+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_icon_theme/e_int_config_icon_themes.c:43
+msgid "Icon Theme Settings"
+msgstr "Postavke Tema Sličica"
+
+#: src/modules/conf_icon_theme/e_int_config_icon_themes.c:190
+msgid "Icon Themes"
+msgstr "Teme Sličica"
+
+#: src/modules/conf_icon_theme/e_int_config_icon_themes.c:198
+msgid "Icon theme overrides general theme"
+msgstr "Tema ikone nadvladava generalnu temu"
+
+#: src/modules/conf_icon_theme/e_mod_main.c:35
+msgid "Icon Theme"
+msgstr "Tema Sličica"
+
+#: src/modules/conf_imc/e_int_config_imc.c:109
+#: src/modules/conf_imc/e_mod_main.c:35
+msgid "Input Method Settings"
+msgstr "Postavke Metode Unosa"
+
+#: src/modules/conf_imc/e_int_config_imc.c:297
+msgid "Input Method Selector"
+msgstr "Odabirač Metode Unosa"
+
+#: 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 "Nemoj Upotrijebiti Metodu Unosa"
+
+#: 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 "Postavi Odabranu Metodu Unosa"
+
+#: src/modules/conf_imc/e_int_config_imc.c:901
+msgid "New"
+msgstr "Novi"
+
+#: src/modules/conf_imc/e_int_config_imc.c:903
+msgid "Import..."
+msgstr "Uvoz..."
+
+#: src/modules/conf_imc/e_int_config_imc.c:908
+msgid "Input Method Parameters"
+msgstr "Parametri Metode Unosa"
+
+#: src/modules/conf_imc/e_int_config_imc.c:918
+msgid "Execute Command"
+msgstr "Izvrši Naredbu"
+
+#: src/modules/conf_imc/e_int_config_imc.c:925
+msgid "Setup Command"
+msgstr "Postavi Naredbu"
+
+#: src/modules/conf_imc/e_int_config_imc.c:934
+msgid "Exported Environment Variables"
+msgstr "Izvežene Varijable Okruženja"
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:66
+msgid "Select an Input Method Settings..."
+msgstr "Odabeeri Postavke Metode Unosa"
+
+#: 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 "Greška Uvoza Konfiguracije Unosne Metode"
+
+#: 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 nije mogao da uveze konfiguraciju.<br><br>Jeste li  sigurni da "
+"je ovo valjana konfiguracija?"
+
+#: 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 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
+msgid "Language"
+msgstr "Jezik"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:37
+msgid "Interaction Settings"
+msgstr "Interakcijske Postavke"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:94
+msgid "Thumbscroll"
+msgstr "Listanje Sličica"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:96
+msgid "Enable Thumbscroll"
+msgstr "Osposobi Listanje Sličica"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:100
+msgid "Threshold for a thumb drag"
+msgstr "Granica povlačenja sličica"
+
+#: 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 "%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"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:110
+#, c-format
+msgid "%1.0f pixels/sec"
+msgstr "%1.0f piksela/sek"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:114
+msgid "Friction slowdown"
+msgstr "Usporavanje trenjem"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:117
+#, c-format
+msgid "%1.2f sec"
+msgstr "%1.2f sek"
+
+#: src/modules/conf_interaction/e_mod_main.c:35
+msgid "Interaction"
+msgstr "Interakcija"
+
+#: src/modules/conf_intl/e_int_config_intl.c:583
+#: src/modules/conf_intl/e_mod_main.c:35
+msgid "Language Settings"
+msgstr "Postavke Jezika"
+
+#: src/modules/conf_intl/e_int_config_intl.c:900
+#: src/modules/conf_intl/e_int_config_intl.c:977
+msgid "Language Selector"
+msgstr "Odabirač Jezika"
+
+#: src/modules/conf_intl/e_int_config_intl.c:950
+#: src/modules/conf_intl/e_int_config_intl.c:1028
+msgid "Locale Selected"
+msgstr "Odabrani Prostor"
+
+#: src/modules/conf_intl/e_int_config_intl.c:951
+#: src/modules/conf_intl/e_int_config_intl.c:1029
+msgid "Locale"
+msgstr "Prostor"
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
+msgid ""
+"Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
+msgstr ""
+"Molimo kliknite ključnu sekvencu,<br><br>ili <hilight>Escape</hilight> da "
+"abortirate."
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:92
+msgid "Key Binding Settings"
+msgstr "Postavke Ključnih Poveznika"
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:223
+#: src/modules/conf_keybindings/e_mod_main.c:35
+msgid "Key Bindings"
+msgstr "Ključni Poveznici"
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:228
+msgid "Add Key"
+msgstr "Dodaj Ključ"
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:231
+msgid "Delete Key"
+msgstr "Ukloni Ključ"
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:235
+msgid "Modify Key"
+msgstr "Izmijeni Ključ"
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:918
+msgid "Key Binding Sequence"
+msgstr "Ključni Poveznički Redoslijed"
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1129
+msgid "Binding Key Error"
+msgstr "Greška Povezničkog Ključa"
+
+#: 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 ""
+"Poveznička ključna sekvencu, koju ste odabrali, se već koristi u "
+"<br><hilight>%s</hilight> akciji.<br>Molimo odaberite drugu povezničku "
+"ključnu sekvencu."
+
+#: 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 "Postavke Izbornika"
+
+#: 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 "Postavke Glavnog Izbornika"
+
+#: 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 "Prikaži Omiljene U Glavnom Izborniku"
+
+#: 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 "Prikaži Aplikacije u Glavnom Izborniku"
+
+#: 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 "Prikaži Naziv u Izborniku"
+
+#: 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 "Prikaži Generičke u Izborniku"
+
+#: 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 "Prikaži Komentar u Izborniku"
+
+#: src/modules/conf_menus/e_int_config_menus.c:181
+msgid "Autoscroll Settings"
+msgstr "Postavke Autoklizanja"
+
+#: src/modules/conf_menus/e_int_config_menus.c:182
+msgid "Autoscroll Margin"
+msgstr "Margina Autoklizanja"
+
+#: 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 piksela"
+
+#: src/modules/conf_menus/e_int_config_menus.c:187
+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
+msgid "Miscellaneous Options"
+msgstr "Razne Opcije"
+
+#: src/modules/conf_menus/e_int_config_menus.c:195
+msgid "Menu Scroll Speed"
+msgstr "Brzina Autoklizanja Izbornika"
+
+#: src/modules/conf_menus/e_int_config_menus.c:197
+#, c-format
+msgid "%5.0f pixels/sec"
+msgstr "%5.0f piksela/sek"
+
+#: src/modules/conf_menus/e_int_config_menus.c:200
+msgid "Fast Mouse Move Threshhold"
+msgstr "Granica Brzog Kretanja Miša"
+
+#: 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 piksela/sek"
+
+#: src/modules/conf_menus/e_int_config_menus.c:206
+msgid "Click Drag Timeout"
+msgstr "Istek Vremena za Prevući Klikom"
+
+#: src/modules/conf_menus/e_int_config_menus.c:208
+#, c-format
+msgid "%2.2f seconds"
+msgstr "%2.2f sekundi"
+
+#: src/modules/conf_mime/e_int_config_mime.c:64
+#: src/modules/conf_mime/e_mod_main.c:35
+msgid "File Icons"
+msgstr "Sličice Datoteka"
+
+#: src/modules/conf_mime/e_int_config_mime.c:186
+msgid "File Types"
+msgstr "Tipovi Datoteka"
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:69
+msgid "File Icon"
+msgstr "Sličica Datoteke"
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:137
+msgid "Mime:"
+msgstr "Mime:"
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:147
+msgid "Use Generated Thumbnail"
+msgstr "Upotrijebi Generiranu Sličicu"
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:150
+msgid "Use Theme Icon"
+msgstr "Upotrijebi Ikonu Teme"
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:153
+msgid "Use Edje File"
+msgstr "Upotrijebi Edje Datoteku"
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:156
+msgid "Use Image"
+msgstr "Upotrijebi Sliku"
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:159
+msgid "Use Default"
+msgstr "Upotrijebi Zadati"
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:270
+msgid "Select an Edj File"
+msgstr "Odaberi Edj Datoteku"
+
+#: 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 "Datoteke"
+
+#: 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 ""
+"Molimo držite bilo koji modifikator želite<br>i upotrijebite bilo koji "
+"gumb<br>ili kotačić vašeg miša da pridodate poveznike miša."
+"<br>Kliknite<hilight>Escape</hilight>da odustanete."
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:112
+msgid "Mouse Binding Settings"
+msgstr "Postavke Poveznika Miša"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:275
+#: src/modules/conf_mousebindings/e_mod_main.c:35
+msgid "Mouse Bindings"
+msgstr "Poveznici Miša"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:281
+msgid "Add Binding"
+msgstr "Dodaj Poveznik"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:283
+msgid "Delete Binding"
+msgstr "Ukloni Poveznik"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:287
+msgid "Modify Binding"
+msgstr "Modificiraj Poveznik"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:295
+msgid "Restore Mouse and Wheel Binding Defaults"
+msgstr "Obnovi Zadane Vrijednosti Poveznika Miša i Kotačića"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:315
+msgid "Action Context"
+msgstr "Sadržaj Akcije"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:317
+msgid "Any"
+msgstr "Bilo koji"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:329
+msgid "Win List"
+msgstr "Win Lista"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:333
+msgid "Popup"
+msgstr "Pop-up"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:337
+msgid "Zone"
+msgstr "Zona"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
+msgid "Container"
+msgstr "Spremnik"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
+msgid "Manager"
+msgstr "Upravitelj"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:1272
+msgid "Mouse Binding Sequence"
+msgstr "Redoslijed Poveznika Miš"
+
+#: 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 "Postavke Pokazivača"
+
+#: 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 "Prikaži Pokazivač"
+
+#: 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 "Neaktivan Pokazivač"
+
+#: 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 "Upotrijebi Enlightenment Pokazivač"
+
+#: 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 "Upotrijebi X Pokazivač"
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:225
+msgid "Cursor Size"
+msgstr "Veličina Pokazivača"
+
+#: src/modules/conf_mouse_cursor/e_mod_main.c:35
+msgid "Mouse Cursor"
+msgstr "Pokazivač Miša"
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: 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
+msgid "Mouse Hand"
+msgstr "Ruka Miša"
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:105
+msgid "Mouse Acceleration"
+msgstr "Ubrzanje Miša"
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:107
+msgid "Acceleration"
+msgstr "Ubrzavanje"
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
+msgid "Threshold"
+msgstr "Prag"
+
+#: src/modules/conf_paths/e_int_config_paths.c:62
+msgid "Search Path Settings"
+msgstr "Pretraži Postavke Puta"
+
+#: src/modules/conf_paths/e_int_config_paths.c:73
+msgid "Data"
+msgstr "Podaci"
+
+#: src/modules/conf_paths/e_int_config_paths.c:75
+msgid "Images"
+msgstr "Slike"
+
+#: src/modules/conf_paths/e_int_config_paths.c:79
+#: src/modules/conf_theme/e_int_config_theme.c:1013
+msgid "Themes"
+msgstr "Teme"
+
+#: src/modules/conf_paths/e_int_config_paths.c:81
+msgid "Icons"
+msgstr "Ikone"
+
+#: src/modules/conf_paths/e_int_config_paths.c:85
+msgid "Backgrounds"
+msgstr "Pozadine"
+
+#: src/modules/conf_paths/e_int_config_paths.c:87
+msgid "Messages"
+msgstr "Poruke"
+
+#: src/modules/conf_paths/e_int_config_paths.c:168
+msgid "E Paths"
+msgstr "E Putevi"
+
+#: src/modules/conf_paths/e_int_config_paths.c:199
+msgid "Default Directories"
+msgstr "Zadani Direktoriji"
+
+#: src/modules/conf_paths/e_int_config_paths.c:206
+msgid "User Defined Directories"
+msgstr "Upotrijebi Definirane Direktorije"
+
+#: src/modules/conf_paths/e_mod_main.c:35
+msgid "Search Directories"
+msgstr "Pretraži Direktorije"
+
+#: src/modules/conf_performance/e_int_config_performance.c:40
+msgid "Performance Settings"
+msgstr "Postavke Učinkovitosti"
+
+#: src/modules/conf_performance/e_int_config_performance.c:95
+#: src/modules/conf_performance/e_int_config_performance.c:135
+msgid "Framerate"
+msgstr "Frekvencija"
+
+#: 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 "%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 "Prioritet Aplikacija"
+
+#: src/modules/conf_performance/e_int_config_performance.c:146
+msgid "Cache Settings"
+msgstr "Postavke Predmemorije"
+
+#: src/modules/conf_performance/e_int_config_performance.c:147
+msgid "Cache Flush Interval"
+msgstr "Interval Pražnjenja Predmemorije"
+
+#: src/modules/conf_performance/e_int_config_performance.c:152
+msgid "Size Of Font Cache"
+msgstr "Veličina Predmemorije Pisma"
+
+#: src/modules/conf_performance/e_int_config_performance.c:154
+#, c-format
+msgid "%1.1f MB"
+msgstr "%1.1f MB"
+
+#: src/modules/conf_performance/e_int_config_performance.c:157
+msgid "Size Of Image Cache"
+msgstr "Veličina Predmemorije Slika"
+
+#: src/modules/conf_performance/e_int_config_performance.c:159
+#, c-format
+msgid "%1.0f MB"
+msgstr "%1.0f MB"
+
+#: src/modules/conf_performance/e_int_config_performance.c:162
+msgid "Number Of Edje Files To Cache"
+msgstr "Broj EDJE Datoteka Za Predmemorirati"
+
+#: src/modules/conf_performance/e_int_config_performance.c:164
+#, c-format
+msgid "%1.0f files"
+msgstr "%1.0f datoteke"
+
+#: src/modules/conf_performance/e_int_config_performance.c:167
+msgid "Number Of Edje Collections To Cache"
+msgstr "Broj EDJE Kolekcija Za Predmemorirati"
+
+#: src/modules/conf_performance/e_int_config_performance.c:169
+#, c-format
+msgid "%1.0f collections"
+msgstr "%1.0f kolekcije"
+
+#: src/modules/conf_performance/e_mod_main.c:35
+msgid "Performance"
+msgstr "Učinkovitost"
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:56
+msgid "Profile Selector"
+msgstr "Odabirač Profila"
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:107
+msgid "Available Profiles"
+msgstr "Raspoloživi Profili"
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:116
+#: src/modules/wizard/page_020.c:118
+msgid "Select a profile"
+msgstr "Odaberi Profil"
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:125
+msgid "Reset"
+msgstr "Ponovno Postavljanje"
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#, 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
+msgid "Delete OK?"
+msgstr "Je li OK za ukloniti?"
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:350
+msgid "Add New Profile"
+msgstr "Dodaj Novi Profil"
+
+#: src/modules/conf_profiles/e_mod_main.c:22
+msgid "Profiles"
+msgstr "Profili"
+
+#: src/modules/conf_scale/e_int_config_scale.c:61
+msgid "Scaling Settings"
+msgstr "Postavke Skaliranja"
+
+#: src/modules/conf_scale/e_int_config_scale.c:140
+msgid "Scale with DPI"
+msgstr "Skaliraj sa DPI"
+
+#: src/modules/conf_scale/e_int_config_scale.c:144
+msgid "Relative"
+msgstr "Relativno"
+
+#: src/modules/conf_scale/e_int_config_scale.c:145
+msgid "Base DPI to scale relative to"
+msgstr "Osnovni DPI za srazmjerno skaliranje"
+
+#: 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 "Trenutno %i DPI"
+
+#: src/modules/conf_scale/e_int_config_scale.c:245
+msgid "Policy"
+msgstr "Pravila"
+
+#: src/modules/conf_scale/e_int_config_scale.c:248
+msgid "Don't Scale"
+msgstr "Ne Skaliraj"
+
+#: src/modules/conf_scale/e_int_config_scale.c:252
+msgid "Scale relative to screen DPI"
+msgstr "Skaliraj u srazmjeri na DPI zaslona"
+
+#: src/modules/conf_scale/e_int_config_scale.c:255
+#, c-format
+msgid "Base DPI (Currently %i DPI)"
+msgstr "Osnovni DPI (Trenutno %i DPI)"
+
+#: src/modules/conf_scale/e_int_config_scale.c:263
+msgid "Custom scaling factor"
+msgstr "Posebni faktor skaliranja"
+
+#: 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 puta"
+
+#: src/modules/conf_scale/e_int_config_scale.c:272
+#, fuzzy
+msgid "Constraints"
+msgstr "Spremnik"
+
+#: src/modules/conf_scale/e_int_config_scale.c:273
+msgid "Minimum"
+msgstr "Minimalno"
+
+#: src/modules/conf_scale/e_int_config_scale.c:279
+msgid "Maximum"
+msgstr "Maksimalno"
+
+#: src/modules/conf_scale/e_mod_main.c:35
+msgid "Scaling"
+msgstr "Skaliranje"
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
+msgid "Screen Saver Settings"
+msgstr "Postavke Čuvara Zaslona"
+
+#: 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 "Omogući X čuvar zaslona"
+
+#: 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 "Tajmer Čuvara Zaslona"
+
+#: 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 "Vrijeme dok se X čuvar zaslona ne aktivira"
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
+msgid "Time until X screensaver alternates"
+msgstr "Vrijeme dok se X čuvar zaslona ne izmijeni"
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
+msgid "Blanking"
+msgstr "Zatamnjenje"
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
+msgid "Preferred"
+msgstr "Prioritetan"
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
+msgid "Not Preferred"
+msgstr "Neprioritetan"
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
+msgid "Exposure Events"
+msgstr "Događaji Izlaganja"
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
+msgid "Allow"
+msgstr "Dozvoli"
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
+msgid "Don't Allow"
+msgstr "Ne Dozvoli"
+
+#: src/modules/conf_screensaver/e_mod_main.c:35
+msgid "Screen Saver"
+msgstr "Čuvar Zaslona"
+
+#: src/modules/conf_shelves/e_int_config_shelf.c:71
+msgid "Configured Shelves"
+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"
+
+#: 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 ""
+"Tražili ste da uklonite \"%s\".<br><br>Jeste li sigurni da hoćete ukloniti "
+"ovu policu?"
+
+#: src/modules/conf_startup/e_int_config_startup.c:39
+msgid "Startup Settings"
+msgstr "Postavke Podizanja"
+
+#: src/modules/conf_startup/e_int_config_startup.c:328
+msgid "Show Splash Screen on Login"
+msgstr "Prikaži Prskani Zaslon kod Prijave"
+
+#: src/modules/conf_startup/e_mod_main.c:35
+#: src/modules/conf_transitions/e_int_config_transitions.c:134
+msgid "Startup"
+msgstr "Pokretanje"
+
+#: src/modules/conf_theme/e_int_config_theme.c:90
+msgid "Theme Selector"
+msgstr "Odabirač Teme"
+
+#: src/modules/conf_theme/e_int_config_theme.c:431
+msgid " Import..."
+msgstr " Uvoz..."
+
+#: src/modules/conf_theme/e_int_config_theme.c:435
+msgid " Online..."
+msgstr " Povezan"
+
+#: src/modules/conf_theme/e_int_config_theme.c:1004
+msgid "Theme Categories"
+msgstr "Kategorije Tema"
+
+#: src/modules/conf_theme/e_int_config_theme.c:1022
+msgid "Assign"
+msgstr "Pripiši"
+
+#: src/modules/conf_theme/e_int_config_theme.c:1028
+msgid "Clear All"
+msgstr "Očisti Sve"
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:67
+msgid "Select a Theme..."
+msgstr "Odaberi Temu..."
+
+#: 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 "Greška Uvoza Teme"
+
+#: 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 nije mogao uvesti temu.<br><br>Jeste li sigurni da je ovo "
+"valjana tema?"
+
+#: 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 nije mogao uvesti temu<br>zbog greške u kopiranju."
+
+#: src/modules/conf_theme/e_int_config_theme_web.c:127
+msgid "Exchange themes"
+msgstr "Razmijeni Teme"
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:44
+msgid "Transition Settings"
+msgstr "Postavke Promjene"
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:126
+msgid "Events"
+msgstr "Događaji"
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:135
+msgid "Desk Change"
+msgstr "Promjena Radne Površine"
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:136
+msgid "Background Change"
+msgstr "Promjena Pozadine"
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:144
+#: src/modules/conf_transitions/e_mod_main.c:35
+msgid "Transitions"
+msgstr "Promjene"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:110
+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
+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
+msgid "Picture..."
+msgstr "Slika..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+msgid "Gradient..."
+msgstr "Gradijent..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+msgid "Online..."
+msgstr "Povezan"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+msgid "Where to place the Wallpaper"
+msgstr "Gdje smjestiti Tapetu"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+msgid "All Desktops"
+msgstr "Sve Radne Površine"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+msgid "This Desktop"
+msgstr "Ova Radna Površina"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+msgid "This Screen"
+msgstr "Ovaj Ekran"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:97
+msgid "Create a gradient..."
+msgstr "Kreiraj gradijent..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:124
+msgid "Color 1:"
+msgstr "Boja 1:"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:128
+msgid "Color 2:"
+msgstr "Boja 2:"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:164
+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:685
+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:693
+msgid "Vertical"
+msgstr "Okomito"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:177
+msgid "Diagonal Up"
+msgstr "Dijagonalno Gore"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:182
+msgid "Diagonal Down"
+msgstr "Dijagonalno Dolje"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:187
+msgid "Radial"
+msgstr "Radijalno"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:370
+msgid "Gradient Creation Error"
+msgstr "Greška Kreiranja Gradijenta"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:371
+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"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
+msgid "Fill and Stretch Options"
+msgstr "Opcije Popune i Protezanja"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:167
+msgid "Stretch"
+msgstr "Rastegni"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:172
+msgid "Center"
+msgstr "Centar"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:177
+msgid "Tile"
+msgstr "Pločica"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:182
+msgid "Within"
+msgstr "Unutar"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:187
+msgid "Fill"
+msgstr "Popuni"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:194
+msgid "File Quality"
+msgstr "Kvaliteta Datoteke"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:196
+msgid "Use original file"
+msgstr "Upotrijebi Originalnu Datoteku"
+
+#: 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:274
+msgid "Select a Picture..."
+msgstr "Odaberi Sliku..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+msgid "Picture Import Error"
+msgstr "Greška Uvoza Slike"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+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
+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
+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
+msgid ""
+"Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
+"is a valid wallpaper?"
+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:122
+msgid "Exchange wallpapers"
+msgstr "Razmijeni tapete"
+
+#: 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 "Tapeta"
+
+#: 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 "Izlog Prozora"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:167
+msgid "Display"
+msgstr "Prikaz"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:168
+msgid "Show window geometry information when moving or resizing"
+msgstr ""
+"Prikaži informaciju geometrije prozora kod pomicanja ili promjene veličine"
+
+#: 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 "Animiraj zatamnjenje i osvjetljenje prozora"
+
+#: 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 "Automatski Položaj Novog Prozora"
+
+#: 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 "Inteligentno Polaganje"
+
+#: 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 "Ne skrivaj aparate"
+
+#: 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 "Položi kod pokazivača miša"
+
+#: 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 "Položi ručno uz upotrebu miša"
+
+#: 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 "Automatski prebaci na radnu površinu novog prozora"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:203
+msgid "Window Move Geometry"
+msgstr "Geometrija Pomicanja Prozora"
+
+#: 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 "Informacije o izložku"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:207
+msgid "Follow the window as it moves"
+msgstr "Prati prozor dok se pomiče"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:214
+msgid "Window Resize Geometry"
+msgstr "Geometrija Promjene Veličine Prozora"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:218
+msgid "Follow the window as it resizes"
+msgstr "Prati prozor dok mijenja veličinu"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:225
+msgid "Window Shading"
+msgstr "Sjenčenje Prozora"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:234
+msgid "Linear"
+msgstr "Linearno"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:238
+msgid "Smooth accelerate and decelerate"
+msgstr "Blago ubrzavanje i usporavanje"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:242
+msgid "Accelerate"
+msgstr "Ubrzaj"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:246
+msgid "Decelerate"
+msgstr "Uspori"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:269
+msgid "Window Border"
+msgstr "Bordura Prozora"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:272
+msgid "Prefer user defined icon"
+msgstr "Ikona definirana od povlaštenog korisnika"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:274
+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"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:165
+msgid "Click Window to Focus"
+msgstr "Klikni Prozor za Fokus"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:167
+msgid "Window under the Mouse"
+msgstr "Prozor ispod Miša"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:169
+msgid "Most recent Window under the Mouse"
+msgstr "Zadnji prozor ispod miša"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:183
+msgid "Focus"
+msgstr "Fokus"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:185
+msgid "Click to focus"
+msgstr "Klikni za fokus"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:187
+msgid "Pointer focus"
+msgstr "Fokus pokazivača"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:189
+msgid "Sloppy focus"
+msgstr "Loš fokus"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:193
+msgid "New Window Focus"
+msgstr "Fokus Novog Prozora"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:195
+msgid "No new windows get focus"
+msgstr "Nijedan novi prozor ne treba biti fokusiran"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:197
+msgid "All new windows get focus"
+msgstr "Svi novi prozori trebaju biti fokusirani"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:199
+msgid "Only new dialogs get focus"
+msgstr "Samo novi dijalozi trebaju biti fokusirani"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:201
+msgid "Only new dialogs get focus if the parent has focus"
+msgstr "Samo novi dijalozi trebaju biti fokusirani ako je glavni fokusiran"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:205
+msgid "Other Settings"
+msgstr "Ostale Postavke"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:206
+msgid "Always pass on caught click events to programs"
+msgstr "Uvijek prenesi uhvaćene klik događaje na programe."
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:208
+msgid "A click on a window always raises it"
+msgstr "Klik na prozor ga uvijek uzdigne"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:210
+msgid "A click in a window always focuses it"
+msgstr "Klik u prozor ga uvijek fokusira"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:212
+msgid "Refocus last focused window on desktop switch"
+msgstr "Refokusiraj zadnji fokusirani prozor pri zamjeni radnih površina"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:214
+msgid "Revert focus when hiding or closing a window"
+msgstr "Vrati stari fokus kod skrivanja ili zatvaranja prozora"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:216
+msgid "Slide pointer to a new focused window"
+msgstr "Klizni pokazivač na novi fokusirani prozor"
+
+#: src/modules/conf_window_focus/e_mod_main.c:35
+#: src/modules/wizard/page_060.c:26
+msgid "Window Focus"
+msgstr "Fokus Prozora"
+
+#: 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 "Geometrija Prozora"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:129
+msgid "Resistance"
+msgstr "Otpor"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:130
+msgid "Resist moving or resizing a window over an obstacle"
+msgstr "Uzdrži se pomicanju ili promjeni veličine prozora preko neke prepreke"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:132
+msgid "Resistance between windows:"
+msgstr "Otpor između prozora:"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:140
+msgid "Resistance at the edge of the screen:"
+msgstr "Otpor na rubu ekrana:"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:148
+msgid "Resistance to desktop gadgets:"
+msgstr "Otpor aparatima radne površine:"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:160
+msgid "Keyboard move and resize"
+msgstr "Tipkovničko pomjeranje i promjena veličine"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:161
+msgid "Automatically accept changes after:"
+msgstr "Automatski Prihvati Promjene Nakon:"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:165
+msgid "Move by:"
+msgstr "Pomakni za:"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:169
+msgid "Resize by:"
+msgstr "Promijeni veličinu za:"
+
+#: 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 "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
+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
+msgid "Fill available space"
+msgstr "Popuni raspoloživi prostor"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:138
+msgid "Maximize Policy"
+msgstr "Pravila Maksimiziranja"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+msgid "Maximize Directions"
+msgstr "Pravac Maksimiziranja"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+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:163
+msgid "Automatically move/resize windows on shelf autohide"
+msgstr "Automatski pomakni/promjeni veličinu prozora pri autoskrivanju police"
+
+#: 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 "Slaganje Prozora"
+
+#: 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 "Automatski uzdigni prozor kad je miš preko"
+
+#: 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 "Dozvoli prozorima da budu iznad cijelozaslonskog prozora"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:139
+msgid "Autoraise"
+msgstr "Autouzdigni"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:142
+msgid "Delay before raising:"
+msgstr "Zastoj prije uzdizanja:"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:155
+msgid "Raise Window"
+msgstr "Podigni Prozor"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:157
+msgid "Raise when starting to move or resize"
+msgstr "Uzdigni na početku pomjeranja ili promjene veličine"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:159
+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_mod_main.c:17
+msgid "Window Remembers"
+msgstr "Prozorni Podsjetnici"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+msgid "Delete Remember(s)"
+msgstr "Ukloni Podsjetnike"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+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
+msgid "<No Name>"
+msgstr "<Bez Imena>"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+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
+msgid "<No Class>"
+msgstr "<Bez Klase>"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+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
+msgid "<No Title>"
+msgstr "<Bez Naslova>"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+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
+msgid "<No Role>"
+msgstr "<Bez Uloge>"
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:62
+msgid "Window List Settings"
+msgstr "Postavke Liste Prozora"
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:145
+msgid "Show iconified windows"
+msgstr "Prikaži ikonizirane prozore"
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:147
+msgid "Show iconified windows from other desks"
+msgstr "Prikaži ikonizirane prozore sa ostalih radnih površina"
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:151
+msgid "Show iconified windows from other screens"
+msgstr "Prikaži ikonizirane prozore sa ostalih ekrana"
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:157
+msgid "Show windows from other desks"
+msgstr "Prikaži prozore sa ostalih radnih površina"
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:159
+msgid "Show windows from other screens"
+msgstr "Prikaži prozore sa ostalih ekrana"
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:163
+#: src/modules/conf_winlist/e_int_config_winlist.c:241
+msgid "Selection Settings"
+msgstr "Postavke za Izabrano"
+
+#: 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 "Fokusiraj prozor pri odabiru"
+
+#: 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 "Uzdigni prozor pri odabiru"
+
+#: 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 "Zamotaj miša na prozor kod odabira"
+
+#: 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 "Otkrij prozore pri odabiru"
+
+#: 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 "Skoči na radnu površinu kod odabira"
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:176
+#: src/modules/conf_winlist/e_int_config_winlist.c:254
+msgid "Warp Settings"
+msgstr "Postavke Zamotavanja"
+
+#: 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 "Zamotaj Na Kraju"
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:257
+msgid "Warp Speed"
+msgstr "Brzina Uvijanja"
+
+#: src/modules/cpufreq/e_mod_main.c:135
+msgid "Cpufreq"
+msgstr "Cpufreq"
+
+#: src/modules/cpufreq/e_mod_main.c:182
+msgid "Fast (4 ticks)"
+msgstr "Brzo (4 otkucaja)"
+
+#: src/modules/cpufreq/e_mod_main.c:189
+msgid "Medium (8 ticks)"
+msgstr "Srednje (8 otkucaja)"
+
+#: src/modules/cpufreq/e_mod_main.c:196
+msgid "Normal (32 ticks)"
+msgstr "Normalno (32 otkucaja)"
+
+#: src/modules/cpufreq/e_mod_main.c:203
+msgid "Slow (64 ticks)"
+msgstr "Sporo (64 otkucaja)"
+
+#: src/modules/cpufreq/e_mod_main.c:210
+msgid "Very Slow (256 ticks)"
+msgstr "Vrlo Sporo (256 otkucaja)"
+
+#: src/modules/cpufreq/e_mod_main.c:225
+msgid "Manual"
+msgstr "Ručno"
+
+#: src/modules/cpufreq/e_mod_main.c:229 src/modules/cpufreq/e_mod_main.c:263
+msgid "Lower Power Automatic"
+msgstr "Automatski Smanji Energiju"
+
+#: src/modules/cpufreq/e_mod_main.c:231 src/modules/cpufreq/e_mod_main.c:265
+msgid "Minimum Speed"
+msgstr "Minimalna Brzina"
+
+#: src/modules/cpufreq/e_mod_main.c:233 src/modules/cpufreq/e_mod_main.c:267
+msgid "Maximum Speed"
+msgstr "Maksimalna Brzina"
+
+#: src/modules/cpufreq/e_mod_main.c:244
+msgid "Restore CPU Power Policy"
+msgstr "Obnovi Odrednice CPU Energije"
+
+#: src/modules/cpufreq/e_mod_main.c:252
+msgid "Powersaving policy"
+msgstr "Odrednice štednje energije"
+
+#: src/modules/cpufreq/e_mod_main.c:280
+msgid "Automatic powersaving"
+msgstr "Automatska štednja energije"
+
+#: src/modules/cpufreq/e_mod_main.c:299
+#, c-format
+msgid "%i MHz"
+msgstr "%i MHz"
+
+#: src/modules/cpufreq/e_mod_main.c:301
+#, c-format
+msgid "%i.%i GHz"
+msgstr "%i.%i GHz"
+
+#: src/modules/cpufreq/e_mod_main.c:318
+msgid "Time Between Updates"
+msgstr "Vrijeme Između Obnavljanja"
+
+#: src/modules/cpufreq/e_mod_main.c:324
+msgid "Set CPU Power Policy"
+msgstr "Postavi Odrednice CPU Energije"
+
+#: src/modules/cpufreq/e_mod_main.c:331
+msgid "Set CPU Speed"
+msgstr "Postavi CPU Brzinu"
+
+#: src/modules/cpufreq/e_mod_main.c:337
+msgid "Powersaving behavior"
+msgstr "Ponašanje Štednje Energije"
+
+#: 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 ""
+"Greška u nastojanju postavljanja<br>regulatora cpu frekvencije kroz setfreq "
+"uslugu<br>vašeg modula."
+
+#: 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 ""
+"Vaše jezgro uopće ne podržava postavke<br>CPU frekvencije. Možda vam "
+"nedostaju<br>moduli jezgre ili sadržaji, ili vaš CPU<br>naprosto ne podržava "
+"ove mogućnosti."
+
+#: 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 ""
+"Greška u nastojanju postavljanja<br>postavki cpu frekvencije kroz setfreq "
+"uslugu<br>vašeg modula."
+
+#: src/modules/dropshadow/e_mod_config.c:40
+msgid "Dropshadow Settings"
+msgstr "Postavke Oborene Sjenke"
+
+#: src/modules/dropshadow/e_mod_config.c:108
+msgid "Quality"
+msgstr "Kvaliteta"
+
+#: src/modules/dropshadow/e_mod_config.c:111
+msgid "High Quality"
+msgstr "Visoka Kvaliteta"
+
+#: src/modules/dropshadow/e_mod_config.c:113
+msgid "Medium Quality"
+msgstr "Srednja Kvaliteta"
+
+#: src/modules/dropshadow/e_mod_config.c:115
+msgid "Low Quality"
+msgstr "Slaba Kvaliteta"
+
+#: src/modules/dropshadow/e_mod_config.c:119
+msgid "Blur Type"
+msgstr "Tip Zamagljenosti"
+
+#: src/modules/dropshadow/e_mod_config.c:122
+msgid "Very Fuzzy"
+msgstr "Vrlo Nejasno"
+
+#: src/modules/dropshadow/e_mod_config.c:124
+msgid "Fuzzy"
+msgstr "Nejasno"
+
+#: src/modules/dropshadow/e_mod_config.c:128
+msgid "Sharp"
+msgstr "Oštro"
+
+#: src/modules/dropshadow/e_mod_config.c:130
+msgid "Very Sharp"
+msgstr "Vrlo Oštro"
+
+#: src/modules/dropshadow/e_mod_config.c:134
+msgid "Shadow Distance"
+msgstr "Udaljenost Sjene"
+
+#: src/modules/dropshadow/e_mod_config.c:137
+msgid "Very Far"
+msgstr "Vrlo Daleko"
+
+#: src/modules/dropshadow/e_mod_config.c:139
+msgid "Far"
+msgstr "Daleko"
+
+#: src/modules/dropshadow/e_mod_config.c:141
+msgid "Near"
+msgstr "Blizu"
+
+#: src/modules/dropshadow/e_mod_config.c:143
+msgid "Very Near"
+msgstr "Vrlo Blizu"
+
+#: src/modules/dropshadow/e_mod_config.c:145
+msgid "Extremely Near"
+msgstr "Izuzetno Blizu"
+
+#: src/modules/dropshadow/e_mod_config.c:147
+msgid "Underneath"
+msgstr "Ispod"
+
+#: src/modules/dropshadow/e_mod_config.c:151
+msgid "Shadow Darkness"
+msgstr "Zatamnjenost Sene"
+
+#: src/modules/dropshadow/e_mod_config.c:154
+msgid "Very Dark"
+msgstr "Vrlo Tamno"
+
+#: src/modules/dropshadow/e_mod_config.c:156
+msgid "Dark"
+msgstr "Tamno"
+
+#: src/modules/dropshadow/e_mod_config.c:158
+msgid "Light"
+msgstr "Svijetlo"
+
+#: src/modules/dropshadow/e_mod_config.c:160
+msgid "Very Light"
+msgstr "Vrlo Svijetlo"
+
+#: src/modules/dropshadow/e_mod_main.c:90
+msgid "Dropshadow"
+msgstr "Oborena Sjenka"
+
+#: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
+msgid "Run Command Dialog"
+msgstr "Izvrši Naredbeni Dijalog"
+
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
+msgid "Home"
+msgstr "Početak"
+
+#: src/modules/fileman/e_mod_main.c:322
+msgid "Favorites"
+msgstr "Omiljeni"
+
+#: src/modules/fileman/e_mod_main.c:334
+msgid "Root"
+msgstr "Korijen"
+
+#: 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 ""
+"Podaci Postavki Modula Menadžera Datoteka zahtijevaju nadogradnju. "
+"Vaša<br>stara konfiguracija je izbrisana i novi set zadanih vrijednosti je "
+"inicijaliziran.<br>Ovo će se redovno događati tijekom razvoja, te nemojte "
+"prijavljivati problem.<br>Ovo prosto znači da modul Menadžera Datoteka treba "
+"novu konfiguracione<br>podatke za korisničku upotrebu, koju vaša stara "
+"konfiguracija nije imala. Ovaj novi set<br>zadanih vrijednosti će to "
+"riješiti dodavanjem. Sada možete rekonfigurirati stvari po vašoj volji."
+"<br>Ispričavamo se zbog problema sa vašom konfiguracijom."
+
+#: src/modules/fileman/e_mod_main.c: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 ""
+"Konfiguracija vašeg Modula Menadžera Datoteka je NOVIJA od inačice Modula "
+"Menadžera<br>Datoteka. Ovo je vrlo strano. Ovo se nije smjelo dogoditi osim "
+"ako niste unazadili<br>Modul Menadžera Datoteka ili ste kopirali "
+"konfiguraciju sa mjesta gdje je<br>novija inačica ovog Modula bila aktivna. "
+"Ovo je loše i iz bezbjednosnih razloga je<br>vaša konfiguracija obnovljena "
+"na početne vrijednosti. Ispričavamo se zbog neugodnosti."
+
+#: src/modules/fileman/e_mod_main.c:513
+msgid "Fileman Settings Updated"
+msgstr "Postavke Menadžera Datoteka Osvježene"
+
+#: src/modules/fileman/e_mod_config.c:95
+msgid "Fileman Settings"
+msgstr "Postavke Menadžera Datoteka"
+
+#: src/modules/fileman/e_mod_config.c:227
+msgid "Icon Size"
+msgstr "Veličina Ikone"
+
+#: src/modules/fileman/e_mod_config.c:233
+#, fuzzy
+msgid "View"
+msgstr "Pregled"
+
+#: src/modules/fileman/e_mod_config.c:236
+msgid "Open Dirs In Place"
+msgstr "Otvori Direktorije na Lokaciji"
+
+#: src/modules/fileman/e_mod_config.c:240
+msgid "Sort Dirs First"
+msgstr "Sortiraj Direktorije Prvo"
+
+#: src/modules/fileman/e_mod_config.c:243
+#, fuzzy
+msgid "Case Sensitive"
+msgstr "Osnovna Veličina"
+
+#: src/modules/fileman/e_mod_config.c:247
+msgid "Use Single Click"
+msgstr "Upotrijebi Jedan Klik"
+
+#: 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 "Prikaži Ekstenziju Ikone"
+
+#: src/modules/fileman/e_mod_config.c:257
+msgid "Show Full Path"
+msgstr "Prikaži Kompletan Put"
+
+#: src/modules/fileman/e_mod_config.c:260
+msgid "Show Desktop Icons"
+msgstr "Prikaži Ikone Radne Površine"
+
+#: src/modules/fileman/e_mod_config.c:263
+msgid "Show Toolbar"
+msgstr "Prikaži Alatnu Traku"
+
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:729
+msgid "Behavior"
+msgstr "Ponašanje"
+
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr "Prikaži HAL Ikone na Radnoj Površini"
+
+#: 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:1462
+msgid "Go to Parent Directory"
+msgstr "Idi na Izvorni Direktorij"
+
+#: src/modules/fileman/e_fwin.c:1524
+#, fuzzy
+msgid "Other application..."
+msgstr "Dodaj Aplikaciju..."
+
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
+msgid "Open"
+msgstr "Otvori"
+
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
+msgid "Open with..."
+msgstr "Otvori s..."
+
+#: src/modules/fileman/e_fwin.c:1892
+#, fuzzy
+msgid "Known Applications"
+msgstr "Aplikacije"
+
+#: src/modules/fileman/e_fwin.c:1902
+msgid "Specific Applications"
+msgstr "Specifična Aplikacija"
+
+#: src/modules/fileman/e_fwin.c:1944
+msgid "Custom Command"
+msgstr "Posebne Naredbe"
+
+#: src/modules/fileman_opinfo/e_mod_main.c:53
+#, fuzzy, c-format
+msgid "%d operations"
+msgstr "Sakrij trajanje"
+
+#: src/modules/fileman_opinfo/e_mod_main.c:55
+#, fuzzy, c-format
+msgid "idle"
+msgstr "Pločica"
+
+#: src/modules/fileman_opinfo/e_mod_main.c:139
+msgid "EFM Operation Info"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:58
+msgid "Gadgets Manager"
+msgstr "Upravitelj Aparata"
+
+#: src/modules/gadman/e_mod_config.c:147
+msgid "Background Mode"
+msgstr "Pozadinski Mod"
+
+#: src/modules/gadman/e_mod_config.c:152 src/modules/gadman/e_mod_config.c:184
+msgid "Custom Image"
+msgstr "Podešena Slika"
+
+#: src/modules/gadman/e_mod_config.c:156 src/modules/gadman/e_mod_config.c:177
+msgid "Custom Color"
+msgstr "Posebna Boja"
+
+#: src/modules/gadman/e_mod_config.c:160
+msgid "Transparent"
+msgstr "Proziran"
+
+#: src/modules/gadman/e_mod_config.c:167
+msgid "Animations"
+msgstr "Animacije"
+
+#: src/modules/gadman/e_mod_config.c:168
+msgid "Background"
+msgstr "Pozadina"
+
+#: 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 "Aparati"
+
+#: src/modules/gadman/e_mod_gadman.c:677
+msgid "Free"
+msgstr "Slobodno"
+
+#: src/modules/gadman/e_mod_gadman.c:709
+msgid "Always on desktop"
+msgstr "Uvijek na radnoj površini"
+
+#: src/modules/gadman/e_mod_gadman.c:719
+msgid "On top pressing"
+msgstr "Uporno na vrhu"
+
+#: src/modules/gadman/e_mod_gadman.c:748
+msgid "Add other gadgets"
+msgstr "Dodaj ostale aparate"
+
+#: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
+msgid "Show/hide gadgets"
+msgstr "Prikaži/Sakrij Aparate"
+
+#: 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 "Prozor: Lista"
+
+#: src/modules/winlist/e_mod_main.c:48 src/modules/winlist/e_mod_main.c:64
+msgid "Next Window"
+msgstr "Slijedeći Prozor"
+
+#: src/modules/winlist/e_mod_main.c:50 src/modules/winlist/e_mod_main.c:63
+msgid "Previous Window"
+msgstr "Prethodni Prozor"
+
+#: src/modules/winlist/e_winlist.c:141
+msgid "Select a window"
+msgstr "Odaberi prozor"
+
+#: src/modules/ibar/e_mod_config.c:56
+msgid "IBar Settings"
+msgstr "IBAR Postavke"
+
+#: src/modules/ibar/e_mod_config.c:102
+msgid "Selected Bar Source"
+msgstr "Odabrani Izvor Trake"
+
+#: src/modules/ibar/e_mod_config.c:123
+msgid "Icon Labels"
+msgstr "Oznake Ikone"
+
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+msgid "Show Icon Label"
+msgstr "Prikaži Oznaku Ikone"
+
+#: src/modules/ibar/e_mod_config.c:130
+msgid "Display App Name"
+msgstr "Izloži App Ime"
+
+#: src/modules/ibar/e_mod_config.c:134
+msgid "Display App Comment"
+msgstr "Izloži App Komentar"
+
+#: src/modules/ibar/e_mod_config.c:138
+msgid "Display App Generic"
+msgstr "Prikaži Općenite Aplikacije"
+
+#: src/modules/ibar/e_mod_config.c:168
+msgid "Create new IBar source"
+msgstr "Kreiraj novi IBar izvor"
+
+#: src/modules/ibar/e_mod_config.c:169
+msgid "Enter a name for this new source:"
+msgstr "Unesi naziv za ovaj novi izvor:"
+
+#: 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 ""
+"Zatražili ste da uklonite \"%s\".<br><br>Jeste li sigurni da hoćete ukloniti "
+"ovaj izvor trake?"
+
+#: src/modules/ibar/e_mod_config.c:187
+msgid "Are you sure you want to delete this bar source?"
+msgstr "Jeste li sigurni da hoćete ukloniti ovaj izvor trake?"
+
+#: src/modules/ibar/e_mod_main.c:214
+msgid "IBar"
+msgstr "IBar"
+
+#: src/modules/ibar/e_mod_main.c:796
+msgid "Change Icon Properties"
+msgstr "Promijeni Svojstva Ikone"
+
+#: src/modules/ibar/e_mod_main.c:801
+msgid "Remove Icon"
+msgstr "Ukloni Ikonu"
+
+#: src/modules/ibar/e_mod_main.c:811
+msgid "Add An Icon"
+msgstr "Dodaj Ikonu"
+
+#: src/modules/ibar/e_mod_main.c:818
+msgid "Create New Icon"
+msgstr "Napravi Novu Ikonu"
+
+#: src/modules/ibar/e_mod_main.c:834
+msgid "Add Application"
+msgstr "Dodaj Aplikaciju"
+
+#: src/modules/ibox/e_mod_config.c:52
+msgid "IBox Settings"
+msgstr "IBOX Postavke"
+
+#: src/modules/ibox/e_mod_config.c:105
+msgid "Display Name"
+msgstr "Prikaži Ime"
+
+#: src/modules/ibox/e_mod_config.c:110
+msgid "Display Title"
+msgstr "Prikaži Naslov"
+
+#: src/modules/ibox/e_mod_config.c:115
+msgid "Display Class"
+msgstr "Prikaži Klasu"
+
+#: src/modules/ibox/e_mod_config.c:120
+msgid "Display Icon Name"
+msgstr "Prikaži Ime Ikone"
+
+#: src/modules/ibox/e_mod_config.c:125
+msgid "Display Border Caption"
+msgstr "Zaglavlje Obruba Izložka"
+
+#: src/modules/ibox/e_mod_config.c:155
+msgid "Show windows from all screens"
+msgstr "Prikaži prozore sa svih ekrana"
+
+#: src/modules/ibox/e_mod_config.c:160
+msgid "Show windows from current screen"
+msgstr "Prikaži prozore sa trenutnog ekrana"
+
+#: src/modules/ibox/e_mod_config.c:169
+msgid "Show windows from all desktops"
+msgstr "Prikaži prozore sa svih radnih površina"
+
+#: src/modules/ibox/e_mod_config.c:174
+msgid "Show windows from active desktop"
+msgstr "Prikaži prozore sa aktivne radne površine"
+
+#: src/modules/ibox/e_mod_main.c:226
+msgid "IBox"
+msgstr "IBox"
+
+#: src/modules/pager/e_mod_config.c:72
+msgid "Pager Settings"
+msgstr "Postavke Preglednika"
+
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
+msgid "Flip desktop on mouse wheel"
+msgstr "Okreni radnu površinu kotačićem miša"
+
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
+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
+msgid "Popup Settings"
+msgstr "Pop-up Postavke"
+
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+msgid "Show popup on desktop change"
+msgstr "Prikaži pop-up pri promjeni radne površine"
+
+#: src/modules/pager/e_mod_config.c:132
+msgid "Show popup for urgent windows"
+msgstr "Prikaži pop-up za hitne prozore"
+
+#: src/modules/pager/e_mod_config.c:167
+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
+#, c-format
+msgid "Click to set"
+msgstr "Klikni da postaviš"
+
+#: src/modules/pager/e_mod_config.c:174
+msgid "Drag and Drop button"
+msgstr "Gumb za Vući i Spustiti"
+
+#: src/modules/pager/e_mod_config.c:181
+msgid "Drag whole desktop"
+msgstr "Pomakni cijelu radnu površinu"
+
+#: src/modules/pager/e_mod_config.c:190
+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
+#, c-format
+msgid "%.0f px"
+msgstr "%.0f px"
+
+#: src/modules/pager/e_mod_config.c:196
+msgid "Resistance to dragging"
+msgstr "Otpor pomicanju"
+
+#: src/modules/pager/e_mod_config.c:207
+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
+msgid "Popup speed"
+msgstr "Pop-up brzina"
+
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#, c-format
+msgid "%1.1f seconds"
+msgstr "%1.1f sekundi"
+
+#: src/modules/pager/e_mod_config.c:229
+msgid "Urgent Window Settings"
+msgstr "Hinte Postavke Prozora"
+
+#: src/modules/pager/e_mod_config.c:230
+msgid "Show popup on urgent window"
+msgstr "Prikaži po-up na hitnom prozoru"
+
+#: src/modules/pager/e_mod_config.c:233
+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
+msgid "Pager Button Grab"
+msgstr "Zgrabiti Gumb Preglednika"
+
+#: src/modules/pager/e_mod_config.c:288
+msgid ""
+"Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
+"<br>Or <hilight>Del</hilight> to reset the button."
+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
+msgid "Attetion"
+msgstr "Pozor"
+
+#: src/modules/pager/e_mod_config.c:344
+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 ""
+"Ne možete upotrijebiti desni gumb miša u polici<br>jer je već zauzet na "
+"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
+#, c-format
+msgid "Button %i"
+msgstr "Dugme %i"
+
+#: src/modules/pager/e_mod_main.c:2843
+msgid "Show Pager Popup"
+msgstr "Prikaži Preglednički Pop-up"
+
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
+msgid "Popup Desk Right"
+msgstr "Pop-up Radna Površina Desno"
+
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
+msgid "Popup Desk Left"
+msgstr "Pop-up Radna Površina Lijevo"
+
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
+msgid "Popup Desk Up"
+msgstr "Pop-up Radna Površina Gore"
+
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
+msgid "Popup Desk Down"
+msgstr "Pop-up Radna Površina Dolje"
+
+#: src/modules/start/e_mod_main.c:110
+msgid "Start"
+msgstr "Start"
+
+#: src/modules/syscon/e_mod_main.c:34
+msgid "System Control"
+msgstr "Kontrola Sustava"
+
+#: src/modules/syscon/e_mod_main.c:55
+msgid "System Controls"
+msgstr "Kontrole Sustava"
+
+#: src/modules/temperature/e_mod_config.c:63
+msgid "Temperature Settings"
+msgstr "Postavke Temperature"
+
+#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/temperature/e_mod_config.c:352
+msgid "Display Units"
+msgstr "Jedinice Izložka"
+
+#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:354
+msgid "Celsius"
+msgstr "Celzijus"
+
+#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:356
+msgid "Fahrenheit"
+msgstr "Fahrenheit"
+
+#: src/modules/temperature/e_mod_config.c:256
+#: src/modules/temperature/e_mod_config.c:378
+msgid "Check Interval"
+msgstr "Provjeri Interval"
+
+#: src/modules/temperature/e_mod_config.c:258
+msgid "Fast"
+msgstr "Brzo"
+
+#: src/modules/temperature/e_mod_config.c:262
+msgid "Slow"
+msgstr "Sporo"
+
+#: src/modules/temperature/e_mod_config.c:264
+msgid "Very Slow"
+msgstr "Vrlo Sporo"
+
+#: 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 "Visoka Temperatura"
+
+#: src/modules/temperature/e_mod_config.c:274
+msgid "200 F"
+msgstr "200 F"
+
+#: src/modules/temperature/e_mod_config.c:276
+msgid "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"
+
+#: 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 "Niska Temperatura"
+
+#: src/modules/temperature/e_mod_config.c:285
+msgid "130 F"
+msgstr "130 F"
+
+#: src/modules/temperature/e_mod_config.c:289
+msgid "90 F"
+msgstr "90 F"
+
+#: src/modules/temperature/e_mod_config.c:298
+msgid "93 C"
+msgstr "93 C"
+
+#: src/modules/temperature/e_mod_config.c:300
+msgid "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"
+
+#: src/modules/temperature/e_mod_config.c:309
+msgid "55 C"
+msgstr "55 C"
+
+#: src/modules/temperature/e_mod_config.c:313
+msgid "32 C"
+msgstr "32 C"
+
+#: src/modules/temperature/e_mod_config.c:367
+msgid "Sensors"
+msgstr "Osjetila"
+
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:402
+#, c-format
+msgid "%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"
+
+#: src/modules/temperature/e_mod_main.c:147
+msgid "Temperature"
+msgstr "Temperatura"
+
+#: src/modules/wizard/e_wizard.c:221
+msgid "Next"
+msgstr "Slijedeći"
+
+#: src/modules/wizard/e_wizard.c:281
+msgid "Welcome to Enlightenment"
+msgstr "Dobrodošli u Enlightenment"
+
+#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+msgid "Select one"
+msgstr "Odaberi Jedan"
+
+#: src/modules/wizard/page_020.c:55
+msgid "Profile"
+msgstr "Profil"
+
+#: src/modules/wizard/page_030.c:89
+msgid ""
+"No menu files were<br>found on your system.<br>Please see "
+"the<br>documentation on<br>www.enlightenment.org<br>for more details "
+"on<br>how to get your<br>application menus<br>working."
+msgstr ""
+"Nijedna datoteka izbornika<br>nije pronadjena na sustavu.<br>Molimo "
+"pogledajte dokumentaciju<br>na www.enlightenment.org kako bi <br>saznali "
+"kako napraviti aplikacione izbornike<br>da funkcioniraju."
+
+#: src/modules/wizard/page_030.c:107
+msgid "Select application menu"
+msgstr "Odaberi Aplikacijski Izbornik"
+
+#: src/modules/wizard/page_030.c:124
+msgid "System Default"
+msgstr "Zadane Vrijednosti Sustava"
+
+#: src/modules/wizard/page_040.c:25
+msgid "Launcher Bar"
+msgstr "Traka Pokretača"
+
+#: src/modules/wizard/page_040.c:27
+msgid "Select applications"
+msgstr "Odaberi Aplikacije"
+
+#: src/modules/wizard/page_050.c:28
+msgid "Desktop Files"
+msgstr "Datoteke Radne Površine"
+
+#: src/modules/wizard/page_050.c:32
+msgid "No icons on desktop"
+msgstr "Nema ikona na radnoj površini"
+
+#: src/modules/wizard/page_050.c:35
+msgid "Enable desktop icons"
+msgstr "Osposobi ikone radne površine"
+
+#: src/modules/wizard/page_060.c:28
+msgid "Focus mode"
+msgstr "Foku mod"
+
+#: src/modules/wizard/page_060.c:32
+msgid "Click to focus windows"
+msgstr "Klikni da fokusiraš prozore"
+
+#: src/modules/wizard/page_060.c:35
+msgid "Mouse over focuses windows"
+msgstr "Miš preko će fokusirati prozore"
+
+#: src/modules/wizard/page_070.c:200
+msgid "Select Icons to Add"
+msgstr "Odaberi Ikone za Dodati"
+
+#: src/modules/wizard/page_080.c:62
+msgid "Quick Launch"
+msgstr "Brzo Pokretanje"
+
+#: src/modules/wizard/page_080.c:64
+msgid "Select Applications"
+msgstr "Odaberi Aplikacije"
+
+#: src/modules/mixer/app_mixer.c:165
+msgid "Capture"
+msgstr "Uhićenje"
+
+#: src/modules/mixer/app_mixer.c:167
+msgid "Playback"
+msgstr "Reprodukcija"
+
+#: src/modules/mixer/app_mixer.c:289
+msgid "Output"
+msgstr "Izlaz"
+
+#: src/modules/mixer/app_mixer.c:363
+msgid "Cards"
+msgstr "Karte"
+
+#: src/modules/mixer/app_mixer.c:378 src/modules/mixer/conf_gadget.c:280
+msgid "Channels"
+msgstr "Kanali"
+
+#: src/modules/mixer/app_mixer.c:390
+msgid "Card:"
+msgstr "Karta:"
+
+#: src/modules/mixer/app_mixer.c:394
+msgid "Channel:"
+msgstr "Kanal:"
+
+#: src/modules/mixer/app_mixer.c:398
+msgid "Type:"
+msgstr "Vrsta:"
+
+#: src/modules/mixer/app_mixer.c:402
+msgid "Left:"
+msgstr "Lijevo:"
+
+#: src/modules/mixer/app_mixer.c:407
+msgid "Right:"
+msgstr "Desno:"
+
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
+msgid "Mute"
+msgstr "Bezvučan"
+
+#: src/modules/mixer/app_mixer.c:415 src/modules/mixer/conf_gadget.c:196
+msgid "Lock Sliders"
+msgstr "Zaključaj Klizače"
+
+#: src/modules/mixer/app_mixer.c:419
+msgid "Edit"
+msgstr "Uredi"
+
+#: src/modules/mixer/conf_gadget.c:202
+msgid "Show both sliders when locked"
+msgstr "Prikaži oba klizača kad je zaključan"
+
+#: src/modules/mixer/conf_gadget.c:322
+msgid "Sound Cards"
+msgstr "Zvučne Karte"
+
+#: src/modules/mixer/conf_gadget.c:377
+msgid "Mixer Settings"
+msgstr "Postavke Miksera"
+
+#: src/modules/mixer/conf_module.c:98
+msgid "Mixer to use for global actions:"
+msgstr "Upotrijebiti mikser za globalne akcije:"
+
+#: src/modules/mixer/conf_module.c:152
+msgid "Launch mixer..."
+msgstr "Pokreni mikser..."
+
+#: src/modules/mixer/conf_module.c:187
+msgid "Mixer Module Settings"
+msgstr "Postavke Mikser Modula"
+
+#: src/modules/mixer/e_mod_main.c:123
+msgid "Mixer Settings Updated"
+msgstr "Postavke Miksera Unaprijeđene"
+
+#: src/modules/mixer/e_mod_main.c:602
+msgid "Controls"
+msgstr "Kontrole"
+
+#: src/modules/mixer/e_mod_main.c:1154
+msgid ""
+"Mixer Module Settings data changed.<br>Your old configuration has been "
+"replaced with new default.<br>Sorry for the inconvenience."
+msgstr ""
+"Podaci o Postavkama Modula Miksera su promijenjeni.<br>Stara konfiguracija "
+"je zamijenjena sa standardnom.<br>Izvinite zbog neugodnosti."
+
+#: src/modules/connman/e_mod_main.c:213
+msgid "Connection Manager"
+msgstr "Mrežni Upravitelj"
+
+#: src/modules/connman/e_mod_main.c:730
+msgid "Network Connection Settings"
+msgstr "Postavke Mrežne Veze"
+
+#: src/modules/connman/e_mod_main.c:736
+msgid "Network Device"
+msgstr "Mrežni Uređaj"
+
+#: src/modules/connman/e_mod_main.c:741
+msgid "Wifi"
+msgstr "Wifi"
+
+#: src/modules/connman/e_mod_main.c:744
+msgid "LAN"
+msgstr "LAN"
+
+#: src/modules/connman/e_mod_main.c:747
+msgid "Specific Device"
+msgstr "Specifičan Uređaj"
+
+#: src/modules/connman/e_mod_main.c:768
+msgid "Networks"
+msgstr "Mreže"
+
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "Sustav"
+
+#~ msgid "Mount of device failed"
+#~ msgstr "Neuspjelo montiranje uređaja"
+
+#~ msgid "Configure Virtual Desktops"
+#~ msgstr "Konfiguriraj Virtualne Radne Površine"
+
+#~ msgid "Configure Contents..."
+#~ msgstr "Konfiguriraj Sadržaj..."
+
+#~ msgid "Shelf Size"
+#~ msgstr "Veličina Police"
+
+#~ msgid "Configure Shelf Contents"
+#~ msgstr "Konfiguriraj Sadržaj Police"
+
+#~ msgid "Configure Toolbar Contents"
+#~ msgstr "Konfiguriraj Sadržaj Alatne Trake"
+
+#~ msgid "Configure Dialog Title"
+#~ msgstr "Konfiguriraj Naslov Dijaloga"
+
+#~ msgid "Configure"
+#~ msgstr "Konfiguriraj"
+
+#~ msgid "Configure Heading"
+#~ msgstr "Konfiguriraj Zaglavlje"
+
+#~ msgid "Scaling Factors"
+#~ msgstr "Faktori Skaliranja"
+
+#~ msgid "Personal scaling factor"
+#~ msgstr "Lični fakotr skaliranja"
+
+#~ msgid "Custom Grid Icons"
+#~ msgstr "Posebne Mrežne Ikone"
+
+#~ msgid "Custom Smart Grid Icons"
+#~ msgstr "Posebne Pametne Mrežne Ikone"
diff --git a/po/hu.gmo b/po/hu.gmo
index b9bed24..7943491 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index 567edf5..6040447 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2009-03-22 15:25+0000\n"
 "Last-Translator: lisovszki <lisovszki at gmail.com>\n"
 "Language-Team: Hungarian <pclinuxos-i18n at googlegroups.com>\n"
@@ -20,20 +20,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Az Enlightenmentrõl"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -78,391 +78,393 @@ 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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Igen"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nem"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Tényleg ki akarsz lépni?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Tényleg ki akarsz lépni?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Tényleg ki akarod kapcsolni a gépet?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Biztosan újra akarod indítani?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 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:2047
+#: src/bin/e_actions.c:2061
 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:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Tényleg hibernálni akarod a gépet?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 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:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Ablak : Műveletek"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Mozgatás"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Átméretezés"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menü"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Ablak menü"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Felemelés"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Alsó"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Kilövés"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Ablak : Állapot"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Ragadós módra vált"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Ikonizált módra vált"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Teljes képernyő módra vált"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maximalizálás"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Maximalizálás függőlegesen"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Maximalizálás vízszintesen"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Teljes képernyő maximalizálás"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximalizálási mód \"Intelligens\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximalizálási mód \"Kitöltés\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximalizálási mód \"Bőséges\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Felgördítés fel módra vált"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Felgördítés le módra vált"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "Felgördítés balra módra vált"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Felgördítés jobbra módra vált"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Felgördítés módra vált"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Szegély nélküli állapotra vált"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "Rögzített állapotra vált"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Munkaasztal"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Asztal váltás balra"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Asztal váltás jobbra"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Asztal váltás fel"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Asztal váltás le"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Asztal váltás ezzel..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Munkaasztal megjelenítése"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
 msgstr "Mutasd a polcot"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Asztal váltása ide..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Vízszintes asztal váltás..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Váltás a 0-ás asztalra"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Váltás az 1-es asztalra"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Váltás a 2-es asztalra"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Váltás a 3-as asztalra"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Váltás a 4-es asztalra"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Váltás az 5-ös asztalra"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Váltás a 6-os asztalra"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Váltás a 7-es asztalra"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Váltás a 8-as asztalra"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Váltás a 9-es asztalra"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Váltás a 10-es asztalra"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Váltás a 11-es asztalra"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Váltás erre az asztalra..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Asztal váltás balra"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Asztal váltás jobbra"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Asztal válát fel"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Asztal váltás le"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Asztalváltás ennyivel..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Váltás erre az asztalra..."
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Lineáris asztalváltás"
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Váltás a 0. asztalra"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Váltás a 1. asztalra"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Váltás a 2. asztalra"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Váltás a 3 asztalra"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Váltás a 4. asztalra"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Váltás a 5. asztalra"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Váltás a 6. asztalra"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Váltás a 7. asztalra"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Váltás a 8. asztalra"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Váltás a 9. asztalra"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Váltás a 10. asztalra"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Váltás a 11. asztalra"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Váltás erre az asztalra..."
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -472,102 +474,117 @@ msgstr "Váltás erre az asztalra..."
 msgid "Screen"
 msgstr "Képernyő"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Az egér küldése a 0-ás képernyőre"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Az egér küldése a 1-es képernyőre"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Egér küldése erre a képernyőre..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Egér küldése előre 1 képernyőt"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Egér vissza 1 képernyőt"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Egér küldése előre/Vissza képernyőket..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Ablak : Mozgatás"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "A következő asztalra"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Az előző asztalra"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "#... Asztal által..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Erre az asztalra..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Saját Menü mutatása"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Kedvencek menü megjelenítése"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Minden alkalmazás menü megjelenítése"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Ablakok menü megjelenítése"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Menü megjelenítése..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Parancs"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Alkalmazás"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Újraindítás"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
 msgstr "Kilépés most"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment %s modul"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Teljes képernyő módra vált"
+
+#: src/bin/e_actions.c:2813
+#, fuzzy
+msgid "Offline Mode Toggle"
+msgstr "Felgördítés módra vált"
+
+#: 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -580,55 +597,55 @@ msgstr "Kilépés most"
 msgid "System"
 msgstr "Rendszer"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Kijelentkezés"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr "Kikapcsolás most"
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr "Kikapcsolás"
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Újraindítás"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Felfüggesztés"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Hibernálás"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 msgid "Lock"
 msgstr "Lezárás"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Ablakok tisztogatása"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr "Ablak : Műveletek"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
 msgstr "Késleltetett folyamat"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 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:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "Desktop fájlok keresése kész"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "Desktop fájl keresés"
 
@@ -636,13 +653,14 @@ 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:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -657,7 +675,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -669,7 +687,7 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 +704,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:746
+#: src/bin/e_config.c:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -700,11 +718,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:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
 msgstr "Beállítások frissítve"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -715,7 +733,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:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -730,7 +748,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:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -743,7 +761,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:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -755,7 +773,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:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -766,11 +784,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:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment konfiguráció írási problémák"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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
@@ -796,7 +814,7 @@ msgid "Modules"
 msgstr "Modulok"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Kiterjesztések"
 
@@ -805,22 +823,22 @@ msgstr "Kiterjesztések"
 msgid "Container %d"
 msgstr "%d tároló"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Hiba - nincs PAM támogatás"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 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:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Zárolás nem sikerült!"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -828,15 +846,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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Kérlek írd be a feloldási jelszavad"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Hiba az azonosítási rendszerben!"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -846,6 +864,25 @@ 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
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Teljesítetlen ablak beállítások"
@@ -944,23 +981,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:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: 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:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Kivágás"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Másolás"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Beillesztés"
 
@@ -993,262 +1030,316 @@ msgid ""
 "application failed to start."
 msgstr "Az E17 nem tudta elindítani a következõ programot:<br><br>%s<br><br>"
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Hiba az alkalmazás végrehajtásakor"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s váratlanul befejezte mûködését."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, 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:442
+#: src/bin/e_exec.c:443
 #, 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:444
+#: src/bin/e_exec.c:445
 #, 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:448
+#: src/bin/e_exec.c:449
 #, 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:451
+#: src/bin/e_exec.c:452
 #, 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:454
+#: src/bin/e_exec.c:455
 #, 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:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s futtatása megszakadt szegmens hiba miatt"
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, 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:463
+#: src/bin/e_exec.c:464
 #, 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:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s futtatása megszakadt bus hiba miatt"
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, 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:525
+#: src/bin/e_exec.c:528
 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:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Hiba bejegyzések"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Nem volt hibaüzenet."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Mentsd el ezt az üzenetet"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, 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:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Hiba információ"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Hiba szignál információk"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Kimeneti adat"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Nem volt kimenet"
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr "Nem létező útvonal"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s nem létezik."
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Futási hiba"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Futási hiba"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Hiba"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i fájlok"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
 msgstr "Link"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr "Megszakítás"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
 msgstr "Szülő beállítások öröklése"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Nézetmód"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "A nézet frissítése"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Rejtett fájlok megjelenítése"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "Emlékezz az utasításokra"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Rendezés Most"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Új könyvtár"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Némít"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
 msgstr "Alapértelmezés használata"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Rács Ikonok"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Egyéni Ikonok"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Ikonméret (%d)"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Beállítás háttérként"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "Polc elemei"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Törlés"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Új könyvtár létrehozása"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Új könyvtár neve:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "%s átnevezése erre:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Fájl átnevezése"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr "Újra"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Hiba"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr "Nem, ne mindet"
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr "Igen, mindet"
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "Indulás folyamatban"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Biztosan törölni akarod a(z) <br><hilight>%s</hilight> nevû fájlt?"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr "Elveti ezt"
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr "Mindent elvet"
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, 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:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "A törlés megerősítése"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, 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:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1309,8 +1400,8 @@ msgid "Preview"
 msgstr "Előnézet"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: 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"
 
@@ -1319,7 +1410,7 @@ msgid "Thumbnail"
 msgstr "Előnézeti kép"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Egyéni"
 
@@ -1335,70 +1426,70 @@ msgstr "Link információ"
 msgid "Select an Image"
 msgstr "Válassz egy képet"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MeB"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr "Ismeretlen érték"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "Cserélhető adathordozójú eszköz"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Egyszerű"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Beágyazott"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Megjelenés"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Tartalom automatikus görgetése"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Átméretezhetõ"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Modul áthelyezésének/átméretezésének kezdése"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Modul eltávolítása"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "Modul áthelyezésének/átméretezésének leállítása"
 
@@ -1449,8 +1540,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1458,7 +1549,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Halomba rakás"
 
@@ -1636,12 +1727,12 @@ msgstr "Teljes képernyő"
 msgid "Window List"
 msgstr "Ablaklista"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Lapozó"
 
@@ -1912,11 +2003,11 @@ msgstr "Induláskor mindig figyeld"
 #: 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr "Beállítások"
 
@@ -1950,8 +2041,8 @@ msgstr "Betöltött modulok"
 msgid "Unload Module"
 msgstr "Modul kikapcsolása"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1981,12 +2072,12 @@ msgstr "Kiválasztott modulok"
 msgid "Remove Gadget"
 msgstr "Modul eltávolítása"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 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:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Elrendezés"
 
@@ -2072,122 +2163,122 @@ msgstr "(Nincsenek ablakok)"
 msgid "No name!!"
 msgstr "Nincs név!!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(Nincsenek polcok)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Polc #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Polc hozzáadása"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Polc törlése"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: 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:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Apró"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Közepes"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Nagy"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "nagyon nagy"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Polc elemei"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Minden felett"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Ablakok alatt"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Minden alatt"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "Az ablakok eltakarhatják a polcot"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Tartalom méretének összehúzása"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixel"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Stílusok"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "Automatikus elrejtés"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "Polc automatikus elrejtése"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "Mutasd ha az egér rajta van"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "Mutasd egér kattintásra"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "Elrejtés ennyi idő után"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%1.1f másodperc"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "Elrejtés időtartama"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "Mutasd minden asztalon"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "Mutrasd a kiválasztott asztalon"
 
@@ -2570,7 +2661,8 @@ 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:867
-msgid "Setup Grab Input Handing"
+#, fuzzy
+msgid "Setup Grab Input Handling"
 msgstr "Beviteli kezelő beállítása"
 
 #: src/bin/e_main.c:872
@@ -2758,30 +2850,37 @@ msgstr "Enlightenment %s modul"
 msgid "Would you like to unload this module?<br>"
 msgstr "Szeretnéd a modult kikapcsolni?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 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:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 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:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Elemek mozgatása/átméretezése"
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Polc elemei"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Polc törlése"
 
@@ -2935,7 +3034,7 @@ msgstr "A témáról"
 msgid "Set As Theme"
 msgstr "Beállítás témának"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Eszköztár elemei"
@@ -2954,67 +3053,67 @@ 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:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bájt"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "A jövőben"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "Az utolsó percben"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li éve"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li hónapja"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li hete"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li napja"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li órája"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li perce"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3026,7 +3125,7 @@ msgstr "Ismeretlen"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Hozzáadás"
 
@@ -3049,7 +3148,7 @@ msgid "Add to Favorites"
 msgstr "Hozzáadás a Kedvencekhez"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3163,6 +3262,7 @@ msgid "Internal"
 msgstr "Belső"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
@@ -3174,24 +3274,24 @@ msgstr "Hárdver"
 msgid "Battery"
 msgstr "Akkumulátor"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr "Hamarosan le fog merülni az akku!"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr "AC áramforrás ajánlott."
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr "HIBA"
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr "Akkumulátor mérő"
 
@@ -3200,10 +3300,25 @@ msgid "Clock"
 msgstr "Óra"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
 msgstr "Beállító panel"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Újraindítás"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "Kikapcsolási idő"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Modulok"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3226,7 +3341,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:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "Alkalmazások"
 
@@ -3583,41 +3698,54 @@ msgstr "Nyújtás"
 msgid "Desk"
 msgstr "Asztal"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "Képernyő zárolási beállítások"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Automatikus zárolás"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 msgid "Lock when Enlightenment starts"
 msgstr "Zárolás, amikor az Enlightenment indul"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
 msgstr "Zárolás a képernyõvédõ indításakor"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+msgid "Time after screensaver activated"
+msgstr "Az idő, miután az X képernyővédő vált"
+
+#: 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 másodperc"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
 msgid "Lock when idle time exceeded"
 msgstr "Zárolás ha meghaladja az inaktív időt"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:184
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
 msgid "Idle time to exceed"
 msgstr "Inaktív idő meghaladás"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 perc"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3628,27 +3756,27 @@ msgstr "%1.0f perc"
 msgid "Personal"
 msgstr "Személyes"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Bejelentkező ablak beállításai"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
 msgstr "Megjelenítés minden képernyõn"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr "Megjelenítés a jelenlegi képernyõn"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
 msgstr "Megjelenítés ezen a képernyõn #:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3657,29 +3785,49 @@ msgstr "Megjelenítés ezen a képernyõn #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Háttérkép mód"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
 #: src/modules/gadman/e_mod_config.c:149
 msgid "Theme Defined"
 msgstr "Téma megadva"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Téma háttérkép"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "A téma hátterének használata"
+
+#: 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 "Egyéni zárolás"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "Egyéni zárolás használata"
 
@@ -3687,59 +3835,74 @@ msgstr "Egyéni zárolás használata"
 msgid "Screen Lock"
 msgstr "Képernyõ zárolás"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "Virtuális asztal beállítások"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Munkaasztalok száma"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Asztalváltás egérrel"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "Animált váltás"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Asztalok"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Válts asztalt, ha az egér a kép szélén van"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: src/modules/conf_desks/e_int_config_desks.c:298
 msgid "Wrap desktops around when flipping"
 msgstr "Forgasd körbe az asztalokat váltáskor"
 
-#: src/modules/conf_desks/e_int_config_desks.c:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "Váltás animáció"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Ki"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "Szelet"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Nagyítás"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 mp"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Háttér módosítás"
+
+#: 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 "Virtuális asztalok"
@@ -3755,8 +3918,8 @@ msgstr "Párbeszédablak beállításai"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -3929,23 +4092,23 @@ msgstr "A jelenlegi megjelenítő szervernek nincs <br>DPMS kiterjesztése"
 msgid "Display Power Management Settings"
 msgstr "Energiakezelés beállítások megjelenítése"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
 msgid "Enable Display Power Management"
 msgstr "Energiakezelés megjelenítésének engedélyezése"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
 msgstr "Időmérő(k)"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "Készenléti idő"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "Felfüggesztés ideje"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "Kikapcsolási idő"
 
@@ -4518,7 +4681,8 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pixel"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+#, fuzzy
+msgid "Threshold for applying drag momentum"
 msgstr "Értékküszöb a húzás pillanatának engedélyezéséhez"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4739,7 +4903,7 @@ msgid "Select an Edj File"
 msgstr "Válassz egy Edj fájlt"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Fájlok"
 
@@ -5084,55 +5248,50 @@ msgstr "Maximum"
 msgid "Scaling"
 msgstr "Skálázás"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Képernyővédő beállítások"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 képernyővédő engedélyezése"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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 "Képernyővédő számláló(k)"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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 "Az idő, miután bekapcsol a képernyővédő"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
 msgstr "Az idő, miután az X képernyővédő vált"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f másodperc"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "Üresen hagy"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Javasolt"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "Nem javasolt"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr "Exponálás események"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Engedélyezés"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "Ne engedélyezd"
 
@@ -5145,7 +5304,7 @@ msgid "Configured Shelves"
 msgstr "Beállított polcok"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "FM beállítása"
@@ -5191,10 +5350,6 @@ msgstr "Téma kategóriák"
 msgid "Assign"
 msgstr "Hozzárendelés"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "Törlés"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "Az összes törlése"
@@ -6048,27 +6203,19 @@ msgstr "Árnyékdobás"
 msgid "Run Command Dialog"
 msgstr "Parancs párbeszédablak futtatása"
 
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount error"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
 msgstr "Saját könyvtár"
 
-#: src/modules/fileman/e_mod_main.c:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -6086,7 +6233,7 @@ msgstr ""
 "Ezek az új alapértelmezett beállítások helyjehozták a hibákat.<br>Most már "
 "testreszabhatod a modult.<br> Elnézésedet kérjük a kellemetlenségekért.<br>"
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -6102,96 +6249,104 @@ msgstr ""
 "alapértelmezett beállítások vissza lettek állítva.<br> Elnézést a "
 "kellemetlenségekért.<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
 msgstr "Fájlkezelő beállítások frissítve"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr "Fájlkezelő beállítások"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Ikonméret"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 #, fuzzy
 msgid "View"
 msgstr "Nézetmód"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr "Könyvtárak megnyitása helyben"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "Először rendezd a könyvtárakat"
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Alap méret"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "Egy kattintás használata"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr "Ikon kiterjesztés megjelenítése"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "Teljes útvonal megjelenítése"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr "Munkaasztal ikonok megjelenítése"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr "Az eszköztár megjelenítése"
 
-#: src/modules/fileman/e_mod_config.c:257
-msgid "Show HAL icons on desktop"
-msgstr "HAL ikonok megjelenítése a munkaasztalon"
-
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
 msgstr "Viselkedés"
 
-#: src/modules/fileman/e_fwin.c:1187
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr "HAL ikonok megjelenítése a munkaasztalon"
+
+#: 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:1462
 msgid "Go to Parent Directory"
 msgstr "Vissza az előző könyvtárba"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "Alkalmazás hozzáadása..."
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Megnyitás"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Megnyitás ezzel..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "Alkalmazások"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Megadott alkalmazások"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr "Egyéni parancs"
 
@@ -6280,39 +6435,39 @@ msgstr "Előző ablak"
 msgid "Select a window"
 msgstr "Válassz egy ablakot"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
 msgstr "IBar beállítások"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Kijelölt IBar forrás"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Ikon címkék"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Ikon címke megjelenítése"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "Alkalmazás nevének megjelenítése"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "Megjegyzés megjelenítése"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "Általános megjelenítés"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "Új IBar forrás létrehozása"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "Adj meg egy nevet az új forrásnak:"
 
@@ -6327,27 +6482,27 @@ msgstr "A \"%s\" törlését kérted.<br><br> Biztosan törölni szeretnéd?"
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Biztosan törölni szeretnéd?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Ikon tulajdonságok módosítása"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Ikon eltávolítása"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr "Ikon hozzáadása"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr "Új ikon létrehozása"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Alkalmazás hozzáadása"
 
@@ -6399,89 +6554,89 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr "Lapozó beállításai"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 msgid "Flip desktop on mouse wheel"
 msgstr "Asztal váltás az egérgörgővel"
 
-#: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:164
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 msgid "Show desktop names"
 msgstr "Munkaasztal nevek megjelenítése"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr "Felugró ablakok beállításai"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr "Asztal váltáskor mutasd"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr "Sürgős ablakoknak"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr "Kijelölés és csúsztatás gomb"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "Beállításhoz kattint"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr "Fogd és vidd gomb"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr "Húzd az egész asztalt"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr "Billentyűfolyamat felugró ablak magassága"
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "Ellenállás a fogásnak"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr "Felugró lapozó magasság"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr "Felugró sebessége"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f másodperc"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr "Sürgős ablak beállításai"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr "Felugró megjelenítése a sürgős ablakon"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 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:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr "Lapozó gomb elkapás"
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6490,11 +6645,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:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr "Figyelem"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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 "
@@ -6503,29 +6658,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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "%i gomb"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr "Lapozó felugró ablak megjelenítése"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr "Felugró asztal jobbra"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr "Felugró asztal balra"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr "Felugró asztal fel"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr "Felugró asztal le"
 
@@ -6771,7 +6926,7 @@ msgstr "Bal:"
 msgid "Right:"
 msgstr "Jobb:"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr "Némít"
 
@@ -6811,11 +6966,11 @@ msgstr "Keverő modul beállításai"
 msgid "Mixer Settings Updated"
 msgstr "Keverő beállításai frissítve"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
 msgstr "Vezérlők"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6851,6 +7006,19 @@ msgstr "Megadott eszköz"
 msgid "Networks"
 msgstr "Hálózatok"
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "Rendszer"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Virtuális asztalok beállítása"
 
diff --git a/po/it.gmo b/po/it.gmo
index 09efd1b..5e6fd2c 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 6a22fda..4a041e7 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-04-22 22:52+1000\n"
-"PO-Revision-Date: 2009-04-19 16:11+0200\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
+"PO-Revision-Date: 2009-06-08 12:28+0200\n"
 "Last-Translator: Massimo Maiurana <maiurana at gmail.com>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -18,20 +18,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Informazioni su Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -77,57 +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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Sì"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "No"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Siete sicuri di voler uscire?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Siete sicuri di voler chiudere la sessione?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Siete sicuri di voler arrestarre il sistema?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Siete sicuri di voler riavviare?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -135,7 +137,7 @@ msgstr ""
 "Avete richiesto di riavviare il sistema.<br><br>Siete sicuri di volerlo "
 "fare??"
 
-#: src/bin/e_actions.c:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -143,327 +145,327 @@ msgstr ""
 "Avete richiesto di sospendere il computer.<br><br>Siete sicuri di volerlo "
 "fare?"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Siete sicuri di voler ibernare?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 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:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Finestre : Azioni"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Sposta"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Ridimensiona"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menù"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Menù finestra"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Eleva"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Abbassa"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Uccidi"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Finestre : Stato"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Commuta stato appiccicata"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Commuta stato iconificata"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Commuta stato a tutto schermo"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Massimizza"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Massimizza verticalmente"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Massimizza orizzontalmente"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Massimizza a tutto schermo"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Modo massimizzazione intelligente"
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Modo massimizzazione espansivo"
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Modo massimizzazione riempitivo"
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Commuta contrazione verso l'alto"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Commuta contrazione verso il basso"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "Commuta contrazione verso sinistra"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Commuta contrazione verso destra"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Commuta contrazione"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Commuta stato senza bordo"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "Commuta stato attaccata"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Desktop"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Cambia desktop verso sinistra"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Cambia desktop verso destra"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Cambia desktop verso l'alto"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Cambia desktop verso il basso"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Cambia desktop di..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Mostra il desktop"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
 msgstr "Mostra la mensola"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Cambia desktop a..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Cambia desktop linearmente..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Passa al desktop 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Passa al desktop 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Passa al desktop 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Passa al desktop 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Passa al desktop 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Passa al desktop 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Passa al desktop 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Passa al desktop 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Passa al desktop 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Passa al desktop 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Passa al desktop 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Passa al desktop 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Passa al desktop..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Cambia desktop verso sinistra (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Cambia desktop verso destra (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Cambia desktop verso l'alto (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Cambia desktop verso il basso (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Cambia desktop di...  (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Cambia desktop a... (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Cambia desktop linearmente... (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
 msgstr "Cambia desktop in direzione..."
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Passa al desktop 0 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Passa al desktop 1 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Passa al desktop 2 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Passa al desktop 3 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Passa al desktop 4 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Passa al desktop 5 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Passa al desktop 6 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Passa al desktop 7 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Passa al desktop 8 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Passa al desktop 9 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Passa al desktop 10 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Passa al desktop 11 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Passa al desktop... (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -473,102 +475,114 @@ msgstr "Passa al desktop... (tutti gli schermi)"
 msgid "Screen"
 msgstr "Schermo"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Invia mouse allo schermo 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Invia mouse allo schermo 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Invia mouse allo schermo..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Invia mouse avanti di 1 schermo"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Invia mouse indietro di 1 schermo"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Invia mouse avanti/indietro di schermi..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Finestre : Spostamento"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "Al desktop successivo"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Al desktop precedente"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "Di # desktop..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Al desktop..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Mostra menù principale"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Mostra menù preferiti"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Mostra menù applicazioni"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Mostra menù dei client"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Mostra menù..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Comando"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Applicazione"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Riavvia"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Esci"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
 msgstr "Esci adesso"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment : Modalità"
+
+#: src/bin/e_actions.c:2808
+msgid "Presentation Mode Toggle"
+msgstr "Commuta modalità presentazione"
+
+#: src/bin/e_actions.c:2813
+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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -581,55 +595,55 @@ msgstr "Esci adesso"
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
-msgstr "Chiudi sessione"
+msgstr "Esci"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr "Spegni adesso"
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr "Spegni"
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Riavvia"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Sospendi"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Iberna"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 msgid "Lock"
 msgstr "Blocca"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Ordina Finestre"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr "Generica : Azioni"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
 msgstr "Azione ritardata"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Imposta come sfondo"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "Scansione file desktop eseguita"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "Scansione file desktop"
 
@@ -637,13 +651,14 @@ msgstr "Scansione file desktop"
 msgid "Color Selector"
 msgstr "Selettore colore"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -658,7 +673,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -670,7 +685,7 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 +705,7 @@ msgstr ""
 "funzionalità.<br>Adesso è possibile riconfigurare le cose a proprio "
 "piacimento.<br>Ci scusiamo per il disagio.<br>"
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -705,11 +720,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:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
 msgstr "Impostazioni aggiornate"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -721,7 +736,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:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -737,7 +752,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:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -751,7 +766,7 @@ msgstr ""
 "l'errore è:<br>%s<br><br>Questo file è stato cancellato per "
 "evitare<br>corruzione di dati.<br>"
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -765,7 +780,7 @@ msgstr ""
 "l'errore è:<br>%s<br><br>Questo file è stato cancellato per "
 "evitare<br>corruzione di dati.<br>"
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -777,11 +792,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:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemi scrittura configurazione di Enlightenment"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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,7 +822,7 @@ msgid "Modules"
 msgstr "Moduli"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Estensioni"
 
@@ -816,22 +831,22 @@ msgstr "Estensioni"
 msgid "Container %d"
 msgstr "Contenitore %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Errore - supporto PAM mancante"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 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:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Blocco non riuscito"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -840,15 +855,15 @@ msgstr ""
 "impossessata della tastiera e/o del<br>mouse e Enlightenment non può "
 "riappropiarsene."
 
-#: src/bin/e_desklock.c:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Inserire la password di sblocco"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Errore del sistema di autenticazione"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -859,6 +874,28 @@ 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
+msgid "Activate Presentation Mode?"
+msgstr "Attivare modalità presentazione?"
+
+#: src/bin/e_desklock.c:1040
+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 ""
+"Avete sbloccato lo schermo troppo presto.<br><br>Volete abilitare la "
+"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
+msgid "No, but increase timeout"
+msgstr "No, ma aumenta la temporizzazione"
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr "No, e non chiedere più"
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Proprietà della finestra incomplete"
@@ -959,23 +996,23 @@ msgstr "Seleziona un'icona"
 msgid "Select an Executable"
 msgstr "Seleziona un'eseguibile"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Taglia"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Copia"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Incolla"
 
@@ -1010,260 +1047,308 @@ msgstr ""
 "Enlightenment non ha potuto avviare l'applicazione:<br><br>%"
 "s<br><br>L'applicazione non è partita"
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Errore d'esecuzione dell'applicazione"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "L'esecuzione di %s è terminata inaspettatamente"
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, 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:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s è stato fermato da un segnale d'interruzione"
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s è stato fermato da un segnale di uscita"
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s è stato fermato da un segnale di aborto"
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, 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:454
+#: src/bin/e_exec.c:455
 #, 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:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s è stato fermato da un errore di segmentazione"
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s è stato fermato da una pipe rotta"
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s è stato fermato da un segnale di terminazione"
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s è stato fermato da un errore del bus"
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s è stato fermato dal segnale numero %i"
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 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:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Log di errore"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Non ci sono messaggi d'errore."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Salva questo messaggio"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, 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:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Informazioni sull'errore"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Informazioni sui segnali d'errore"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Dati dell'output"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Non ci sono output."
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr "Percorso inesistente"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s non esiste."
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+msgid "Mount Error"
+msgstr "Errore di montaggio"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr "Impossibile montare il dispositivo"
+
+#: src/bin/e_fm.c:3047
+msgid "Unmount Error"
+msgstr "Errore di smontaggio"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr "Impossibile smontare il dispositivo"
+
+#: src/bin/e_fm.c:3062
+msgid "Eject Error"
+msgstr "Errore di espulsione"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr "Impossibile espellere il dispositivo"
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i File"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
 msgstr "Collega"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr "Abortisci"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
 msgstr "Eredita impostazioni genitore"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Modalità visualizzazione"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Aggiorna vista"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Mostra file nascosti"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "Ricorda ordinamento"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Ordina adesso"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nuova directory"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Rinomina"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr "Smonta"
+
+#: src/bin/e_fm.c:8063
+msgid "Mount"
+msgstr "Monta"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr "Espelli"
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
 msgstr "Usa predefinito"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
-msgstr "Icone in griglia"
+msgstr "Icone"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
-msgstr "Icone personalizzata"
+msgstr "Icone personalizzabile"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Elenco"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Dimensione icona (%d)"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+msgid "Set background..."
+msgstr "Imposta sfondo..."
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+msgid "Set overlay..."
+msgstr "Imposta sfumatura..."
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Pulisci"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Crea nuova directory"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Nome directory:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Rinomina %s in:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Rinomina file"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr "Ritenta"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Errore"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr "No a tutti"
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr "Sì a tutti"
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, 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:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr "Ignora questo"
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr "Ignora tutto"
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, 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:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Conferma eliminazione"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, 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:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1324,8 +1409,8 @@ msgid "Preview"
 msgstr "Anteprima"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Predefinito"
 
@@ -1334,7 +1419,7 @@ msgid "Thumbnail"
 msgstr "Miniatura"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Personalizzata"
 
@@ -1350,70 +1435,70 @@ msgstr "Informazioni collegamento"
 msgid "Select an Image"
 msgstr "Seleziona un'immagine"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volume sconosciuto"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "Dispositivo rimovibile"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Liscio"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Incassato"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Aspetto"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Scorri automaticamente contenuto"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Ridimensionabile"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Inizio spostamento/ridimensionamento di questo gadget"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Elimina questo gadget"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "Fine spostamento/ridimensionamento di questo gadget"
 
@@ -1464,8 +1549,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1473,7 +1558,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Livello"
 
@@ -1596,7 +1681,7 @@ msgstr "Stato"
 
 #: src/bin/e_int_border_menu.c:556
 msgid "Remember"
-msgstr "Ricorda"
+msgstr "Ricorda..."
 
 #: src/bin/e_int_border_menu.c:572 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
@@ -1651,12 +1736,12 @@ msgstr "A tutto schermo"
 msgid "Window List"
 msgstr "Lista finestre"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Pager"
 
@@ -1782,7 +1867,7 @@ msgstr "Nascosto"
 
 #: src/bin/e_int_border_remember.c:75
 msgid "Window Remember"
-msgstr "Ricorda finestra"
+msgstr "Ricordi finestra"
 
 #: src/bin/e_int_border_remember.c:244
 msgid "Window properties are not a unique match"
@@ -1934,11 +2019,11 @@ msgstr "Prendi sempre fuoco all'avvio"
 #: 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr "Impostazioni"
 
@@ -1972,8 +2057,8 @@ msgstr "Moduli caricati"
 msgid "Unload Module"
 msgstr "Scarica modulo"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2003,12 +2088,12 @@ msgstr "Gadget selezionati"
 msgid "Remove Gadget"
 msgstr "Elimina gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 msgid "Toolbar Settings"
 msgstr "Impostazioni barra strumenti"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Posizione"
 
@@ -2093,121 +2178,121 @@ msgstr "(Nessuna Finestra)"
 msgid "No name!!"
 msgstr "Nessun nome!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(Nessuna mensola)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Mensola #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Aggiungi mensola"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Elimina mensola"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: 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:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Piccolissima"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Media"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grande"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Grandissima"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 msgid "Set Contents..."
 msgstr "Imposta contenuti..."
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Al di sopra di tutto"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Al di sotto delle finestre"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Al di sotto di tutto"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "Consenti alle finestre di sovrapporsi alla mensola"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Riduci alla dimensione del contenuto"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixel"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Stili"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "Scomparsa automatica"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "Nascondi automaticamente la mensola"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "Mostra al passaggio del mouse"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
-msgstr "Mostra al click del mouse"
+msgstr "Mostra al clic del mouse"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "Timeout per la scomparsa"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f secondi"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "Durata scomparsa"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "Mostra su tutti i desktop"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "Mostra sui desktop specificati"
 
@@ -2625,8 +2710,8 @@ msgstr ""
 "sistema di 'drag & drop'."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
-msgstr "Gestione cattura input"
+msgid "Setup Grab Input Handling"
+msgstr "Impostazioni gestione cattura dell'input"
 
 #: src/bin/e_main.c:872
 msgid "Enlightenment cannot set up its input grab handling system."
@@ -2842,11 +2927,21 @@ msgstr "Modulo %s di Enlightenment"
 msgid "Would you like to unload this module?<br>"
 msgstr "Volete disattivare questo modulo?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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 ""
+"Avete disabilitato lo screensaver troppo presto.<br><br>Volete abilitare la "
+"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
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Siete sicuri di voler eliminare questa mensola?"
 
-#: src/bin/e_shelf.c:1259
+#: src/bin/e_shelf.c:1273
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -2854,19 +2949,19 @@ msgstr ""
 "Avete chiesto di eliminare questa mensola.<br><br>Siete sicuri di volerla "
 "eliminare?"
 
-#: src/bin/e_shelf.c:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Fine spostamento/ridimensionamento oggetti"
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Inizio spostamento/ridimensionamento oggetti"
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 msgid "Set Shelf Contents"
 msgstr "Imposta contenuti della mensola"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Elimina questa mensola"
 
@@ -2899,7 +2994,7 @@ msgstr ""
 
 #: src/bin/e_sys.c:323
 msgid "Logout now"
-msgstr "Chiudi sessione adesso"
+msgstr "Esci adesso"
 
 #: src/bin/e_sys.c:324
 msgid "Wait longer"
@@ -3021,7 +3116,7 @@ msgstr "Informazioni sul tema"
 msgid "Set As Theme"
 msgstr "Imposta come tema"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 msgid "Set Toolbar Contents"
 msgstr "Imposta contenuti della barra strumenti"
 
@@ -3039,67 +3134,67 @@ 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:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Byte"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f MB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "In futuro"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "Nell'ultimo minuto"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li anni fa"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li mesi fa"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li settimane fa"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li giorni fa"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li ore fa"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minuti fa"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3111,7 +3206,7 @@ msgstr "Sconosciuto"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -3134,7 +3229,7 @@ msgid "Add to Favorites"
 msgstr "Aggiungi ai preferiti"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3248,6 +3343,7 @@ msgid "Internal"
 msgstr "Interni"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
@@ -3259,24 +3355,24 @@ msgstr "Hardware"
 msgid "Battery"
 msgstr "Battery"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr "Basso livello batteria!"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr "Consigliata alimentazione AC."
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr "N/D"
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr "ERRORE"
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr "Indicatore di carica"
 
@@ -3285,10 +3381,22 @@ msgid "Clock"
 msgstr "Clock"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
 msgstr "Pannello impostazioni"
 
+#: src/modules/conf/e_mod_main.c:234
+msgid "Presentation"
+msgstr "Presentazione"
+
+#: src/modules/conf/e_mod_main.c:241
+msgid "Offline"
+msgstr "Non in linea"
+
+#: src/modules/conf/e_mod_main.c:269
+msgid "Modes"
+msgstr "Modalità"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3311,7 +3419,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:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "Tutte le applicazioni"
 
@@ -3666,41 +3774,53 @@ msgstr "Imposta"
 msgid "Desk"
 msgstr "Desktop"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "Impostazioni bloccaschermo"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Blocco automatico"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 msgid "Lock when Enlightenment starts"
 msgstr "Blocca all'avvio di Enlightenment"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
 msgstr "Blocca all'attivazione dello screensaver di X"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+msgid "Time after screensaver activated"
+msgstr "Tempo dopo attivazione screensaver"
+
+#: 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 secondi"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
 msgid "Lock when idle time exceeded"
 msgstr "Blocca al superamento del tempo massimo"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:184
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
 msgid "Idle time to exceed"
 msgstr "Tempo massimo per bloccaschermo"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 minuti"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3711,27 +3831,27 @@ msgstr "%1.0f minuti"
 msgid "Personal"
 msgstr "Personali"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Finestra di login"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
 msgstr "Mostra su tutte le zone"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr "Mostra sulla zona corrente"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
 msgstr "Mostra sulla zona #:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3740,29 +3860,48 @@ msgstr "Mostra sulla zona #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Modalità sfondo"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
 #: src/modules/gadman/e_mod_config.c:149
 msgid "Theme Defined"
 msgstr "Definita dal tema"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Sfondo del tema"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+msgid "User Wallpaper"
+msgstr "Sfondo dell'utente"
+
+#: 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 "Attivazione modalità presentazione"
+
+#: 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 "Suggerisci modalita' presentazione"
+
+#: 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 "Se disattivato prima di"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:457
 msgid "Custom Screenlock"
 msgstr "Bloccaschermo personalizzato"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "Usa bloccaschermo personalizzato"
 
@@ -3770,59 +3909,73 @@ msgstr "Usa bloccaschermo personalizzato"
 msgid "Screen Lock"
 msgstr "Bloccaschermo"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "Desktop virtuali"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Numero di desktop"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Cambio desktop con mouse"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "Cambio animato"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Desktop"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Cambia desktop al trascinamento di oggetti sul limite dello schermo"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: src/modules/conf_desks/e_int_config_desks.c:298
 msgid "Wrap desktops around when flipping"
 msgstr "Passa al desktop opposto quando oltrepassi gli estremi"
 
-#: src/modules/conf_desks/e_int_config_desks.c:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "Animazione cambio"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Disattivata"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "Sovrapposizione"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 sec"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+msgid "Background panning"
+msgstr "Sfondo panoramico"
+
+#: src/modules/conf_desks/e_int_config_desks.c:321
+#, c-format
+msgid "%.2f X-axis pan factor"
+msgstr "Fattore dell'asse X %.2f"
+
+#: src/modules/conf_desks/e_int_config_desks.c:325
+#, c-format
+msgid "%.2f Y-axis pan factor"
+msgstr "Fattore dell'asse Y %.2f"
+
 #: src/modules/conf_desks/e_mod_main.c:35
 msgid "Virtual Desktops"
 msgstr "Desktop virtuali"
@@ -3838,8 +3991,8 @@ msgstr "Impostazioni finestre di dialogo"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -4012,23 +4165,23 @@ msgstr "L'attuale server grafico non ha<br>le estensioni DPMS."
 msgid "Display Power Management Settings"
 msgstr "Impostazioni gestione energetica dello schermo"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
 msgid "Enable Display Power Management"
 msgstr "Abilita gestione energetica dello schermo"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
 msgstr "Timer"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "Standby"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "Sospensione"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "Spegnimento"
 
@@ -4049,30 +4202,30 @@ 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:"
 msgstr ""
-"Selezionare un confine 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>Per cambiare il ritardo di questa<br>azione usare il "
+"cursore:"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
 msgid "Edge Binding Settings"
-msgstr "Configurazione associazioni ai confini dello schermo"
+msgstr "Configurazione azioni sui bordi dello schermo"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
-msgstr "Associazioni ai confini dello schermo"
+msgstr "Bordi dello schermo"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
 msgid "Add Edge"
-msgstr "Aggiungi confine"
+msgstr "Aggiungi bordo"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
 msgid "Delete Edge"
-msgstr "Elimina confine"
+msgstr "Elimina bordo"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
 msgid "Modify Edge"
-msgstr "Modifica confine"
+msgstr "Modifica bordo"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
@@ -4103,11 +4256,11 @@ msgstr "Opzioni generali"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
 msgid "Allow binding activation with fullscreen windows"
-msgstr "Consenti associazioni al confine con finestre a tutto schermo"
+msgstr "Consenti azioni con finestre a tutto schermo"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
 msgid "Edge Binding Sequence"
-msgstr "Associazione al confine dello schermo"
+msgstr "Sequenza bordo dello schermo"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
 #, c-format
@@ -4116,7 +4269,7 @@ msgstr "%.2f secondi"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
 msgid "Binding Edge Error"
-msgstr "Errore associazione al confine"
+msgstr "Errore azione sul bordo"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
 #, c-format
@@ -4124,8 +4277,8 @@ 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 ""
-"L'associazione al confine dello schermo che avete scelto è già<br>usata "
-"dall'azione <hilight>%s</hilight>.<br>Si prega di scegliere un'associazione "
+"La sequenza sul bordo dello schermo che avete scelto è già<br>usata "
+"dall'azione <hilight>%s</hilight>.<br>Si prega di scegliere una sequenza "
 "diversa."
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
@@ -4609,7 +4762,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pixel"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr "Soglia per applicazione moto residuo"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4830,9 +4983,9 @@ msgid "Select an Edj File"
 msgstr "Seleziona file edj"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
-msgstr "File e directory"
+msgstr "File"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:7
 msgid ""
@@ -5176,55 +5329,50 @@ msgstr "Massimo"
 msgid "Scaling"
 msgstr "Scalatura"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Impostazioni screensaver"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 "Abilita screensaver di X"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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 "Timer dello screensaver"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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 "Tempo per l'avvio dello screensaver"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
 msgstr "Tempo per il cambio dello screensaver"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f secondi"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "Oscuramento"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Preferito"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "Non preferito"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr "Eventi di esposizione"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Consenti"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "Non consentire"
 
@@ -5237,7 +5385,7 @@ msgid "Configured Shelves"
 msgstr "Mensole configurate"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 msgid "Setup"
 msgstr "Configurazione"
 
@@ -5283,10 +5431,6 @@ msgstr "Categorie dei temi"
 msgid "Assign"
 msgstr "Assegna"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "Pulisci"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "Pulisci tutto"
@@ -5649,7 +5793,7 @@ msgstr "Cambio del fuoco"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:185
 msgid "Click to focus"
-msgstr "Il fuoco segue i click del mouse"
+msgstr "Il fuoco segue i clic del mouse"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:187
 msgid "Pointer focus"
@@ -5685,15 +5829,15 @@ msgstr "Altre impostazioni"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:206
 msgid "Always pass on caught click events to programs"
-msgstr "Passa sempre gli eventi click ai programmi"
+msgstr "Passa sempre gli eventi clic ai programmi"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:208
 msgid "A click on a window always raises it"
-msgstr "Un click sulla finestra la eleva sempre"
+msgstr "Un clic sulla finestra la eleva sempre"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:210
 msgid "A click in a window always focuses it"
-msgstr "Un click sulla finestra le dà sempre il fuoco"
+msgstr "Un clic sulla finestra le dà sempre il fuoco"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:212
 msgid "Refocus last focused window on desktop switch"
@@ -5731,7 +5875,7 @@ msgstr "Resistenza tra finestre:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:140
 msgid "Resistance at the edge of the screen:"
-msgstr "Resistenza al confine dello schermo:"
+msgstr "Resistenza al bordo dello schermo:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:148
 msgid "Resistance to desktop gadgets:"
@@ -6142,27 +6286,19 @@ msgstr "Dropshadow"
 msgid "Run Command Dialog"
 msgstr "Lanciacomandi"
 
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount error"
-msgstr "Errore di montaggio"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr "Il montaggio del dispositivo è fallito"
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
-msgstr "Inizio"
+msgstr "Home"
 
-#: src/modules/fileman/e_mod_main.c:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
 msgstr "Preferiti"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
-msgstr "Radice"
+msgstr "Directory principale"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -6182,7 +6318,7 @@ msgstr ""
 "nuove funzionalità.<br>Adesso è possibile riconfigurare le cose a proprio "
 "piacimento.<br>Ci scusiamo per il disagio.<br>"
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -6199,92 +6335,100 @@ msgstr ""
 "configurazione è<br>stata ripristinata a scopo precauzionale ai valori "
 "predefiniti. Ci<br>scusiamo per l'inconveniente.<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
 msgstr "Impostazioni di Fileman aggiornate"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr "Impostazioni di Fileman"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Dimensione icona"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
 msgstr "Visualizzazione"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr "Apri directory nella stessa finestra"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "Ordina con directory in testa"
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 msgid "Case Sensitive"
 msgstr "Sensibile a maiuscole/minuscole"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
-msgstr "Usa click singolo"
+msgstr "Usa clic singolo"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr "Usa modificatori selezione alternativi"
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr "Mostra estensione icone"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "Mostra percorso completo"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr "Mostra icone sul desktop"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr "Mostra barra strumenti"
 
-#: src/modules/fileman/e_mod_config.c:257
-msgid "Show HAL icons on desktop"
-msgstr "Mostra icone di HAL su tutti i desktop"
-
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: src/modules/fileman/e_fwin.c:1187
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr "Mostra icone di HAL su tutti i desktop"
+
+#: src/modules/fileman/e_mod_config.c:273
+msgid "Mount volumes on insert"
+msgstr "Monta volumi all'inserimento"
+
+#: src/modules/fileman/e_mod_config.c:276
+msgid "Open filemanager on mount"
+msgstr "Apri filemanager al montaggio"
+
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr "Directory superiore"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 msgid "Other application..."
 msgstr "Altre applicazioni..."
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Apri"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Apri con..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 msgid "Known Applications"
 msgstr "Applicazioni conosciute"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Applicazioni specifiche"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr "Comando personalizzato"
 
@@ -6373,39 +6517,39 @@ msgstr "Finestra precedente"
 msgid "Select a window"
 msgstr "Seleziona una finestra"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
 msgstr "Impostazioni di IBar"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Fonte delle icone"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Etichette icone"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Mostra etichette icone"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "Mostra nome"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "Mostra commento"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "Mostra descrizione"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "Crea nuova sorgente per Ibar"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "Inserire nome per la nuova sorgente:"
 
@@ -6422,27 +6566,27 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Siete sicuri di voler rimuovere questa sorgente per Ibar?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Cambia proprietà dell'icona"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Elimina icona"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr "Aggiungi icona"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr "Crea nuova icona"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Aggiungi applicazione"
 
@@ -6494,89 +6638,89 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr "Impostazioni di Pager"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 msgid "Flip desktop on mouse wheel"
 msgstr "Cambia desktop con la rotella del mouse"
 
-#: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:164
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 msgid "Show desktop names"
 msgstr "Mostra nomi dei desktop"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr "Impostazioni del popup"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr "Mostra popup al cambio di desktop"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr "Mostra popup con finestre urgenti"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr "Selezione e trasferimento"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "Clicca per impostare"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr "Bottone per trascinamento e rilascio"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr "Trascina l'intero desktop"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr "Altezza popup da tastiera"
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "Resistenza al trascinamento"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr "Altezza del pager"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr "Velocità del popup"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f secondi"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr "Impostazioni finestre urgenti"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr "Mostra popup con finestre urgenti"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Appicica popup sullo schermo con finestre urgenti"
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr "Cattura bottone"
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6584,11 +6728,11 @@ msgstr ""
 "Premere un pulsante del mouse,<br><br>o <hilight>Escape</hilight> per "
 "abortire"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr "Attenzione"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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 "
@@ -6598,29 +6742,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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Bottone %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr "Mostra popup del pager"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr "Popup del desktop a destra"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr "Popup del desktop a sinistra"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr "Popup del desktop sopra"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr "Popup del desktop sotto"
 
@@ -6836,7 +6980,7 @@ msgstr "Riproduzione"
 
 #: src/modules/mixer/app_mixer.c:289
 msgid "Output"
-msgstr "Uscita"
+msgstr "Output"
 
 #: src/modules/mixer/app_mixer.c:363
 msgid "Cards"
@@ -6866,7 +7010,7 @@ msgstr "Sinistro:"
 msgid "Right:"
 msgstr "Destro:"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr "Muto"
 
@@ -6906,11 +7050,11 @@ msgstr "Impostazioni del modulo Mixer"
 msgid "Mixer Settings Updated"
 msgstr "Impostazioni di Mixer aggiornate"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
 msgstr "Controlli"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6947,6 +7091,19 @@ msgstr "Dispositivo specifico"
 msgid "Networks"
 msgstr "Reti"
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr "Esiste un'altro vassoio di sistema"
+
+#: src/modules/systray/e_mod_main.c:872
+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."
+
+#: src/modules/systray/e_mod_main.c:1070
+msgid "Systray"
+msgstr "Vassoio di sistema"
+
 #~ msgid "Wallpaper 2"
 #~ msgstr "Sfondo 2"
 
@@ -6958,3 +7115,6 @@ msgstr "Reti"
 
 #~ msgid "Add Online"
 #~ msgstr "Aggiungi online..."
+
+#~ msgid "Run Everything Dialog"
+#~ msgstr "Finestra lancia applicazioni"
diff --git a/po/ja.gmo b/po/ja.gmo
index 81debad..6098dd8 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index e9f6496..256b3ef 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-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\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,20 +19,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Enlightenment について"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -69,391 +69,393 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "本当にこのウィンドウを強制終了しますか"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "はい"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "いいえ"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "本当に終了しますか"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Enlightenment を終了しようとしています.<br><br>本当に終了しますか."
 
-#: src/bin/e_actions.c:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "本当にログアウトしますか"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "本当にシャットダウンしますか"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "本当に再起動しますか"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 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:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "サスペンドしようとしています.<br><br>本当にサスペンドしますか"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "本当にハイバネートしますか"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 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:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "ウィンドウ: 動作"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "移動"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "サイズ変更"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "メニュー"
 
 #
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "ウィンドウメニュー"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "上げる"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "下げる"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "強制終了"
 
 #
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "ウィンドウ: 状態"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "常時表示モード反転"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "アイコンモード反転"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "全画面モード反転"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "最大化"
 
 #
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "垂直に最大化"
 
 #
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "水平に最大化"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "全面表示"
 
 #
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "最大化モード \"賢く\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "最大化モード \"拡大\""
 
 #
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "最大化モード \"空きまで"
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "上方シェード反転"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "下方シェード反転"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "左方シェード反転"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "右方シェード反転"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "シェード状態反転"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "ボーダー無し状態反転"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "位置固定状態反転"
 
 #
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "デスクトップ"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "左のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "右のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "上のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "下のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "デスクトップを指定分移動する"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "デスクトップ背景を出す"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
 msgstr "シェルフを出す"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "指定のデスクトップへ移動する..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "デスクトップを順に移動する..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "デスクトップ 0 に切り替える"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "デスクトップ 1 に切り替える"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "デスクトップ 2 に切り替える"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "デスクトップ 3 に切り替える"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "デスクトップ 4 に切り替える"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "デスクトップ 5 に切り替える"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "デスクトップ 6 に切り替える"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "デスクトップ 7 に切り替える"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "デスクトップ 8 に切り替える"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "デスクトップ 9 に切り替える"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "デスクトップ 10 に切り替える"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "デスクトップ 11 に切り替える"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "指定のデスクトップに切り替える"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
 msgstr "左のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr "右のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
 msgstr "上のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
 msgstr "下のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr "デスクトップを指定分移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr "指定のデスクトップへ移動する...(全スクリーン)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "デスクトップを順に移動する...(全スクリーン)"
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "指定のデスクトップへ移動する..."
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "デスクトップ 0 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "デスクトップ 1 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "デスクトップ 2 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "デスクトップ 3 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "デスクトップ 4 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "デスクトップ 5 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "デスクトップ 6 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "デスクトップ 7 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "デスクトップ 8 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "デスクトップ 9 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "デスクトップ 10 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "デスクトップ 11 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
 msgstr "指定のデスクトップに切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -463,103 +465,118 @@ msgstr "指定のデスクトップに切り替える(全スクリーン)"
 msgid "Screen"
 msgstr "画面"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "マウスをスクリーン 0 へ移す"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "マウスをスクリーン 1 へ移す"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "マウスを指定のスクリーンへ移す..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "マウスを次のスクリーンへ移す"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "マウスを前のスクリーンへ戻す"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "マウスを指定のスクリーン分だけ前後に移す..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "ウィンドウ: 移動"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "次のデスクトップへ"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "前のデスクトップへ"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "指定分のデスクトップを移動"
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "指定のデスクトップへ..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "メインメニューを表示する"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "お気に入りメニューを表示する"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "全アプリケーションメニューを表示する"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "クライアントメニューを表示する"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "指定のメニューを表示する..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "コマンド"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "アプリケーション"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "再起動"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "終了"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 #, fuzzy
 msgid "Exit Now"
 msgstr "終了"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment %s モジュール"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "全画面モード反転"
+
+#: src/bin/e_actions.c:2813
+#, 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -572,58 +589,58 @@ msgstr "終了"
 msgid "System"
 msgstr "システム"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "ログアウト"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "再起動"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "サスペンド"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "ハイバネート"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 #, fuzzy
 msgid "Lock"
 msgstr "ロック"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "ウィンドウ整頓"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr "一般: 動作"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
 msgstr "遅延動作"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "背景に設定する"
 
 #
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "desktop ファイルスキャン完了"
 
 #
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "desktop ファイルスキャン"
 
@@ -632,13 +649,14 @@ msgstr "desktop ファイルスキャン"
 msgid "Color Selector"
 msgstr "プロファイルの選択"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -653,7 +671,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -665,7 +683,7 @@ msgstr "了解"
 msgid "Cancel"
 msgstr "取消"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 "
@@ -682,7 +700,7 @@ msgstr ""
 "いデフォルト設定<br>を追加すれば更新されます. これで好きなように設定できます."
 "ちょっと面倒ですが, <br>よろしくお願いします.<br>"
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -696,11 +714,11 @@ msgstr ""
 "<br>これではまずいので, 念のためデフォルトの設定に置き換えました.<br>ご不便を"
 "おかけしますが, よろしくお願いします.<br>"
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
 msgstr "設定が更新されました"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -712,7 +730,7 @@ msgstr ""
 "ルです.<br>%s<br><br>壊れたデータが使われないように, このファイルは削除されま"
 "した.<br>"
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -727,7 +745,7 @@ msgstr ""
 "のは以下のファイルです.<br>%s<br><br>壊れたデータが使われないように, このファ"
 "イルは削除されました.<br>"
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -740,7 +758,7 @@ msgstr ""
 "時に処理していたのは以下のファイルです.<br>%s<br><br>壊れたデータが使われない"
 "ように, このファイルは削除されました.<br>"
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -753,7 +771,7 @@ msgstr ""
 "ていたのは以下のファイルです.<br>%s<br><br>壊れたデータが使われないように, こ"
 "のファイルは削除されました.<br>"
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -764,11 +782,11 @@ msgstr ""
 "ん.<br><br>エラー発生時に処理していたのは以下のファイルです.<br>%s<br><br>壊"
 "れたデータが使われないように, このファイルは削除されました.<br>"
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment の設定書込時の問題"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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,7 +812,7 @@ 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "拡張機能"
 
@@ -803,21 +821,21 @@ msgstr "拡張機能"
 msgid "Container %d"
 msgstr "コンテナ %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "エラー - PAMがサポートされていません"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "EnlightenmentにPAMサポートが組み込まれていないため, デスクロックは無効です."
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "ロックに失敗しました."
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -825,15 +843,15 @@ msgstr ""
 "キーボードかマウス, またはその両方を掴んで離さないアプリケーションがあるため,"
 "<br>デスクトップをロックできませんでした."
 
-#: src/bin/e_desklock.c:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "ロック解除パスワードを入力して下さい"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "認証システムエラー"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -844,6 +862,25 @@ msgstr ""
 "コードは <hilight>%i</hilight> です.<br>これはまずいですね. 起きてはいけない"
 "ことです. ぜひバグ報告して下さい."
 
+#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "ウィンドウプロパティが不完全です"
@@ -945,23 +982,23 @@ msgstr "アイコンを選択する"
 msgid "Select an Executable"
 msgstr "プログラムの選択"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "削除"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "カット"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "コピー"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "貼り付け"
 
@@ -996,265 +1033,320 @@ msgstr ""
 "Enlightenment で以下のアプリケーションが実行できませんでした.<br><br>%"
 "s<br><br>このアプリケーションの起動に失敗しました."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "アプリケーション実行エラー"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s が突然停止しました"
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "%2$s から終了コード %1$i が返りました"
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s に割り込みシグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s に Quit シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s に Abort シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s に浮動小数点エラーによる割り込みが入りました"
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s に割り込み不能 kill シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s にセグメンテーションフォールトによる割り込みが入りました"
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s に Broken Pipe による割り込みが入りました"
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s に終了シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s にバスエラーによる割り込みが入りました"
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s にシグナル番号 %i の割り込みが入りました"
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***残りは切り捨てられました. 出力を保存してから参照してください.***\n"
 
 #
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "エラーログ"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "エラーメッセージはありませんでした"
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "このメッセージを保存する"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "このエラーログは %s/%s.log に保存されます"
 
-#: src/bin/e_exec.c:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "エラー情報"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "エラーシグナル情報"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "出力データ"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "出力はありませんでした"
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr "存在しないパス"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s が存在しません"
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "実行エラー"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "実行エラー"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "エラー"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "ファイル数 %i"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 #, fuzzy
 msgid "Link"
 msgstr "定速で動かす"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr "中止"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "インタラクションの設定"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "表示モード"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "内容を更新する"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "隠しファイルを表示する"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "順序をを記憶する"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "ただちにソートする"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "新しいディレクトリ"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "名前変更"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "ミュート"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
 msgstr "デフォルトを使う"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "グリッドアイコン"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "カスタムアイコン"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "リスト"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "アイコンサイズ (%d)"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "背景に設定する"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "シェルフの中身の設定"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "解除"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "ディレクトリを新規作成する"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "新しいディレクトリ名"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "名前を %s から変更:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "ファイル名を変更する"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr "再実行"
 
 #
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "エラー"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr "すべて拒否"
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr "すべて了承"
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "起動中"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "以下が削除できません.<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr "これを無視"
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr "すべて無視"
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "操作中にエラーが起きました.<br>%s"
 
 #
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "削除確認"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "以下を本当に削除しますか.<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1315,8 +1407,8 @@ msgid "Preview"
 msgstr "プレビュー"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "デフォルト"
 
@@ -1325,7 +1417,7 @@ msgid "Thumbnail"
 msgstr "サムネイル"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "ユーザー指定"
 
@@ -1341,70 +1433,70 @@ msgstr "リンク情報"
 msgid "Select an Image"
 msgstr "画像を選択する"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr "未知のボリュームです"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "着脱可能媒体"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "普通"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "埋め込む"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "外観"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "自動的にスクロールする"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "大きさを変える"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "このガジェットの移動/大きさ変更を始める"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "このガジェットを削除する"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "このガジェットの移動/大きさ変更を終了する"
 
@@ -1457,8 +1549,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1466,7 +1558,7 @@ msgstr "サイズ"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
 #: src/bin/e_int_border_menu.c:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "積み重ね順"
 
@@ -1652,12 +1744,12 @@ msgstr "全面表示"
 msgid "Window List"
 msgstr "ウィンドウリスト"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "ページャ"
 
@@ -1932,11 +2024,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr "設定"
 
@@ -1971,8 +2063,8 @@ msgstr "ロード済みモジュール"
 msgid "Unload Module"
 msgstr "モジュールをアンロードする"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2002,12 +2094,12 @@ msgstr "使用中のガジェット"
 msgid "Remove Gadget"
 msgstr "ガジェットを削除する"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: 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:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "配置"
 
@@ -2093,122 +2185,122 @@ msgstr "(ウインドウ無し)"
 msgid "No name!!"
 msgstr "名前無し"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(シェルフ無し)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "シェルフ #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "シェルフを追加する"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "シェルフを削除する"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "シェルフの設定"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "とても小さい"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "普通"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "大"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "極めて大きい"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "シェルフの中身の設定"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "常に一番上"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "ウィンドウの下"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "常に一番下"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "ウィンドウがこのシェルフと重なることを許可する"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "中身の大きさに合わせて縮小する"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f px"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "スタイル"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "自動隠蔽"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "シェルフを自動的に隠す"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "マウスが乗ったら出す"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "マウスをクリックしたら出す"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "指定時間後に隠蔽開始"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f 秒"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "隠蔽に要する時間"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "全デスクトップに表示する"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "指定のデスクトップに表示する"
 
@@ -2596,7 +2688,8 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment で dnd システムが準備できません."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+#, fuzzy
+msgid "Setup Grab Input Handling"
 msgstr "入力グラブ処理システムを準備中"
 
 #: src/bin/e_main.c:872
@@ -2778,30 +2871,37 @@ msgstr "Enlightenment %s モジュール"
 msgid "Would you like to unload this module?<br>"
 msgstr "このモジュールをアンロードしますか?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 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:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "搭載ガジェットの位置と大きさの変更を終了する"
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "搭載ガジェットの位置と大きさの変更を始める"
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "シェルフの中身の設定"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "このシェルフを削除する"
 
@@ -2971,7 +3071,7 @@ msgstr "このテーマについて"
 msgid "Set As Theme"
 msgstr "テーマに設定する"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "ツールバーの内容"
@@ -2990,67 +3090,67 @@ msgstr ""
 "ンドウを閉じるか寿命のロックを解除するまで Enlightenment は<br>終了できませ"
 "ん.<br>"
 
-#: src/bin/e_utils.c:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f B"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "未来"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "直前"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li 年前"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li ヶ月前"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li 週間前"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li 日前"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li 時間前"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li 分前"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3062,7 +3162,7 @@ msgstr "不明"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "追加"
 
@@ -3085,7 +3185,7 @@ msgid "Add to Favorites"
 msgstr "お気に入りに追加する"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3205,6 +3305,7 @@ msgid "Internal"
 msgstr "内部"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
@@ -3217,25 +3318,25 @@ msgstr ""
 msgid "Battery"
 msgstr "バッテリ"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr "バッテリ容量低下!"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr "AC 電源を使ってください."
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr "不可"
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr "エラー"
 
 #
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr "バッテリメーター"
 
@@ -3244,10 +3345,25 @@ msgid "Clock"
 msgstr "時計"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
 msgstr "設定パネル"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "デスクの設定"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "オフ時間"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+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"
@@ -3270,7 +3386,7 @@ msgid "Restart Applications"
 msgstr "再起動アプリケーション"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "全アプリケーション"
 
@@ -3632,41 +3748,54 @@ msgstr "選択"
 msgid "Desk"
 msgstr "デスク"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "スクリーンロックの設定"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "自動ロック"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 msgid "Lock when Enlightenment starts"
 msgstr "Enlightenment 起動時にロックする"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: 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:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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:240
+#: 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
@@ -3678,27 +3807,27 @@ msgid "Personal"
 msgstr "ユーザー"
 
 #
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "ログインボックスの設定"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: 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:337
+#: 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:341
+#: 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:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3707,29 +3836,49 @@ msgstr "以下のスクリーンゾーンに表示する :"
 #: 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/fileman/e_mod_config.c:220
+#: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "壁紙モード"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "テーマの壁紙"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+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:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "カスタムスクリーンロックを使う"
 
@@ -3737,59 +3886,74 @@ msgstr "カスタムスクリーンロックを使う"
 msgid "Screen Lock"
 msgstr "スクリーンロック"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "仮想デスクトップの設定"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "デスクトップ数"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "デスクトップの切り替えに特殊効果をつける"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "デスクトップ"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: 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:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "切り替えの特殊効果"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "無効"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "パン"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "ズーム"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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
+#, fuzzy
+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 "仮想デスクトップ"
@@ -3805,8 +3969,8 @@ msgstr "設定ダイアログの設定"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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 "一般設定"
@@ -3976,23 +4140,23 @@ msgstr "現在のディスプレイサーバーには DPMS 拡張機能があり
 msgid "Display Power Management Settings"
 msgstr "ディスプレイ電源管理の設定"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: 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:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
 msgstr "タイマー"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "スタンバイ時間"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "サスペンド時間"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "オフ時間"
 
@@ -4579,7 +4743,8 @@ msgid "%1.0f pixels"
 msgstr "%1.0f px"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+#, fuzzy
+msgid "Threshold for applying drag momentum"
 msgstr "ドラッグ量の適用しきい値"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4800,7 +4965,7 @@ msgid "Select an Edj File"
 msgstr "Edj ファイルを選択する"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "ファイル"
 
@@ -5149,55 +5314,50 @@ msgstr "最大"
 msgid "Scaling"
 msgstr "スケール調整"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "スクリーンセーバーの設定"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 スクリーンセーバーを有効にする"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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:168
+#: 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:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f 秒"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "ブランキング"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "欲しい"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "要らない"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr "エクスポージャイベント"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "許可する"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "許可しない"
 
@@ -5210,7 +5370,7 @@ msgid "Configured Shelves"
 msgstr "利用可能なシェルフ"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "ファイルマネージャを準備中"
@@ -5256,10 +5416,6 @@ msgstr "テーマのカテゴリ"
 msgid "Assign"
 msgstr "設定"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "解除"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "全解除"
@@ -6117,29 +6273,20 @@ msgstr "ドロップシャドウ"
 msgid "Run Command Dialog"
 msgstr "コマンド実行ダイアログ"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "実行エラー"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: 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:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
 msgstr "お気に入り"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 #, fuzzy
 msgid "Root"
 msgstr "再起動"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -6160,7 +6307,7 @@ msgstr ""
 "これで好きなように設定できます.<br>\n"
 "ちょっと面倒ですがよろしくお願いします.<br>"
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -6179,95 +6326,103 @@ msgstr ""
 "これではまずいので, 念のためデフォルトの設定に置き換えました.<br>\n"
 "ご不便をおかけしますが, よろしくお願いします.<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
 msgstr "ファイルマネージャの設定が更新されました"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr "ファイルマネージャの設定"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "アイコンサイズ"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
 msgstr "閲覧"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr "開くウィンドウは変えない"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "初めにディレクトリをソートする"
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "ベースサイズ"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "シングルクリックで開く"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr "拡張子を表示する"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "完全パス名を表示する"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr "デスクトップにアイコンを表示する"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr "ツールバーを表示する"
 
-#: src/modules/fileman/e_mod_config.c:257
-msgid "Show HAL icons on desktop"
-msgstr "HAL アイコンをデスクトップに表示する"
-
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
 msgstr "動作"
 
-#: src/modules/fileman/e_fwin.c:1187
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr "HAL アイコンをデスクトップに表示する"
+
+#: 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:1462
 msgid "Go to Parent Directory"
 msgstr "上のディレクトリへ移動"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "アプリケーションの追加..."
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "開く"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "開くツール..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "アプリケーション"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "アプリケーション"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr "コマンド実行"
 
@@ -6358,39 +6513,39 @@ msgstr "前のウィンドウ"
 msgid "Select a window"
 msgstr "ウィンドウの選択"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
 msgstr "IBarの設定"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Bar ソースの選択"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "アイコンラベル"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "アイコンのラベルを表示する"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "アプリケーション名を表示する"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "アプリケーションコメントを表示する"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "アプリケーション一般情報を表示する"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "新しい IBar を作成する"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "新しい IBar の名前を入力して下さい."
 
@@ -6406,27 +6561,27 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "この IBar を本当に削除しますか."
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "アイコンのプロパティを変える"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "アイコンを削除する"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr "アイコンを追加する"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr "新しいアイコンを作る"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "アプリケーションを追加する"
 
@@ -6479,89 +6634,89 @@ msgstr ""
 msgid "Pager Settings"
 msgstr "ページャー設定"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: 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:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr "ポップアップ設定"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr "デスクトップ変更時にポップアップを表示する"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr "緊急ウィンドウにはポップアップを表示"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr "選択 / スライド"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "クリックで設定"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr "ドラッグ&ドロップ"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr "デスクトップ全体をドラッグ"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr "キーアクション・ポップアップの高さ"
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "ドラッグ抵抗値"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr "ポップアップするページャーの高さ"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr "ポップアップの速度"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f 秒"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr "緊急ウィンドウの設定"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr "緊急ウィンドウでポップアップを表示する"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr "緊急ウィンドウのポップアップを常時表示にする"
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr "ページャーボタンのグラブ"
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6570,11 +6725,11 @@ msgstr ""
 "hilight> キーを押してください.<br>リセットするときは <hilight>Del</hilight> "
 "キーを押してください."
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr "注意"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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 "
@@ -6583,29 +6738,29 @@ msgstr ""
 "マウスの右ボタンは使用できません.<br>すでに内部コードでコンテキストメニュー用"
 "に確保されています.<br>このボタンはポップアップでしか使えません."
 
-#: src/modules/pager/e_mod_config.c:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "ボタン %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr "ページャーのポップアップを表示する"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr "右のデスクトップへ移動する"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr "左のデスクトップへ移動する"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr "上のデスクトップへ移動する"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr "下のデスクトップへ移動する"
 
@@ -6854,7 +7009,7 @@ msgstr "左:"
 msgid "Right:"
 msgstr "右:"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr "ミュート"
 
@@ -6894,12 +7049,12 @@ msgstr "ミキサーモジュールの設定"
 msgid "Mixer Settings Updated"
 msgstr "ミキサーの設定を更新しました"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 #, fuzzy
 msgid "Controls"
 msgstr "システムコントロール"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6935,6 +7090,19 @@ msgstr "その他デバイス"
 msgid "Networks"
 msgstr "ネットワーク"
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "システム"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "仮想デスクトップを設定する"
 
diff --git a/po/ko.gmo b/po/ko.gmo
index 5a56681..2805193 100644
Binary files a/po/ko.gmo and b/po/ko.gmo differ
diff --git a/po/ko.po b/po/ko.po
index a4b6f05..3c6ba60 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2007-04-29 23:06+0200\n"
 "Last-Translator: Michael Kim <lavnrose at gmail.com>\n"
 "Language-Team: Korean <KO at li.org>\n"
@@ -19,20 +19,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Enlightenment에 대하여"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -75,403 +75,405 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "이 창을 강제종료 하시겠습니까?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "예"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "아니오"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "정말 종료 하시겠습니까?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Enlightenment 종료를 실행 했습니다.<br><br>정말 종료 하시겠습니까?"
 
-#: src/bin/e_actions.c:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "정말 로그아웃 하시겠습니까?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "정말 시스템을 종료 하시겠습니까?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "정말 리붓 하시겠습니까?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 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:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "정말 대기 모드로 전환 하시겠습니까?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "창 : 움직임"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "이동"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "크기변경"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "메뉴"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "창 메뉴"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "말아올림"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "아래로"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "강제종료"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "창 : 상태"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "고정 상태"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "아이콘 상태"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "전체화면 상태"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "최대화"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "높이 최대화"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "넓이 최대화"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "전체화면"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "최대화 상태 \"일반\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "최대화 상태 \"확장\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "최대화 상태 \"채우기\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "데스크탑"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "왼쪽으로 이동"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "오른쪽으로 이동"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "위로 이동"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "아래로 이동"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "데스크탑 표시"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "데스크탑 표시"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "데스크탑 0 으로 변경"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "데스크탑 1로 변경"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "데스크탑 2로 변경"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "데스크탑 3으로 변경"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "데스크탑 4로 변경"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "데스크탑 5로 변경"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "데스크탑 6으로 변경"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "데스크탑 7로 변경"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "데스크탑 8로 변경"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "데스크탑 9로 변경"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "데스크탑 10으로 변경"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "데스크탑 11로 변경"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "데스크탑 변경..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "왼쪽으로 이동"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "오른쪽으로 이동"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "위로 이동"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "아래로 이동"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "아래로 이동"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "아래로 이동"
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "데스크탑 0 으로 변경"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "데스크탑 1로 변경"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "데스크탑 2로 변경"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "데스크탑 3으로 변경"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "데스크탑 4로 변경"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "데스크탑 5로 변경"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "데스크탑 6으로 변경"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "데스크탑 7로 변경"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "데스크탑 8로 변경"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "데스크탑 9로 변경"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "데스크탑 10으로 변경"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "데스크탑 11로 변경"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "데스크탑 변경..."
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -481,103 +483,118 @@ msgstr "데스크탑 변경..."
 msgid "Screen"
 msgstr "화면"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "마우스를 화면 0 으로"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "마우스를 화면 1로"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "마우스를 화면으로 보내기"
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "마우스를 앞의 화면으로 보내기"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "마우스를 뒤의 화면으로 보내기"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "마우스 앞/뒤 화면으로 보내기..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "창 : 이동"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "다음 데스크탑으로"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "이전 데스크탑으로"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "데스크탑으로..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "메인 메뉴 표시"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "즐겨찾기 메뉴 표시"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "모든 응용프로그램 메뉴 표시"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "클라이언트 메뉴 표시"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "메뉴 표시..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "명령"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "응용프로그램"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "재 시작"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "종료"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 #, fuzzy
 msgid "Exit Now"
 msgstr "종료"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment %s 모듈"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "전체화면 상태"
+
+#: src/bin/e_actions.c:2813
+#, 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -590,60 +607,60 @@ msgstr "종료"
 msgid "System"
 msgstr "시스템"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "로그아웃"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "재기동"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "대기모드"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "하이버네이션"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 #, fuzzy
 msgid "Lock"
 msgstr "고정"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "창 정리"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "창 : 움직임"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Delayed Action"
 msgstr "모듈 상태"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 #, fuzzy
 msgid "Set As Background"
 msgstr "배경"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 #, fuzzy
 msgid "Desktop files scan done"
 msgstr "데스크탑 이름"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "데스크탑 이름"
@@ -653,13 +670,14 @@ msgstr "데스크탑 이름"
 msgid "Color Selector"
 msgstr "테마 선택기"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -674,7 +692,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -686,7 +704,7 @@ msgstr "확인"
 msgid "Cancel"
 msgstr "취소"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 +715,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 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,12 +724,12 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "데스크탑 설정"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -719,7 +737,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -729,7 +747,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -738,7 +756,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -747,7 +765,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -755,12 +773,12 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment 설정 저장중 문제가 발생 했습니다"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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,7 +804,7 @@ 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "확장"
 
@@ -795,34 +813,34 @@ msgstr "확장"
 msgid "Container %d"
 msgstr ""
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -830,6 +848,25 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
+#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr ""
@@ -931,24 +968,24 @@ msgstr "아이콘 선택"
 msgid "Select an Executable"
 msgstr "이미지 선택"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "삭제"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 #, fuzzy
 msgid "Cut"
 msgstr "사용자 지정"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr ""
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 #, fuzzy
 msgid "Paste"
 msgstr "빠름"
@@ -984,268 +1021,323 @@ msgstr ""
 "Enlightenment이 응용프로그램을 실행 할 수 없습니다:<br><br>%s<br><br>The 응용"
 "프로그램 시작 실패."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "오류 기록"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "오류 메세지가 없음."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "이 메세지 저장"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "오류 메세지"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "시그널 정보 오류"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "출력 데이터"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "출력물이 없음."
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "실행 오류"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "실행 오류"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "오류"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i 개의 파일"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 #, fuzzy
 msgid "Abort"
 msgstr "대하여"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "선택 설정"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 #, fuzzy
 msgid "View Mode"
 msgstr "일반 대화창"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "새로 고침"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "숨김 파일 표시"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "정렬순서 저장"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "정렬"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "새 디렉토리"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "이름 변경"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "실행 오류"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "속성"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 #, fuzzy
 msgid "Use default"
 msgstr "기본값 사용"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 #, fuzzy
 msgid "Grid Icons"
 msgstr "파일 아이콘"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 #, fuzzy
 msgid "Custom Icons"
 msgstr "사용자 지정"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 #, fuzzy
 msgid "List"
 msgstr "창 목록"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "아이콘 이름"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "배경"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "도구모음 내용"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+#, fuzzy
+msgid "Clear"
+msgstr "가깝게"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "새 디렉토리 작성"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "디렉토리 명:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "%s 이름 변경:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "이름 변경"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 #, fuzzy
 msgid "Retry"
 msgstr "재 시작"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "오류"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "%s 시작중"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "삭제 확인"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1304,8 +1396,8 @@ msgid "Preview"
 msgstr "미리보기"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "기본값"
 
@@ -1314,7 +1406,7 @@ msgid "Thumbnail"
 msgstr "미리보기"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "사용자 지정"
 
@@ -1331,70 +1423,70 @@ msgstr "오류 메세지"
 msgid "Select an Image"
 msgstr "이미지 선택"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "알수없음"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "이동식 장치"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "외관"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1445,8 +1537,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1454,7 +1546,7 @@ msgstr "크기"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
 #: src/bin/e_int_border_menu.c:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "고정상태"
 
@@ -1640,12 +1732,12 @@ msgstr "전체화면"
 msgid "Window List"
 msgstr "창 목록"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "페이저"
 
@@ -1896,11 +1988,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 #, fuzzy
 msgid "Settings"
 msgstr "데스크탑 설정"
@@ -1941,8 +2033,8 @@ msgstr "모듈"
 msgid "Unload Module"
 msgstr "모듈 읽기 오류"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1973,13 +2065,13 @@ msgstr "선택된 도구"
 msgid "Remove Gadget"
 msgstr "도구 제거"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 #, fuzzy
 msgid "Toolbar Settings"
 msgstr "이동 설정"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "레이아웃"
 
@@ -2062,126 +2154,126 @@ msgstr "(창 없음)"
 msgid "No name!!"
 msgstr "이름 없음!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Shelf 추가"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Shelf 삭제"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "도구모음 설정"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "가벼움"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "보통"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "거대함"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "도구모음 내용"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "창이 도구모음 위로 갈 수 있음"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "스타일"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 #, fuzzy
 msgid "Auto Hide"
 msgstr "자동으로 앞으로"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "도구모음 자동 숨김"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 #, fuzzy
 msgid "Show on mouse in"
 msgstr "다음 화면 영역에서 보기 #:"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, fuzzy, c-format
 msgid "%.1f seconds"
 msgstr "%1.1f 초"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 #, fuzzy
 msgid "Hide duration"
 msgstr "하이버네이션"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 #, fuzzy
 msgid "Show on all Desktops"
 msgstr "데스크탑 표시"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 #, fuzzy
 msgid "Show on specified Desktops"
 msgstr "데스크탑 표시"
@@ -2522,7 +2614,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "DND 시스템을 설정 할 수 없습니다."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2718,30 +2810,37 @@ msgstr "Enlightenment %s 모듈"
 msgid "Would you like to unload this module?<br>"
 msgstr "이 모듈을 제거 하시겠습니까?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "도구모음 내용"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr ""
 
@@ -2898,7 +2997,7 @@ msgstr "이 테마에 대하여"
 msgid "Set As Theme"
 msgstr "테마 선택..."
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "내용 설정..."
@@ -2914,67 +3013,67 @@ msgid ""
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "향후에"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "마지막 분에"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li 년전"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li 달전"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li 주전"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li 일전"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li 시간전"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li 분전"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -2986,7 +3085,7 @@ msgstr "알수없음"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "추가"
 
@@ -3010,7 +3109,7 @@ msgid "Add to Favorites"
 msgstr "즐겨찾기에 추가"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3131,6 +3230,7 @@ msgid "Internal"
 msgstr "일반"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
@@ -3142,25 +3242,25 @@ msgstr ""
 msgid "Battery"
 msgstr "밧데리"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "밧데리 전원이 낮을 경우 알림 표시"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 #, fuzzy
 msgid "Battery Meter"
 msgstr "밧데리"
@@ -3170,11 +3270,26 @@ msgid "Clock"
 msgstr "시계"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 #, fuzzy
 msgid "Settings Panel"
 msgstr "데스크탑 설정"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "데스크탑 설정"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "꺼짐 시간"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "모듈"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 #, fuzzy
@@ -3198,7 +3313,7 @@ msgid "Restart Applications"
 msgstr "응용프로그램 재시작"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "모든 응용프로그램"
 
@@ -3562,42 +3677,55 @@ msgstr "모두 삭제"
 msgid "Desk"
 msgstr "데스크탑"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "화면 잠금 설정"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "자동으로 잠금"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 #, fuzzy
 msgid "Lock when Enlightenment starts"
 msgstr "Enlightenment 커서 사용"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: 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:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+msgid "Time after screensaver activated"
+msgstr "X 화면보호기가 동작될때"
+
+#: 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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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:240
+#: 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
@@ -3608,27 +3736,27 @@ msgstr "%1.0f 분"
 msgid "Personal"
 msgstr "개인용"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "로그인 상자 설정"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: 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:337
+#: 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:341
+#: 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:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3637,29 +3765,49 @@ msgstr "다음 화면 영역에서 보기 #:"
 #: 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/fileman/e_mod_config.c:220
+#: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "바탕화면 상태"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "테마의 바탕화면"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+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:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "사용자 지정 화면 잠금 사용"
 
@@ -3667,60 +3815,75 @@ msgstr "사용자 지정 화면 잠금 사용"
 msgid "Screen Lock"
 msgstr "화면 잠금"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "가상 데스크탑 설정"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "데스크탑 갯수"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "움직이는 모양 사용"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 #, fuzzy
 msgid "Desktops"
 msgstr "데스크탑"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: 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:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "바꾸기 효과"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "끄기"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "화대"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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
+#, fuzzy
+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 "가상 데스크탑"
@@ -3737,8 +3900,8 @@ msgstr "대화창 설정"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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 "일반 설정"
@@ -3894,25 +4057,25 @@ msgstr ""
 msgid "Display Power Management Settings"
 msgstr "디스플레이 전원관리 신호 (DPMS)"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
 #, fuzzy
 msgid "Enable Display Power Management"
 msgstr "디스플레이 전원관리 신호 (DPMS)"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 #, fuzzy
 msgid "Timers"
 msgstr "DPMS 시간"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "대기 시간"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "유휴 시간"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "꺼짐 시간"
 
@@ -4500,7 +4663,7 @@ msgid "%1.0f pixels"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4721,7 +4884,7 @@ msgid "Select an Edj File"
 msgstr "Edj 파일 선택"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "파일"
 
@@ -5083,55 +5246,50 @@ msgstr "최대 크기"
 msgid "Scaling"
 msgstr "고정상태"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "화면보호기 설정"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 화면보호기 사용"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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 화면 보호기가 시작 될때 까지"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
 msgstr "X 화면보호기가 동작될때"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f 초"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "깜빡임"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "허용"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "허용 안함"
 
@@ -5144,7 +5302,7 @@ msgid "Configured Shelves"
 msgstr "설정된 도구모음"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "시작"
@@ -5191,11 +5349,6 @@ msgstr "항목"
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-#, fuzzy
-msgid "Clear"
-msgstr "가깝게"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 #, fuzzy
 msgid "Clear All"
@@ -6064,30 +6217,21 @@ msgstr ""
 msgid "Run Command Dialog"
 msgstr "명령 실행 창"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "실행 오류"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: 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:332
+#: src/modules/fileman/e_mod_main.c:322
 #, fuzzy
 msgid "Favorites"
 msgstr "즐겨찾기에 추가"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 #, fuzzy
 msgid "Root"
 msgstr "재기동"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -6098,7 +6242,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -6108,102 +6252,110 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 #, fuzzy
 msgid "Fileman Settings Updated"
 msgstr "크기 설정"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 #, fuzzy
 msgid "Fileman Settings"
 msgstr "크기 설정"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 #, fuzzy
 msgid "Icon Size"
 msgstr "아이콘 이름"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 #, fuzzy
 msgid "View"
 msgstr "일반 대화창"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "기본 크기"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 #, fuzzy
 msgid "Show Icon Extension"
 msgstr "아이콘명 표시"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 #, fuzzy
 msgid "Show Desktop Icons"
 msgstr "데스크탑 표시"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:257
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:729
+msgid "Behavior"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:270
 #, fuzzy
 msgid "Show HAL icons on desktop"
 msgstr "데스크탑 표시"
 
-#: src/modules/fileman/e_mod_config.c:261
-#: src/modules/gadman/e_mod_gadman.c:729
-msgid "Behavior"
+#: 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:1187
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr "상위 디렉토리로 이동"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "응용프로그램 추가"
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "열기"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "다른 프로그램으로 열기.."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "응용 프로그램"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "정의된 응용프로그램"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 #, fuzzy
 msgid "Custom Command"
 msgstr "명령 실행"
@@ -6304,40 +6456,40 @@ msgstr "이전 창"
 msgid "Select a window"
 msgstr "창 선택"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 #, fuzzy
 msgid "IBar Settings"
 msgstr "이동 설정"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "선택된 막대 원본"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "아이콘명"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "아이콘명 표시"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "응용프로그램 이름 표시"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "응용프로그램 주석 표시"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "응용프로그램 일반 표시"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "새 IBar 원본 만들기"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "이 원본의 이름을 입력 하십시오:"
 
@@ -6352,29 +6504,29 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "이 막대의 원본을 삭제 하시겠습니까?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "아이콘 속성 변경"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "아이콘 제거"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 #, fuzzy
 msgid "Add An Icon"
 msgstr "응용프로그램 추가"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 #, fuzzy
 msgid "Create New Icon"
 msgstr "아이콘 생성"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "응용프로그램 추가"
 
@@ -6431,146 +6583,146 @@ msgstr ""
 msgid "Pager Settings"
 msgstr "이동 설정"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 #, fuzzy
 msgid "Show desktop names"
 msgstr "데스크탑 표시"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 #, fuzzy
 msgid "Popup Settings"
 msgstr "팝업 설정"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 #, fuzzy
 msgid "Show popup on desktop change"
 msgstr "아이콘화 된 창 표시"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 #, fuzzy
 msgid "Show popup for urgent windows"
 msgstr "아이콘화 된 창 표시"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 #, fuzzy
 msgid "Select and Slide button"
 msgstr "아이콘 선택"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "클릭 후 설정"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 #, fuzzy
 msgid "Drag and Drop button"
 msgstr "끌기과 선택 단추"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 #, fuzzy
 msgid "Drag whole desktop"
 msgstr "가상 데스크탑"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 #, fuzzy
 msgid "Resistance to dragging"
 msgstr "창을 끌때 저항:"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 #, fuzzy
 msgid "Popup pager height"
 msgstr "팝업 속도"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 #, fuzzy
 msgid "Popup speed"
 msgstr "팝업 속도"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f 초"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 #, fuzzy
 msgid "Urgent Window Settings"
 msgstr "창 목록 설정"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 #, fuzzy
 msgid "Show popup on urgent window"
 msgstr "아이콘화 된 창 표시"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 #, fuzzy
 msgid "Popup on urgent window sticks on the screen"
 msgstr "다른 화면에서의 아이콘화된 창 표시"
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 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:344
+#: src/modules/pager/e_mod_config.c:343
 #, fuzzy
 msgid "Attetion"
 msgstr "동작"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "단추 %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 #, fuzzy
 msgid "Show Pager Popup"
 msgstr "팝업 설정"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "오른쪽으로 이동"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "왼쪽으로 이동"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "위로 이동"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "아래로 이동"
@@ -6838,7 +6990,7 @@ msgstr ""
 msgid "Right:"
 msgstr "밝게"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr ""
 
@@ -6884,12 +7036,12 @@ msgstr "모듈 설정"
 msgid "Mixer Settings Updated"
 msgstr "설정이 갱신됨"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 #, fuzzy
 msgid "Controls"
 msgstr "시스템"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6927,6 +7079,19 @@ msgstr "정의된 응용프로그램"
 msgid "Networks"
 msgstr ""
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "시스템"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "가상 데스크탑 설정"
 
diff --git a/po/ku.gmo b/po/ku.gmo
new file mode 100644
index 0000000..030acce
Binary files /dev/null and b/po/ku.gmo differ
diff --git a/po/ku.po b/po/ku.po
new file mode 100644
index 0000000..270e242
--- /dev/null
+++ b/po/ku.po
@@ -0,0 +1,6718 @@
+# Kurdish translation for enlightenment
+# This file is distributed under the same license as the enlightenment package.
+# Erdal Ronahi <erdal.ronahi at gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/bin/e_about.c:17
+msgid "About Enlightenment"
+msgstr ""
+
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
+#: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
+#: src/modules/conf/e_conf.c:178
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_theme/e_int_config_theme_web.c:130
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
+#: src/modules/fileman/e_fwin.c:1876 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:666
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
+#: src/modules/wizard/page_000.c:27
+msgid "Enlightenment"
+msgstr ""
+
+#: src/bin/e_about.c:26
+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 ""
+
+#: 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: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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+msgid "No"
+msgstr "Na"
+
+#: src/bin/e_actions.c:1769
+msgid "Are you sure you want to exit?"
+msgstr ""
+
+#: src/bin/e_actions.c:1771
+msgid ""
+"You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
+msgstr ""
+
+#: src/bin/e_actions.c:1867
+msgid "Are you sure you want to log out?"
+msgstr ""
+
+#: src/bin/e_actions.c:1869
+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
+msgid "Are you sure you want to turn off?"
+msgstr ""
+
+#: src/bin/e_actions.c:1933
+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
+msgid "Are you sure you want to reboot?"
+msgstr ""
+
+#: src/bin/e_actions.c:1997
+msgid ""
+"You requested to reboot your Computer.<br><br>Are you sure you want to "
+"restart it?"
+msgstr ""
+
+#: src/bin/e_actions.c:2061
+msgid ""
+"You requested to suspend your Computer.<br><br>Are you sure you want to "
+"suspend?"
+msgstr ""
+
+#: src/bin/e_actions.c:2123
+msgid "Are you sure you want to hibernate?"
+msgstr ""
+
+#: src/bin/e_actions.c:2125
+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
+msgid "Window : Actions"
+msgstr ""
+
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
+msgid "Move"
+msgstr "Guhestin"
+
+#: src/bin/e_actions.c:2470
+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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
+msgid "Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2481
+msgid "Window Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
+msgid "Raise"
+msgstr ""
+
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
+msgid "Lower"
+msgstr ""
+
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
+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
+msgid "Window : State"
+msgstr ""
+
+#: src/bin/e_actions.c:2509
+msgid "Sticky Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2516
+msgid "Iconic Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2523
+msgid "Fullscreen Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
+#: src/bin/e_int_border_menu.c:350
+msgid "Maximize"
+msgstr ""
+
+#: src/bin/e_actions.c:2532
+msgid "Maximize Vertically"
+msgstr ""
+
+#: src/bin/e_actions.c:2535
+msgid "Maximize Horizontally"
+msgstr ""
+
+#: src/bin/e_actions.c:2538
+msgid "Maximize Fullscreen"
+msgstr ""
+
+#: src/bin/e_actions.c:2540
+msgid "Maximize Mode \"Smart\""
+msgstr ""
+
+#: src/bin/e_actions.c:2542
+msgid "Maximize Mode \"Expand\""
+msgstr ""
+
+#: src/bin/e_actions.c:2544
+msgid "Maximize Mode \"Fill\""
+msgstr ""
+
+#: src/bin/e_actions.c:2551
+msgid "Shade Up Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2553
+msgid "Shade Down Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2555
+msgid "Shade Left Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2557
+msgid "Shade Right Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2559
+msgid "Shade Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2566
+msgid "Toggle Borderless State"
+msgstr ""
+
+#: src/bin/e_actions.c:2571
+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: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:687
+#: 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
+msgid "Desktop"
+msgstr "Sermase"
+
+#: src/bin/e_actions.c:2576
+msgid "Flip Desktop Left"
+msgstr ""
+
+#: src/bin/e_actions.c:2578
+msgid "Flip Desktop Right"
+msgstr ""
+
+#: src/bin/e_actions.c:2580
+msgid "Flip Desktop Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2582
+msgid "Flip Desktop Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2584
+msgid "Flip Desktop By..."
+msgstr ""
+
+#: src/bin/e_actions.c:2590
+msgid "Show The Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2595
+msgid "Show The Shelf"
+msgstr ""
+
+#: src/bin/e_actions.c:2600
+msgid "Flip Desktop To..."
+msgstr ""
+
+#: src/bin/e_actions.c:2606
+msgid "Flip Desktop Linearly..."
+msgstr ""
+
+#: src/bin/e_actions.c:2612
+msgid "Switch To Desktop 0"
+msgstr ""
+
+#: src/bin/e_actions.c:2614
+msgid "Switch To Desktop 1"
+msgstr ""
+
+#: src/bin/e_actions.c:2616
+msgid "Switch To Desktop 2"
+msgstr ""
+
+#: src/bin/e_actions.c:2618
+msgid "Switch To Desktop 3"
+msgstr ""
+
+#: src/bin/e_actions.c:2620
+msgid "Switch To Desktop 4"
+msgstr ""
+
+#: src/bin/e_actions.c:2622
+msgid "Switch To Desktop 5"
+msgstr ""
+
+#: src/bin/e_actions.c:2624
+msgid "Switch To Desktop 6"
+msgstr ""
+
+#: src/bin/e_actions.c:2626
+msgid "Switch To Desktop 7"
+msgstr ""
+
+#: src/bin/e_actions.c:2628
+msgid "Switch To Desktop 8"
+msgstr ""
+
+#: src/bin/e_actions.c:2630
+msgid "Switch To Desktop 9"
+msgstr ""
+
+#: src/bin/e_actions.c:2632
+msgid "Switch To Desktop 10"
+msgstr ""
+
+#: src/bin/e_actions.c:2634
+msgid "Switch To Desktop 11"
+msgstr ""
+
+#: src/bin/e_actions.c:2636
+msgid "Switch To Desktop..."
+msgstr ""
+
+#: src/bin/e_actions.c:2642
+msgid "Flip Desktop Left (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2644
+msgid "Flip Desktop Right (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2646
+msgid "Flip Desktop Up (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2648
+msgid "Flip Desktop Down (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2650
+msgid "Flip Desktop By... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2656
+msgid "Flip Desktop To... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2662
+msgid "Flip Desktop Linearly... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2668
+msgid "Flip Desktop In Direction..."
+msgstr ""
+
+#: src/bin/e_actions.c:2673
+msgid "Switch To Desktop 0 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2675
+msgid "Switch To Desktop 1 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2677
+msgid "Switch To Desktop 2 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2679
+msgid "Switch To Desktop 3 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2681
+msgid "Switch To Desktop 4 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2683
+msgid "Switch To Desktop 5 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2685
+msgid "Switch To Desktop 6 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2687
+msgid "Switch To Desktop 7 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2689
+msgid "Switch To Desktop 8 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2691
+msgid "Switch To Desktop 9 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2693
+msgid "Switch To Desktop 10 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2695
+msgid "Switch To Desktop 11 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2697
+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/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
+msgid "Screen"
+msgstr ""
+
+#: src/bin/e_actions.c:2704
+msgid "Send Mouse To Screen 0"
+msgstr ""
+
+#: src/bin/e_actions.c:2706
+msgid "Send Mouse To Screen 1"
+msgstr ""
+
+#: src/bin/e_actions.c:2708
+msgid "Send Mouse To Screen..."
+msgstr ""
+
+#: src/bin/e_actions.c:2713
+msgid "Send Mouse Forward 1 Screen"
+msgstr ""
+
+#: src/bin/e_actions.c:2715
+msgid "Send Mouse Back 1 Screen"
+msgstr ""
+
+#: src/bin/e_actions.c:2717
+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
+msgid "Window : Moving"
+msgstr ""
+
+#: src/bin/e_actions.c:2755
+msgid "To Next Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2757
+msgid "To Previous Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2759
+msgid "By Desktop #..."
+msgstr ""
+
+#: src/bin/e_actions.c:2765
+msgid "To Desktop..."
+msgstr ""
+
+#: src/bin/e_actions.c:2771
+msgid "Show Main Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2773
+msgid "Show Favorites Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2775
+msgid "Show All Applications Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2777
+msgid "Show Clients Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2779
+msgid "Show Menu..."
+msgstr ""
+
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
+#: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
+#: 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
+msgid "Command"
+msgstr ""
+
+#: src/bin/e_actions.c:2791
+msgid "Application"
+msgstr ""
+
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+msgid "Restart"
+msgstr ""
+
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+msgid "Exit"
+msgstr ""
+
+#: src/bin/e_actions.c:2803
+msgid "Exit Now"
+msgstr ""
+
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+msgid "Enlightenment : Mode"
+msgstr ""
+
+#: src/bin/e_actions.c:2808
+msgid "Presentation Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2813
+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_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_wallpaper/e_int_config_wallpaper.c:513
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: 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
+msgid "Log Out"
+msgstr ""
+
+#: src/bin/e_actions.c:2821
+msgid "Power Off Now"
+msgstr ""
+
+#: src/bin/e_actions.c:2825
+msgid "Power Off"
+msgstr ""
+
+#: src/bin/e_actions.c:2829
+msgid "Reboot"
+msgstr ""
+
+#: src/bin/e_actions.c:2833
+msgid "Suspend"
+msgstr ""
+
+#: src/bin/e_actions.c:2837
+msgid "Hibernate"
+msgstr ""
+
+#: src/bin/e_actions.c:2845
+msgid "Lock"
+msgstr ""
+
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+msgid "Cleanup Windows"
+msgstr ""
+
+#: src/bin/e_actions.c:2855
+msgid "Generic : Actions"
+msgstr ""
+
+#: src/bin/e_actions.c:2855
+msgid "Delayed Action"
+msgstr ""
+
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+msgid "Set As Background"
+msgstr ""
+
+#: src/bin/e_border.c:5080
+msgid "Desktop files scan done"
+msgstr ""
+
+#: src/bin/e_border.c:5092
+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:1788
+#: src/bin/e_config_dialog.c:249 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:323
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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_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/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:777
+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:8531
+#: src/bin/e_fm_prop.c:514 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_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/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:778
+msgid "Cancel"
+msgstr ""
+
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
+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:760
+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:1689
+msgid "Settings Upgraded"
+msgstr ""
+
+#: src/bin/e_config.c:1712
+#, 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:1723
+#, 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:1736
+#, 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:1747
+#, 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:1759
+#, 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:1784
+msgid "Enlightenment Settings Write Problems"
+msgstr ""
+
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
+#: 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:228
+msgid "Basic"
+msgstr ""
+
+#: src/bin/e_config_dialog.c:251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+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:197
+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:1076
+msgid "Extensions"
+msgstr ""
+
+#: src/bin/e_container.c:117
+#, c-format
+msgid "Container %d"
+msgstr ""
+
+#: src/bin/e_desklock.c:174
+msgid "Error - no PAM support"
+msgstr ""
+
+#: src/bin/e_desklock.c:175
+msgid ""
+"No PAM support was built into Enlightenment, so<br>desk locking is disabled."
+msgstr ""
+
+#: src/bin/e_desklock.c:241
+msgid "Lock Failed"
+msgstr ""
+
+#: src/bin/e_desklock.c:242
+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
+msgid "Please enter your unlock password"
+msgstr ""
+
+#: src/bin/e_desklock.c:709
+msgid "Authentication System Error"
+msgstr ""
+
+#: src/bin/e_desklock.c:710
+#, 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:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 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:400
+#: 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
+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:8031
+#: src/modules/conf_applications/e_int_config_apps.c:269
+#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: 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:7938
+msgid "Cut"
+msgstr ""
+
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
+msgid "Copy"
+msgstr ""
+
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
+msgid "Paste"
+msgstr ""
+
+#: src/bin/e_entry.c:529
+msgid "Select All"
+msgstr ""
+
+#: src/bin/e_exec.c:220 src/bin/e_utils.c:201
+#: 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:221 src/bin/e_utils.c:202
+#: 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:314
+msgid "Application run error"
+msgstr ""
+
+#: src/bin/e_exec.c:316
+#, 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:418
+msgid "Application Execution Error"
+msgstr ""
+
+#: src/bin/e_exec.c:430
+#, c-format
+msgid "%s stopped running unexpectedly."
+msgstr ""
+
+#: src/bin/e_exec.c:436
+#, c-format
+msgid "An exit code of %i was returned from %s."
+msgstr ""
+
+#: src/bin/e_exec.c:443
+#, c-format
+msgid "%s was interrupted by an Interrupt Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:445
+#, c-format
+msgid "%s was interrupted by a Quit Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:449
+#, c-format
+msgid "%s was interrupted by an Abort Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:452
+#, c-format
+msgid "%s was interrupted by a Floating Point Error."
+msgstr ""
+
+#: src/bin/e_exec.c:455
+#, c-format
+msgid "%s was interrupted by an Uninterruptable Kill Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:458
+#, c-format
+msgid "%s was interrupted by a Segmentation Fault."
+msgstr ""
+
+#: src/bin/e_exec.c:461
+#, c-format
+msgid "%s was interrupted by a Broken Pipe."
+msgstr ""
+
+#: src/bin/e_exec.c:464
+#, c-format
+msgid "%s was interrupted by a Termination Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:467
+#, c-format
+msgid "%s was interrupted by a Bus Error."
+msgstr ""
+
+#: src/bin/e_exec.c:470
+#, c-format
+msgid "%s was interrupted by the signal number %i."
+msgstr ""
+
+#: src/bin/e_exec.c:528
+msgid ""
+"***The remaining output has been truncated. Save the output to view.***\n"
+msgstr ""
+
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
+msgid "Error Logs"
+msgstr ""
+
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
+msgid "There was no error message."
+msgstr ""
+
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
+msgid "Save This Message"
+msgstr ""
+
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
+#, c-format
+msgid "This error log will be saved as %s/%s.log"
+msgstr ""
+
+#: src/bin/e_exec.c:631
+msgid "Error Information"
+msgstr ""
+
+#: src/bin/e_exec.c:639
+msgid "Error Signal Information"
+msgstr ""
+
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
+msgid "Output Data"
+msgstr ""
+
+#: src/bin/e_exec.c:657
+msgid "There was no output."
+msgstr ""
+
+#: src/bin/e_fm.c:934
+msgid "Nonexistent path"
+msgstr ""
+
+#: src/bin/e_fm.c:937
+#, c-format
+msgid "%s doesn't exist."
+msgstr ""
+
+#: src/bin/e_fm.c:3031
+msgid "Mount Error"
+msgstr ""
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+msgid "Unmount Error"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+msgid "Eject Error"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
+#, c-format
+msgid "%i Files"
+msgstr ""
+
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
+msgid "Link"
+msgstr ""
+
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
+msgid "Abort"
+msgstr ""
+
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
+msgid "Inherit parent settings"
+msgstr ""
+
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
+msgid "View Mode"
+msgstr ""
+
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
+msgid "Refresh View"
+msgstr ""
+
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
+msgid "Show Hidden Files"
+msgstr ""
+
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
+msgid "Remember Ordering"
+msgstr ""
+
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
+msgid "Sort Now"
+msgstr ""
+
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
+#: src/modules/conf_paths/e_int_config_paths.c:208
+msgid "New Directory"
+msgstr ""
+
+#: src/bin/e_fm.c:8039
+msgid "Rename"
+msgstr ""
+
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+msgid "Mount"
+msgstr ""
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
+msgid "Properties"
+msgstr ""
+
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
+msgid "Use default"
+msgstr ""
+
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
+msgid "Grid Icons"
+msgstr ""
+
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
+msgid "Custom Icons"
+msgstr ""
+
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
+msgid "List"
+msgstr ""
+
+#: src/bin/e_fm.c:8380
+#, c-format
+msgid "Icon Size (%d)"
+msgstr ""
+
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+msgid "Set background..."
+msgstr ""
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+msgid "Set overlay..."
+msgstr ""
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr ""
+
+#: src/bin/e_fm.c:8754
+msgid "Create a new Directory"
+msgstr ""
+
+#: src/bin/e_fm.c:8755
+msgid "New Directory Name:"
+msgstr ""
+
+#: src/bin/e_fm.c:8809
+#, c-format
+msgid "Rename %s to:"
+msgstr ""
+
+#: src/bin/e_fm.c:8811
+msgid "Rename File"
+msgstr ""
+
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
+msgid "Retry"
+msgstr ""
+
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
+msgid "Error"
+msgstr ""
+
+#: src/bin/e_fm.c:8957
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: src/bin/e_fm.c:9009
+msgid "No to all"
+msgstr ""
+
+#: src/bin/e_fm.c:9011
+msgid "Yes to all"
+msgstr ""
+
+#: src/bin/e_fm.c:9014
+msgid "Warning"
+msgstr ""
+
+#: src/bin/e_fm.c:9017
+#, c-format
+msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
+msgstr ""
+
+#: src/bin/e_fm.c:9089
+msgid "Ignore this"
+msgstr ""
+
+#: src/bin/e_fm.c:9090
+msgid "Ignore all"
+msgstr ""
+
+#: src/bin/e_fm.c:9095
+#, c-format
+msgid "An error occured while performing an operation.<br>%s"
+msgstr ""
+
+#: src/bin/e_fm.c:9240
+msgid "Confirm Delete"
+msgstr ""
+
+#: src/bin/e_fm.c:9245
+#, c-format
+msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
+msgstr ""
+
+#: src/bin/e_fm.c:9251
+#, 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:338
+msgid "File:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+msgid "Size:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:352
+msgid "Last Modified:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:359
+msgid "File Type:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:366
+msgid "Permissions"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+msgid "Owner:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:373
+msgid "Others can read"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:375
+msgid "Others can write"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:377
+msgid "Owner can read"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:379
+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/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/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
+msgid "Thumbnail"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:438
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
+msgid "Custom"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:448
+msgid "Use this icon for all files of this type"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:456
+msgid "Link Information"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+msgid "Select an Image"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:189
+#, c-format
+msgid "%llu TiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:191
+#, c-format
+msgid "%llu GiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:193
+#, c-format
+msgid "%llu MiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:195
+#, c-format
+msgid "%llu KiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:197
+#, c-format
+msgid "%llu B"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:228
+#, c-format
+msgid "Unknown Volume"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:322
+msgid "Removable Device"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
+msgid "Plain"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
+msgid "Inset"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:701
+msgid "Appearance"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1291
+msgid "Automatically scroll contents"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1298
+msgid "Able to be resized"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
+msgid "Begin move/resize this gadget"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
+msgid "Remove this gadget"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1749
+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:564
+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:511
+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:522
+#: src/bin/e_int_shelf_config.c:612
+#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: 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:536 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
+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:523
+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
+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:529
+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:519
+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:72
+msgid "Edit Icon"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:77
+msgid "Add Application..."
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:88
+msgid "Create Icon"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:98
+msgid "Send to Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:110
+msgid "Pin to Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:121
+msgid "Unpin from Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:130
+msgid "More..."
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:164
+msgid "Iconify"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:361
+msgid "Maximize vertically"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:372
+msgid "Maximize horizontally"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:383
+msgid "Unmaximize"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:484
+msgid "Keyboard Shortcut"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:490
+msgid "To Favorites Menu"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:495
+msgid "To Launcher"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:517 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:526
+msgid "Skip"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:545 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:556
+msgid "Remember"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:572 src/bin/e_int_border_prop.c:75
+msgid "Window Properties"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:784
+msgid "Always On Top"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:795
+#: 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:806
+msgid "Always Below"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:898
+msgid "Select Border Style"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:910
+msgid "Use E17 Default Icon Preference"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:919
+msgid "Use Application Provided Icon "
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:927
+msgid "Use User Defined Icon"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:988 src/bin/e_int_border_prop.c:473
+msgid "Shaded"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1001 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1014 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:1039 src/modules/conf_winlist/e_mod_main.c:35
+msgid "Window List"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
+msgid "Pager"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1059
+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:480
+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:537
+msgid "Skip Taskbar"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+msgid "Skip Pager"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:476
+msgid "Hidden"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:75
+msgid "Window Remember"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:244
+msgid "Window properties are not a unique match"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:247
+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:333 src/bin/e_int_border_remember.c:363
+msgid "No match properties set"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:336
+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: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
+msgid "Nothing"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:445
+msgid "Size and Position"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+msgid "Locks"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:449
+msgid "Size, Position and Locks"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:451
+msgid "Everything"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:464
+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:490
+msgid "Window Role"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:499
+msgid "Window type"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:506
+msgid "Transience"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:510
+msgid "Properties to remember"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:521
+msgid "Icon Preference"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:525
+msgid "Virtual Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:531
+msgid "Current Screen"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:533
+msgid "Skip Window List"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:541
+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
+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:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
+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:181
+msgid "Available Modules"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:188
+msgid "Load Module"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:195
+msgid "Loaded Modules"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:202
+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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
+#: src/bin/e_int_gadcon_config.c:178
+msgid "Description: Unavailable"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:32
+msgid "Shelf Contents"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:38
+msgid "Toolbar Contents"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:93 src/modules/gadman/e_mod_config.c:106
+msgid "Available Gadgets"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:100 src/modules/gadman/e_mod_config.c:117
+msgid "Add Gadget"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:106
+msgid "Selected Gadgets"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:113
+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:506
+#: src/bin/e_int_shelf_config.c:572
+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:157
+#: src/modules/wizard/page_070.c:198
+msgid "Applications"
+msgstr ""
+
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: 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:1148
+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:1100 src/bin/e_int_menus.c:1283
+msgid "(No Windows)"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+msgid "No name!!"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1375
+msgid "(No Shelves)"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/modules/conf_shelves/e_int_config_shelf.c:132
+msgid "Shelf #"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1441
+msgid "Add A Shelf"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1448
+msgid "Delete A Shelf"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
+#: src/modules/conf_shelves/e_int_config_shelf.c:43
+msgid "Shelf Settings"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:524
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
+msgid "Tiny"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:526
+#: 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:528 src/modules/dropshadow/e_mod_config.c:126
+msgid "Medium"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:530
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
+msgid "Large"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:532
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
+msgid "Huge"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
+msgid "Set Contents..."
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:562
+msgid "Above Everything"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:564
+msgid "Below Windows"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:566
+msgid "Below Everything"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:568
+msgid "Allow windows to overlap the shelf"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:602
+msgid "Shrink to Content Size"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:613
+#, c-format
+msgid "%3.0f pixels"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Styles"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:655
+msgid "Auto Hide"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:656
+msgid "Auto-hide the shelf"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:659
+msgid "Show on mouse in"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:663
+msgid "Show on mouse click"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:667
+msgid "Hide timeout"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
+#, c-format
+msgid "%.1f seconds"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:675
+msgid "Hide duration"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:689
+msgid "Show on all Desktops"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:691
+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:326
+#, 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:389
+msgid ""
+"Enlightenment cannot Initialize Ecore!\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:415
+msgid ""
+"Enlightenment cannot initialize the File system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:427
+msgid ""
+"Enlightenment cannot set up an exit signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:433
+msgid ""
+"Enlightenment cannot set up a HUP signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:445
+msgid ""
+"Enlightenment cannot initialize its X connection.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:453
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:476
+msgid ""
+"Enlightenment cannot initialize the connections system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:484
+msgid ""
+"Enlightenment cannot initialize the IPC system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:493
+msgid ""
+"Enlightenment cannot setup xinerama wrapping.\n"
+"This should not happen."
+msgstr ""
+
+#: src/bin/e_main.c:512
+msgid ""
+"Enlightenment cannot initialize the Evas system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:518
+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:525
+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:541 src/bin/e_main.c:548
+msgid ""
+"Enlightenment cannot initialize the FDO desktop system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:562
+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:572
+msgid "Enlightenment cannot set up its file registry system."
+msgstr ""
+
+#: src/bin/e_main.c:581
+msgid "Enlightenment cannot set up its config system."
+msgstr ""
+
+#: src/bin/e_main.c:595
+msgid "Enlightenment cannot set up its scale system."
+msgstr ""
+
+#: src/bin/e_main.c:603
+msgid "Enlightenment cannot set up the pointer system."
+msgstr ""
+
+#: src/bin/e_main.c:612
+msgid ""
+"Enlightenment cannot set up paths for finding files.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:630
+msgid "Enlightenment cannot set up its font system."
+msgstr ""
+
+#: src/bin/e_main.c:641
+msgid "Enlightenment cannot set up its theme system."
+msgstr ""
+
+#: src/bin/e_main.c:646
+msgid "Starting International Support"
+msgstr ""
+
+#: src/bin/e_main.c:651
+msgid "Enlightenment cannot set up its intl system."
+msgstr ""
+
+#: src/bin/e_main.c:662
+msgid ""
+"Enlightenment cannot set up init screen.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:674
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:685
+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:696
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:705
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:714
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:725
+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:735
+msgid "Setup Screens"
+msgstr ""
+
+#: src/bin/e_main.c:740
+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:746
+msgid "Setup Screensaver"
+msgstr ""
+
+#: src/bin/e_main.c:751
+msgid "Enlightenment cannot configure the X screensaver."
+msgstr ""
+
+#: src/bin/e_main.c:755
+msgid "Setup Desklock"
+msgstr ""
+
+#: src/bin/e_main.c:760
+msgid "Enlightenment cannot set up its desk locking system."
+msgstr ""
+
+#: src/bin/e_main.c:773
+msgid "Setting up Paths"
+msgstr ""
+
+#: src/bin/e_main.c:790
+msgid "Setup System Controls"
+msgstr ""
+
+#: src/bin/e_main.c:795
+msgid "Enlightenment cannot initialize the System Command system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:800
+msgid "Setup Actions"
+msgstr ""
+
+#: src/bin/e_main.c:805
+msgid "Enlightenment cannot set up its actions system."
+msgstr ""
+
+#: src/bin/e_main.c:809
+msgid "Setup Execution System"
+msgstr ""
+
+#: src/bin/e_main.c:814
+msgid "Enlightenment cannot set up its exec system."
+msgstr ""
+
+#: src/bin/e_main.c:818
+msgid "Setup Remembers"
+msgstr ""
+
+#: src/bin/e_main.c:823
+msgid "Enlightenment cannot setup remember settings."
+msgstr ""
+
+#: src/bin/e_main.c:831
+msgid "Setup FM"
+msgstr ""
+
+#: src/bin/e_main.c:836
+msgid "Enlightenment cannot initialize the File manager.\n"
+msgstr ""
+
+#: src/bin/e_main.c:849
+msgid "Setup Message System"
+msgstr ""
+
+#: src/bin/e_main.c:854
+msgid "Enlightenment cannot set up its msg system."
+msgstr ""
+
+#: src/bin/e_main.c:858
+msgid "Setup DND"
+msgstr ""
+
+#: src/bin/e_main.c:863
+msgid "Enlightenment cannot set up its dnd system."
+msgstr ""
+
+#: src/bin/e_main.c:867
+msgid "Setup Grab Input Handling"
+msgstr ""
+
+#: src/bin/e_main.c:872
+msgid "Enlightenment cannot set up its input grab handling system."
+msgstr ""
+
+#: src/bin/e_main.c:876
+msgid "Setup Modules"
+msgstr ""
+
+#: src/bin/e_main.c:881
+msgid "Enlightenment cannot set up its module system."
+msgstr ""
+
+#: src/bin/e_main.c:885
+msgid "Setup Color Classes"
+msgstr ""
+
+#: src/bin/e_main.c:890
+msgid "Enlightenment cannot set up its color class system."
+msgstr ""
+
+#: src/bin/e_main.c:894
+msgid "Setup Gadcon"
+msgstr ""
+
+#: src/bin/e_main.c:899
+msgid "Enlightenment cannot set up its gadget control system."
+msgstr ""
+
+#: src/bin/e_main.c:904
+msgid "Setup DPMS"
+msgstr ""
+
+#: src/bin/e_main.c:909
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr ""
+
+#: src/bin/e_main.c:913
+msgid "Set Up Powersave modes"
+msgstr ""
+
+#: src/bin/e_main.c:917
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr ""
+
+#: src/bin/e_main.c:922
+msgid "Setup Wallpaper"
+msgstr ""
+
+#: src/bin/e_main.c:927
+msgid "Enlightenment cannot set up its desktop background system."
+msgstr ""
+
+#: src/bin/e_main.c:932
+msgid "Setup Mouse"
+msgstr ""
+
+#: src/bin/e_main.c:937
+msgid "Enlightenment cannot configure the mouse settings."
+msgstr ""
+
+#: src/bin/e_main.c:942
+msgid "Setup Bindings"
+msgstr ""
+
+#: src/bin/e_main.c:947
+msgid "Enlightenment cannot set up its bindings system."
+msgstr ""
+
+#: src/bin/e_main.c:951
+msgid "Setup Popups"
+msgstr ""
+
+#: src/bin/e_main.c:956
+msgid "Enlightenment cannot set up its popup system."
+msgstr ""
+
+#: src/bin/e_main.c:961
+msgid "Setup Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:966
+msgid "Enlightenment cannot set up its shelf system."
+msgstr ""
+
+#: src/bin/e_main.c:971
+msgid "Setup Thumbnailer"
+msgstr ""
+
+#: src/bin/e_main.c:976
+msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:981
+msgid "Set Up File Ordering"
+msgstr ""
+
+#: src/bin/e_main.c:985
+msgid "Enlightenment cannot set up its order file system."
+msgstr ""
+
+#: src/bin/e_main.c:1020
+msgid "Load Modules"
+msgstr ""
+
+#: src/bin/e_main.c:1028
+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:1035
+msgid "Enlightenment crashed early on start and has been restarted"
+msgstr ""
+
+#: src/bin/e_main.c:1036
+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:1044
+msgid "Configure Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:1054
+msgid "Almost Done"
+msgstr ""
+
+#: src/bin/e_module.c:117
+#, 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
+msgid "Error loading Module"
+msgstr ""
+
+#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#, 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
+msgid "Module does not contain all needed functions"
+msgstr ""
+
+#: src/bin/e_module.c:164
+#, 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:169
+#, c-format
+msgid "Enlightenment %s Module"
+msgstr ""
+
+#: src/bin/e_module.c:497
+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:1272 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
+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
+msgid "Stop Moving/Resizing Items"
+msgstr ""
+
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+msgid "Begin Moving/Resizing Items"
+msgstr ""
+
+#: src/bin/e_shelf.c:1703
+msgid "Set Shelf Contents"
+msgstr ""
+
+#: src/bin/e_shelf.c:1708
+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:314
+msgid "Logout problems"
+msgstr ""
+
+#: src/bin/e_sys.c:317
+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
+msgid "Logout now"
+msgstr ""
+
+#: src/bin/e_sys.c:324
+msgid "Wait longer"
+msgstr ""
+
+#: src/bin/e_sys.c:325
+msgid "Cancel Logout"
+msgstr ""
+
+#: src/bin/e_sys.c:363
+msgid "Logout in progress"
+msgstr ""
+
+#: src/bin/e_sys.c:366
+msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+msgid "Enlightenment is busy with another request"
+msgstr ""
+
+#: src/bin/e_sys.c:401
+msgid ""
+"Logging out.<br>You cannot perform other system actions<br>once a logout has "
+"begun."
+msgstr ""
+
+#: src/bin/e_sys.c:409
+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
+msgid ""
+"Resetting.<br>You cannot do any other system actions<br>once a reboot has "
+"begun."
+msgstr ""
+
+#: src/bin/e_sys.c:423
+msgid ""
+"Suspending.<br>Until suspend is complete you cannot perform<br>any other "
+"system actions."
+msgstr ""
+
+#: src/bin/e_sys.c:430
+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
+msgid "EEK! This should not happen"
+msgstr ""
+
+#: src/bin/e_sys.c:463
+msgid "Power off failed."
+msgstr ""
+
+#: src/bin/e_sys.c:468
+msgid "Reset failed."
+msgstr ""
+
+#: src/bin/e_sys.c:473
+msgid "Suspend failed."
+msgstr ""
+
+#: src/bin/e_sys.c:478
+msgid "Hibernate failed."
+msgstr ""
+
+#: src/bin/e_sys.c:535
+msgid "Power off"
+msgstr ""
+
+#: src/bin/e_sys.c:538
+msgid "Power off.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:562
+msgid "Resetting"
+msgstr ""
+
+#: src/bin/e_sys.c:565
+msgid "Resetting.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:588
+msgid "Suspending"
+msgstr ""
+
+#: src/bin/e_sys.c:591
+msgid "Suspending.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:614
+msgid "Hibernating"
+msgstr ""
+
+#: src/bin/e_sys.c:617
+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:246
+msgid "Cannot exit - immortal windows."
+msgstr ""
+
+#: src/bin/e_utils.c:247
+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:806
+#, c-format
+msgid "%'.0f Bytes"
+msgstr ""
+
+#: src/bin/e_utils.c:810
+#, c-format
+msgid "%'.0f KB"
+msgstr ""
+
+#: src/bin/e_utils.c:814
+#, c-format
+msgid "%'.0f MB"
+msgstr ""
+
+#: src/bin/e_utils.c:818
+#, c-format
+msgid "%'.1f GB"
+msgstr ""
+
+#: src/bin/e_utils.c:838
+#, c-format
+msgid "In the Future"
+msgstr ""
+
+#: src/bin/e_utils.c:843
+#, c-format
+msgid "In the last Minute"
+msgstr ""
+
+#: src/bin/e_utils.c:845
+#, c-format
+msgid "%li Years ago"
+msgstr ""
+
+#: src/bin/e_utils.c:847
+#, c-format
+msgid "%li Months ago"
+msgstr ""
+
+#: src/bin/e_utils.c:849
+#, c-format
+msgid "%li Weeks ago"
+msgstr ""
+
+#: src/bin/e_utils.c:851
+#, c-format
+msgid "%li Days ago"
+msgstr ""
+
+#: src/bin/e_utils.c:853
+#, c-format
+msgid "%li Hours ago"
+msgstr ""
+
+#: src/bin/e_utils.c:855
+#, c-format
+msgid "%li Minutes ago"
+msgstr ""
+
+#: src/bin/e_utils.c:861
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: 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
+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_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:293
+msgid "Add to Favorites"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:299
+#: 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_wallpaper/e_int_config_wallpaper.c:519
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/gadman/e_mod_config.c:193
+msgid "Go up a Directory"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:360
+msgid "Permissions:"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:376
+msgid "Modified:"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:615
+#, c-format
+msgid "You"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:664
+#, 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
+#, c-format
+msgid "Read Only"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#, c-format
+msgid "Forbidden"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:691
+msgid "Read-Write"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:41
+msgid "Battery Monitor Settings"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:92
+msgid "Basic Settings"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:93
+msgid "Show alert when battery is low"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:136
+msgid "Check every:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:138
+#: 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:140
+msgid "Polling"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:143
+msgid "Show alert on low battery"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:145
+msgid "Alert when at:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:147
+#, c-format
+msgid "%1.0f min"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:149
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:151
+msgid "Auto dismiss in..."
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:153
+#, c-format
+msgid "%1.0f sec"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:155
+msgid "Alert"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:160
+msgid "Auto Detect"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:162
+#: 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:164
+#: src/modules/fileman/e_mod_config.c:280
+msgid "HAL"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:167
+msgid "Hardware"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:135
+msgid "Battery"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:844
+msgid "Your battery is low!"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:846
+msgid "AC power is recommended."
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:921
+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
+msgid "ERROR"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:1093
+msgid "Battery Meter"
+msgstr ""
+
+#: src/modules/clock/e_mod_main.c:98
+msgid "Clock"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
+msgid "Settings Panel"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:234
+msgid "Presentation"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:241
+msgid "Offline"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Guhestin"
+
+#: 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:1923
+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:79
+msgid "Menus"
+msgstr ""
+
+#: src/modules/conf_borders/e_int_config_borders.c:30
+#: src/modules/conf_borders/e_int_config_borders.c:197
+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:242
+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_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:656
+#: 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:353
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+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:391
+#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: 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:109
+#: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: 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:821
+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:36
+msgid "Dialog Settings"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: 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_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/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
+msgid "Disable Confirmation Dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+msgid "Normal Windows"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+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
+msgid "Basic Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+msgid "Advanced Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+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:405
+msgid "Resolution"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:412
+msgid "Restore on login"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:416
+msgid "Refresh"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:475
+msgid "Rotation"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:494
+msgid "Mirroring"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:641
+msgid "Missing Features"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:642
+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:654
+msgid "No Refresh Rates Found"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:655
+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:12
+#: 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>To change the delay of this action,<br>use the slider:"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+msgid "Edge Binding Settings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_mod_main.c:35
+msgid "Edge Bindings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+msgid "Add Edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+msgid "Delete Edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+msgid "Modify Edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: 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_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_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_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
+msgid "General Options"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+msgid "Allow binding activation with fullscreen windows"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+msgid "Edge Binding Sequence"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#, c-format
+msgid "%.2f seconds"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+msgid "Binding Edge Error"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#, 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_keybindings/e_int_config_keybindings.c:1276
+#: src/modules/gadman/e_mod_gadman.c:763
+msgid "CTRL"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
+#: src/modules/gadman/e_mod_gadman.c:768
+msgid "ALT"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
+#: src/modules/gadman/e_mod_gadman.c:774
+msgid "SHIFT"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
+#: src/modules/gadman/e_mod_gadman.c:780
+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:428
+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_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
+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:613
+msgid "Enable Font Class"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Hinting"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
+msgid "Bytecode"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: 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
+msgid "Font Fallbacks"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:662
+msgid "Fallback Name"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:674
+msgid "Enable Fallbacks"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:683
+msgid "Advanced Preview Text.. 我真的会写中文"
+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:35
+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:140
+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:160
+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:36
+#: src/modules/conf_mouse/e_mod_main.c:35
+msgid "Mouse Settings"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:97
+msgid "Mouse Hand"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:105
+msgid "Mouse Acceleration"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:107
+msgid "Acceleration"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
+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:1013
+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:56
+msgid "Profile Selector"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:107
+msgid "Available Profiles"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:116
+#: src/modules/wizard/page_020.c:118
+msgid "Select a profile"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:125
+msgid "Reset"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#, 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
+msgid "Delete OK?"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:350
+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:431
+msgid " Import..."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:435
+msgid " Online..."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:1004
+msgid "Theme Categories"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:1022
+msgid "Assign"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:1028
+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:674
+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
+msgid "Picture..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+msgid "Gradient..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+msgid "Where to place the Wallpaper"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+msgid "All Desktops"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+msgid "This Desktop"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+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:152
+#: src/modules/gadman/e_mod_gadman.c:685
+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:693
+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:274
+msgid "Select a Picture..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+msgid "Picture Import Error"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+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
+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
+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
+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:122
+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_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 ""
+
+#: 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:142
+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
+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:150
+msgid "Maximize Directions"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+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:163
+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:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: 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
+msgid "Delete Remember(s)"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+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
+msgid "<No Name>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+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
+msgid "<No Class>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+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
+msgid "<No Title>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+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
+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:729
+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:1462
+msgid "Go to Parent Directory"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1524
+msgid "Other application..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
+msgid "Open"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
+msgid "Open with..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1892
+msgid "Known Applications"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1902
+msgid "Specific Applications"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1944
+msgid "Custom Command"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:53
+#, c-format
+msgid "%d operations"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:55
+#, c-format
+msgid "idle"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:139
+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:677
+msgid "Free"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:709
+msgid "Always on desktop"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:719
+msgid "On top pressing"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:748
+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:101
+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:214
+msgid "IBar"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:796
+msgid "Change Icon Properties"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:801
+msgid "Remove Icon"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:811
+msgid "Add An Icon"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:818
+msgid "Create New Icon"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:834
+msgid "Add Application"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:52
+msgid "IBox Settings"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:105
+msgid "Display Name"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:110
+msgid "Display Title"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:115
+msgid "Display Class"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:120
+msgid "Display Icon Name"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:125
+msgid "Display Border Caption"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:155
+msgid "Show windows from all screens"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:160
+msgid "Show windows from current screen"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:169
+msgid "Show windows from all desktops"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:174
+msgid "Show windows from active desktop"
+msgstr ""
+
+#: src/modules/ibox/e_mod_main.c:226
+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:203
+msgid "Popup Settings"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+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:167
+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
+#, c-format
+msgid "Click to set"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:174
+msgid "Drag and Drop button"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:181
+msgid "Drag whole desktop"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:190
+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
+#, c-format
+msgid "%.0f px"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:196
+msgid "Resistance to dragging"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:207
+msgid "Popup pager height"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+msgid "Popup speed"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#, c-format
+msgid "%1.1f seconds"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:229
+msgid "Urgent Window Settings"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:230
+msgid "Show popup on urgent window"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:233
+msgid "Popup on urgent window sticks on the screen"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:286
+msgid "Pager Button Grab"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:288
+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
+msgid "Attetion"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:344
+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
+#, c-format
+msgid "Button %i"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2843
+msgid "Show Pager Popup"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
+msgid "Popup Desk Right"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
+msgid "Popup Desk Left"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
+msgid "Popup Desk Up"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
+msgid "Popup Desk Down"
+msgstr ""
+
+#: src/modules/start/e_mod_main.c:110
+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:141 src/modules/wizard/page_020.c:56
+msgid "Select one"
+msgstr ""
+
+#: src/modules/wizard/page_020.c:55
+msgid "Profile"
+msgstr ""
+
+#: src/modules/wizard/page_030.c:89
+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:200
+msgid "Select Icons to Add"
+msgstr ""
+
+#: src/modules/wizard/page_080.c:62
+msgid "Quick Launch"
+msgstr ""
+
+#: src/modules/wizard/page_080.c:64
+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:1154
+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:213
+msgid "Connection Manager"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:730
+msgid "Network Connection Settings"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:736
+msgid "Network Device"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:741
+msgid "Wifi"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:744
+msgid "LAN"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:747
+msgid "Specific Device"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:768
+msgid "Networks"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+msgid "Systray"
+msgstr ""
diff --git a/po/nb.gmo b/po/nb.gmo
index 1c81b45..ef8be07 100644
Binary files a/po/nb.gmo and b/po/nb.gmo differ
diff --git a/po/nb.po b/po/nb.po
index d9e4891..9d46dfe 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2009-03-21 16:28+0000\n"
 "Last-Translator: Kenneth Langdalen <Unknown>\n"
 "Language-Team: E17-nb <LL at li.org>\n"
@@ -18,20 +18,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Om Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -65,383 +65,385 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr ""
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nei"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Vil du virkelig avslutte?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Vil du virkelig logge ut?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 
-#: src/bin/e_actions.c:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr ""
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 
-#: src/bin/e_actions.c:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr ""
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 
-#: src/bin/e_actions.c:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr ""
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Flytt"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr ""
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Meny"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr ""
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr ""
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Drep"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr ""
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maksimér"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr ""
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr ""
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr ""
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr ""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr ""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr ""
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr ""
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
 msgstr ""
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Bytt til skrivebord 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Bytt til skrivebord 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Bytt til skrivebord 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Bytt til skrivebord 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Bytt til skrivebord 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Bytt til skrivebord 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Bytt til skrivebord 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Bytt til skrivebord 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Bytt til skrivebord 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Bytt til skrivebord 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Bytt til skrivebord 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Bytt til skrivebord 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Bytt til skrivebord..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -451,102 +453,115 @@ msgstr ""
 msgid "Screen"
 msgstr "Skjerm"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr ""
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Til skrivebord..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Vis meny..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Kommando"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr ""
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr ""
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Avslutt"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
 msgstr "Avslutt nå"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment %s-modul"
+
+#: src/bin/e_actions.c:2808
+msgid "Presentation Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2813
+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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -559,55 +574,55 @@ msgstr "Avslutt nå"
 msgid "System"
 msgstr "System"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Logg ut"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr "Slå av nå"
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr "Slå av"
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Start på nytt"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr ""
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 msgid "Lock"
 msgstr "Lås"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Rydd vinduer"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr ""
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr ""
 
@@ -615,13 +630,14 @@ msgstr ""
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -636,7 +652,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -648,7 +664,7 @@ msgstr "Ok"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 "
@@ -659,7 +675,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -668,11 +684,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
 msgstr ""
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -680,7 +696,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -690,7 +706,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -699,7 +715,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -708,7 +724,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -716,11 +732,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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
@@ -746,7 +762,7 @@ msgid "Modules"
 msgstr "Moduler"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr ""
 
@@ -755,34 +771,34 @@ msgstr ""
 msgid "Container %d"
 msgstr "Beholder %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -790,6 +806,25 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
+#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr ""
@@ -884,23 +919,23 @@ msgstr "Velg et ikon"
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Slett"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Kopier"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Lim inn"
 
@@ -934,260 +969,313 @@ msgstr ""
 "Enlightenment klarte ikke kjøre applikasjonen:<br><br>%"
 "s<br><br>Applikasjonen startet ikke opp."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Feil ved kjøring av applikasjon"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s sluttet uventet å kjøre."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Feillogger"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Det var ingen feilmelding."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Feilinformasjon"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Feilsignalinformasjon"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Utdata"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Det var ingen utdata"
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s eksisterer ikke."
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Kjørefeil"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Kjørefeil"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Feil"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i filer"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr "Avbryt"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Opprett mappe"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Gi nytt navn"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Om"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Bakgrunn"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+msgid "Set overlay..."
+msgstr ""
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr ""
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Gi nytt navn"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Feil"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "Starter"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr ""
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1246,8 +1334,8 @@ msgid "Preview"
 msgstr "Forhåndsvisning"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr ""
 
@@ -1256,7 +1344,7 @@ msgid "Thumbnail"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr ""
 
@@ -1272,70 +1360,70 @@ msgstr ""
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1385,8 +1473,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1394,7 +1482,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Nivå"
 
@@ -1572,12 +1660,12 @@ msgstr "Fullskjerm"
 msgid "Window List"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr ""
 
@@ -1852,11 +1940,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr "Innstillinger"
 
@@ -1890,8 +1978,8 @@ msgstr ""
 msgid "Unload Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1921,12 +2009,12 @@ msgstr ""
 msgid "Remove Gadget"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: 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:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr ""
 
@@ -2009,121 +2097,121 @@ msgstr "(Ingen vindu)"
 msgid "No name!!"
 msgstr "Uten navn"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Midt på treet"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 msgid "Set Contents..."
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Alltid øverst"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Alltid nederst"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f piksler"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekunder"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr ""
 
@@ -2463,7 +2551,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment klarer ikke å sette opp dra-og-slipp-systemet."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2643,29 +2731,36 @@ msgstr "Enlightenment %s-modul"
 msgid "Would you like to unload this module?<br>"
 msgstr "Vil du fjerne denne modulen fra minne?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 msgid "Set Shelf Contents"
 msgstr ""
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr ""
 
@@ -2807,7 +2902,7 @@ msgstr "Om tema"
 msgid "Set As Theme"
 msgstr ""
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 msgid "Set Toolbar Contents"
 msgstr ""
 
@@ -2822,67 +2917,67 @@ msgid ""
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li år siden"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li måneder siden"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li uker siden"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li dager siden"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li timer siden"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minutter siden"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -2894,7 +2989,7 @@ msgstr "Ukjent"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Legg til"
 
@@ -2917,7 +3012,7 @@ msgid "Add to Favorites"
 msgstr ""
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3031,6 +3126,7 @@ msgid "Internal"
 msgstr ""
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
@@ -3042,24 +3138,24 @@ msgstr ""
 msgid "Battery"
 msgstr "Batteri"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr ""
 
@@ -3068,10 +3164,24 @@ msgid "Clock"
 msgstr "Klokke"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
 msgstr ""
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Posisjon"
+
+#: src/modules/conf/e_mod_main.c:241
+msgid "Offline"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Moduler"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3094,7 +3204,7 @@ msgid "Restart Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr ""
 
@@ -3449,41 +3559,53 @@ msgstr ""
 msgid "Desk"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: 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:176
+#: 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:180
+#: 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 sekunder"
+
+#: 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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 minutter"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3494,27 +3616,27 @@ msgstr "%1.0f minutter"
 msgid "Personal"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: 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:337
+#: 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:341
+#: 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:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3523,29 +3645,49 @@ msgstr ""
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "Bakgrunn"
+
+#: 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:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr ""
 
@@ -3553,59 +3695,74 @@ msgstr ""
 msgid "Screen Lock"
 msgstr "Skjermlås"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Antall skrivebord"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Skifte av skrivebord med musepeker"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Skrivebord"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: 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:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 sek"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Bakgrunn"
+
+#: 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 ""
@@ -3621,8 +3778,8 @@ msgstr ""
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -3772,23 +3929,23 @@ msgstr ""
 msgid "Display Power Management Settings"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: 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:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr ""
 
@@ -4357,7 +4514,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f piksler"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4574,7 +4731,7 @@ 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Filer"
 
@@ -4916,55 +5073,50 @@ msgstr ""
 msgid "Scaling"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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:168
+#: 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:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f sekunder"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Foretrukket"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "Ikke foretrukket"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Tillat"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "Ikke tillat"
 
@@ -4977,7 +5129,7 @@ msgid "Configured Shelves"
 msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Oppstart"
@@ -5022,10 +5174,6 @@ msgstr ""
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr ""
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr ""
@@ -5865,27 +6013,19 @@ msgstr ""
 msgid "Run Command Dialog"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount error"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
 msgstr "Hjem"
 
-#: src/modules/fileman/e_mod_main.c:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -5896,7 +6036,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -5906,94 +6046,102 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Størrelse på ikoner"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
 msgstr "Vis"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 msgid "Case Sensitive"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:257
-msgid "Show HAL icons on desktop"
-msgstr ""
-
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
 msgstr "Oppførsel"
 
-#: src/modules/fileman/e_fwin.c:1187
+#: 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:1462
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "Favoritter"
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Åpne"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Åpne med..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "(Ingen programmer)"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr ""
 
@@ -6082,39 +6230,39 @@ msgstr "Forrige vindu"
 msgid "Select a window"
 msgstr "Velg et vindu"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr ""
 
@@ -6129,27 +6277,27 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Endre ikonegenskaper"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Fjern ikon"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr "Legg til et ikon"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr "Lag nytt ikon"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr ""
 
@@ -6201,128 +6349,128 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: 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:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr "Listeinnstillinger"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr "Dra hele skrivebordet"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekund"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 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:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Knapp %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6565,7 +6713,7 @@ msgstr "Venstre:"
 msgid "Right:"
 msgstr "Høyre:"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr ""
 
@@ -6605,11 +6753,11 @@ msgstr ""
 msgid "Mixer Settings Updated"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6643,6 +6791,19 @@ msgstr ""
 msgid "Networks"
 msgstr "Nettverk"
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "System"
+
 #~ msgid "Configure"
 #~ msgstr "Konfigurér"
 
diff --git a/po/nl.gmo b/po/nl.gmo
index b62d072..1f0c7e9 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 09a71c2..848908b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2005-12-16 10:48+0100\n"
 "Last-Translator: Niels Abspoel <niels.abspoel at wanadoo.nl>\n"
 "Language-Team: Nederlands <nl at li.org>\n"
@@ -20,20 +20,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Over Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -78,49 +78,51 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Weet je zeker dat je wilt afsluiten?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nee"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Weet je zeker dat je wilt afsluiten?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 #, fuzzy
 msgid "Are you sure you want to log out?"
 msgstr "Weet je zeker dat je wilt afsluiten?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 #, fuzzy
 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?"
 
-#: src/bin/e_actions.c:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 #, fuzzy
 msgid "Are you sure you want to turn off?"
 msgstr "Weet je zeker dat je wilt afsluiten?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 #, fuzzy
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
@@ -129,12 +131,12 @@ msgstr ""
 "Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
 "afsluiten?"
 
-#: src/bin/e_actions.c:1981
+#: src/bin/e_actions.c:1995
 #, fuzzy
 msgid "Are you sure you want to reboot?"
 msgstr "Weet je zeker dat je wilt afsluiten?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 #, fuzzy
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
@@ -143,7 +145,7 @@ msgstr ""
 "Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
 "afsluiten?"
 
-#: src/bin/e_actions.c:2047
+#: src/bin/e_actions.c:2061
 #, fuzzy
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
@@ -152,12 +154,12 @@ msgstr ""
 "Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
 "afsluiten?"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 #, fuzzy
 msgid "Are you sure you want to hibernate?"
 msgstr "Weet je zeker dat je wilt afsluiten?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 #, fuzzy
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
@@ -166,365 +168,365 @@ msgstr ""
 "Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
 "afsluiten?"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Vensterraam selectie"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 #, fuzzy
 msgid "Move"
 msgstr "Ik"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 #, fuzzy
 msgid "Resize"
 msgstr "Weerstand"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 #, fuzzy
 msgid "Menu"
 msgstr "Ik"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 #, fuzzy
 msgid "Window Menu"
 msgstr "Venster rol"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr ""
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 #, fuzzy
 msgid "Lower"
 msgstr "Laag"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Vernietigen"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Venster Naam"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 #, fuzzy
 msgid "Fullscreen Mode Toggle"
 msgstr "Volledig Scherm"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maximaliseer"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 #, fuzzy
 msgid "Maximize Vertically"
 msgstr "Maximaliseer Verticaal"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 #, fuzzy
 msgid "Maximize Horizontally"
 msgstr "Maximaliseer Horizontaal"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 #, fuzzy
 msgid "Maximize Fullscreen"
 msgstr "Volledig Scherm"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 #, fuzzy
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximaliseren"
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 #, fuzzy
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximaliseer beleid"
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 #, fuzzy
 msgid "Toggle Borderless State"
 msgstr "Raamloos"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 #, fuzzy
 msgid "Toggle Pinned State"
 msgstr "Raamloos"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Bureaublad"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 #, fuzzy
 msgid "Flip Desktop Left"
 msgstr "Bureaubladnaam"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 #, fuzzy
 msgid "Flip Desktop Up"
 msgstr "Bureaublad"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 #, fuzzy
 msgid "Show The Desktop"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 #, fuzzy
 msgid "Switch To Desktop 0"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 #, fuzzy
 msgid "Switch To Desktop 1"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 #, fuzzy
 msgid "Switch To Desktop 2"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 #, fuzzy
 msgid "Switch To Desktop 3"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 #, fuzzy
 msgid "Switch To Desktop 4"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 #, fuzzy
 msgid "Switch To Desktop 5"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 #, fuzzy
 msgid "Switch To Desktop 6"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 #, fuzzy
 msgid "Switch To Desktop 7"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 #, fuzzy
 msgid "Switch To Desktop 8"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 #, fuzzy
 msgid "Switch To Desktop 9"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 #, fuzzy
 msgid "Switch To Desktop 10"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 #, fuzzy
 msgid "Switch To Desktop 11"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 #, fuzzy
 msgid "Switch To Desktop..."
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Bureaubladnaam"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Bureaublad"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Wissel bureaubladen als muis bij schermrand is"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "Bureaubladnaam"
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -535,111 +537,126 @@ msgstr "Stuur naar bureaublad"
 msgid "Screen"
 msgstr "Scherm zone"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: 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
 msgid "Window : Moving"
 msgstr "Venster Schaduwen"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 #, fuzzy
 msgid "To Next Desktop"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 #, fuzzy
 msgid "By Desktop #..."
 msgstr "Bureaublad"
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 #, fuzzy
 msgid "To Desktop..."
 msgstr "Bureaublad"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 #, fuzzy
 msgid "Show All Applications Menu"
 msgstr "(Geen toepassingen)"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr ""
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 #, fuzzy
 msgid "Command"
 msgstr "Commando Uitvoeren"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 #, fuzzy
 msgid "Application"
 msgstr "(Geen toepassingen)"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr ""
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 #, fuzzy
 msgid "Exit"
 msgstr "Wacht Sluiten"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 #, fuzzy
 msgid "Exit Now"
 msgstr "Wacht Sluiten"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment %s Module"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Volledig Scherm"
+
+#: src/bin/e_actions.c:2813
+#, fuzzy
+msgid "Offline Mode Toggle"
+msgstr "Volledig Scherm"
+
+#: 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -652,60 +669,60 @@ msgstr "Wacht Sluiten"
 msgid "System"
 msgstr ""
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr ""
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr ""
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 #, fuzzy
 msgid "Hibernate"
 msgstr "Lineair"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 #, fuzzy
 msgid "Lock"
 msgstr "Sloten"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Vensters Opruimen"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "Vensterraam selectie"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Delayed Action"
 msgstr "Modules"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 #, fuzzy
 msgid "Set As Background"
 msgstr "Achtergrond instellingen"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "Bureaublad"
@@ -714,13 +731,14 @@ msgstr "Bureaublad"
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -735,7 +753,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -747,7 +765,7 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -767,7 +785,7 @@ msgstr ""
 "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:746
+#: src/bin/e_config.c:760
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -783,12 +801,12 @@ msgstr ""
 "als een voorzorgsmaatregel word je configuratie nu teruggezet naar\n"
 "de standaard instellingen. Excuses voor het ongemak.\n"
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "Icon Instellingen"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -796,7 +814,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -806,7 +824,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -815,7 +833,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -824,7 +842,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -832,12 +850,12 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment Configuratie"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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
@@ -865,7 +883,7 @@ 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr ""
 
@@ -874,34 +892,34 @@ msgstr ""
 msgid "Container %d"
 msgstr "Container %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -909,6 +927,25 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
+#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr ""
@@ -1011,24 +1048,24 @@ msgstr "Selecteer een venster"
 msgid "Select an Executable"
 msgstr "Uitvoerbaar"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Wis"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 #, fuzzy
 msgid "Cut"
 msgstr "knip"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Kopieer"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 #, fuzzy
 msgid "Paste"
 msgstr "Snel"
@@ -1066,278 +1103,332 @@ msgid ""
 "application failed to start."
 msgstr ""
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 #, fuzzy
 msgid "Error Logs"
 msgstr "Fout"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:628
+#: src/bin/e_exec.c:631
 #, fuzzy
 msgid "Error Information"
 msgstr "Display informatie"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 #, fuzzy
 msgid "Error Signal Information"
 msgstr "Display informatie"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Start Fout"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Start Fout"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Fout"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, fuzzy, c-format
 msgid "%i Files"
 msgstr "Bestanden"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 #, fuzzy
 msgid "Link"
 msgstr "Lineair"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 #, fuzzy
 msgid "Abort"
 msgstr "Over..."
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Icon Instellingen"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 #, fuzzy
 msgid "View Mode"
 msgstr "Bewerkmodus"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 #, fuzzy
 msgid "Refresh View"
 msgstr "Ververs"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 #, fuzzy
 msgid "Remember Ordering"
 msgstr "Onthouden gebruiken"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 #, fuzzy
 msgid "New Directory"
 msgstr "Map"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Hernoem"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Test Menu Item"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 #, fuzzy
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 #, fuzzy
 msgid "Use default"
 msgstr "Details"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 #, fuzzy
 msgid "Grid Icons"
 msgstr "Iconen"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 #, fuzzy
 msgid "Custom Icons"
 msgstr "Automatisch passende Iconen"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 #, fuzzy
 msgid "List"
 msgstr "Vensterlijst overslaan"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "Icon Grote"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Achtergrond instellingen"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+msgid "Set overlay..."
+msgstr ""
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+#, fuzzy
+msgid "Clear"
+msgstr "Dichtbij"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 #, fuzzy
 msgid "New Directory Name:"
 msgstr "Map"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, fuzzy, c-format
 msgid "Rename %s to:"
 msgstr "Hernoem"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 #, fuzzy
 msgid "Rename File"
 msgstr "Hernoem"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Fout"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "%s starten"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Weet je zeker dat je dit wilt verwijderen <br><b>%s</b> ?"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 #, fuzzy
 msgid "Confirm Delete"
 msgstr "Bevestig"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, fuzzy, 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> ?"
 
-#: src/bin/e_fm.c:8730
+#: src/bin/e_fm.c:9251
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1400,8 +1491,8 @@ msgid "Preview"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: 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"
@@ -1411,7 +1502,7 @@ msgid "Thumbnail"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 #, fuzzy
 msgid "Custom"
 msgstr "knip"
@@ -1430,71 +1521,71 @@ msgstr "Display informatie"
 msgid "Select an Image"
 msgstr "Selecteer een venster"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 #, fuzzy
 msgid "Inset"
 msgstr "Iconen"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1544,8 +1635,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1553,7 +1644,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Gestapeld"
 
@@ -1742,12 +1833,12 @@ msgstr "Volledig Scherm"
 msgid "Window List"
 msgstr "Vensterlijst overslaan"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 #, fuzzy
 msgid "Pager"
 msgstr "Gevaar"
@@ -2043,11 +2134,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 #, fuzzy
 msgid "Settings"
 msgstr "Icon Instellingen"
@@ -2089,8 +2180,8 @@ msgstr "(Geen Geladen Modules)"
 msgid "Unload Module"
 msgstr "Klok Module"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2123,13 +2214,13 @@ msgstr "Hulpmiddelen"
 msgid "Remove Gadget"
 msgstr "Hulpmiddelen"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 #, fuzzy
 msgid "Toolbar Settings"
 msgstr "basisinstellingen"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr ""
 
@@ -2224,131 +2315,131 @@ msgstr "(Geen Vensters)"
 msgid "No name!!"
 msgstr "Geen naam!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 #, fuzzy
 msgid "Delete A Shelf"
 msgstr "Wis"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 #, fuzzy
 msgid "Shelf Settings"
 msgstr "Andere Instellingen"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Middel"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Groot"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 msgid "Set Contents..."
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 #, fuzzy
 msgid "Above Everything"
 msgstr "Alles"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 #, fuzzy
 msgid "Below Windows"
 msgstr "(Geen Vensters)"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 #, fuzzy
 msgid "Below Everything"
 msgstr "Alles"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 #, fuzzy
 msgid "Allow windows to overlap the shelf"
 msgstr "Volg de vensters als het beweegt"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, fuzzy, c-format
 msgid "%3.0f pixels"
 msgstr "%1.0f pixels"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 #, fuzzy
 msgid "Auto Hide"
 msgstr "Auto omhoog halen"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 #, fuzzy
 msgid "Show on mouse in"
 msgstr "Scherm zone"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, fuzzy, c-format
 msgid "%.1f seconds"
 msgstr "%1.1f seconds"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 #, fuzzy
 msgid "Hide duration"
 msgstr "Configuratie"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 #, fuzzy
 msgid "Show on all Desktops"
 msgstr "Stuur naar bureaublad"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 #, fuzzy
 msgid "Show on specified Desktops"
 msgstr "Stuur naar bureaublad"
@@ -2722,7 +2813,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment kan het dnd systeem niet instellen"
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2920,12 +3011,19 @@ msgstr "Enlightenment %s Module"
 msgid "Would you like to unload this module?<br>"
 msgstr "Wil je deze module ontladen?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
 #, fuzzy
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Weet je zeker dat je dit wilt verwijderen <br><b>%s</b> ?"
 
-#: src/bin/e_shelf.c:1259
+#: src/bin/e_shelf.c:1273
 #, fuzzy
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
@@ -2934,20 +3032,20 @@ msgstr ""
 "Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
 "afsluiten?"
 
-#: src/bin/e_shelf.c:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Thema's"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr ""
 
@@ -3102,7 +3200,7 @@ msgstr "Over dit Thema"
 msgid "Set As Theme"
 msgstr "Over dit Thema"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Configuratie"
@@ -3122,67 +3220,67 @@ msgstr ""
 "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:805
+#: src/bin/e_utils.c:806
 #, fuzzy, c-format
 msgid "%'.0f Bytes"
 msgstr "%1.0f van minuten"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, fuzzy, c-format
 msgid "%'.0f KB"
 msgstr "%1.0f F"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, fuzzy, c-format
 msgid "%'.0f MB"
 msgstr "%1.0f F"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3194,7 +3292,7 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr ""
 
@@ -3218,7 +3316,7 @@ msgid "Add to Favorites"
 msgstr ""
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3339,6 +3437,7 @@ msgid "Internal"
 msgstr "Algemeen"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
@@ -3351,24 +3450,24 @@ msgstr ""
 msgid "Battery"
 msgstr "Batterij Module"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 #, fuzzy
 msgid "Battery Meter"
 msgstr "Batterij Module"
@@ -3379,11 +3478,25 @@ msgid "Clock"
 msgstr "Sluiten"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 #, fuzzy
 msgid "Settings Panel"
 msgstr "Icon Instellingen"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Bureaublad instellingen"
+
+#: src/modules/conf/e_mod_main.c:241
+msgid "Offline"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Modules"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3409,7 +3522,7 @@ msgid "Restart Applications"
 msgstr "Favoriete Programma's"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 #, fuzzy
 msgid "All Applications"
 msgstr "(Geen toepassingen)"
@@ -3798,44 +3911,56 @@ msgstr ""
 msgid "Desk"
 msgstr "Bureaublad"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 #, fuzzy
 msgid "Screen Lock Settings"
 msgstr "Icon Instellingen"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 #, fuzzy
 msgid "Automatic Locking"
 msgstr "Automatisch Hoogte"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 #, fuzzy
 msgid "Lock when Enlightenment starts"
 msgstr "Enlightenment: fout!"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: 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:180
+#: 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
+#, fuzzy, c-format
+msgid "%1.0f seconds"
+msgstr "%1.1f seconds"
+
+#: 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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 van minuten"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3847,30 +3972,30 @@ msgstr "%1.0f van minuten"
 msgid "Personal"
 msgstr "Toestemmingen:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 #, fuzzy
 msgid "Login Box Settings"
 msgstr "Icon Instellingen"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 #, fuzzy
 msgid "Show on all screen zones"
 msgstr "Scherm zone"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: 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:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 #, fuzzy
 msgid "Show on screen zone #:"
 msgstr "Scherm zone"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3879,30 +4004,50 @@ msgstr "Scherm zone"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "Bureaublad Muis Wissel"
+
+#: 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
 #, fuzzy
 msgid "Custom Screenlock"
 msgstr "Scherm zone"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr ""
 
@@ -3911,65 +4056,80 @@ msgstr ""
 msgid "Screen Lock"
 msgstr "Scherm zone"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 #, fuzzy
 msgid "Virtual Desktops Settings"
 msgstr "Virtueel bureaublad"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Nieuwe Regel Bureaubladen"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Bureaublad Muis Wissel"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 #, fuzzy
 msgid "Desktops"
 msgstr "Bureaublad"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: 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"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 #, fuzzy
 msgid "Flip Animation"
 msgstr "Display informatie"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 #, fuzzy
 msgid "Pane"
 msgstr "Gevaar"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 #, fuzzy
 msgid "Zoom"
 msgstr "Onder"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 sec"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Achtergrond instellingen"
+
+#: 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
 #, fuzzy
 msgid "Virtual Desktops"
@@ -3987,8 +4147,8 @@ msgstr "Algemene instellingen"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -4150,25 +4310,25 @@ msgstr ""
 msgid "Display Power Management Settings"
 msgstr "Bureaublad instellingen"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: 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:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 #, fuzzy
 msgid "Timers"
 msgstr "Thema's"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 #, fuzzy
 msgid "Suspend time"
 msgstr "Stuur naar bureaublad"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr ""
 
@@ -4802,7 +4962,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pixels"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -5039,7 +5199,7 @@ msgid "Select an Edj File"
 msgstr "Selecteer een venster"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Bestanden"
 
@@ -5415,58 +5575,53 @@ msgstr "Maximaliseer"
 msgid "Scaling"
 msgstr "Gestapeld"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 #, fuzzy
 msgid "Screen Saver Settings"
 msgstr "Icon Instellingen"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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:168
+#: 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:170
-#, fuzzy, c-format
-msgid "%1.0f seconds"
-msgstr "%1.1f seconds"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 #, fuzzy
 msgid "Blanking"
 msgstr "Gestapeld"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 #, fuzzy
 msgid "Allow"
 msgstr "Langzaam"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr ""
 
@@ -5480,7 +5635,7 @@ msgid "Configured Shelves"
 msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Scherp"
@@ -5529,11 +5684,6 @@ msgstr ""
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-#, fuzzy
-msgid "Clear"
-msgstr "Dichtbij"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 #, fuzzy
 msgid "Clear All"
@@ -6448,30 +6598,21 @@ msgstr ""
 msgid "Run Command Dialog"
 msgstr "Commando Uitvoeren"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "Start Fout"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: 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:332
+#: src/modules/fileman/e_mod_main.c:322
 #, fuzzy
 msgid "Favorites"
 msgstr "Favoriete Programma's"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 #, fuzzy
 msgid "Root"
 msgstr "Resolutie"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: src/modules/fileman/e_mod_main.c:431
 #, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
@@ -6491,7 +6632,7 @@ msgstr ""
 "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:454
+#: src/modules/fileman/e_mod_main.c:444
 #, fuzzy
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
@@ -6508,100 +6649,108 @@ msgstr ""
 "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:523
+#: src/modules/fileman/e_mod_main.c:513
 #, fuzzy
 msgid "Fileman Settings Updated"
 msgstr "Icon Instellingen"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 #, fuzzy
 msgid "Fileman Settings"
 msgstr "Icon Instellingen"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 #, fuzzy
 msgid "Icon Size"
 msgstr "Icon Grote"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
 msgstr "Beeld"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Grote"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 #, fuzzy
 msgid "Show Desktop Icons"
 msgstr "Stuur naar bureaublad"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:257
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:729
+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:261
-#: src/modules/gadman/e_mod_gadman.c:729
-msgid "Behavior"
+#: 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:1187
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "(Geen toepassingen)"
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Open"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "(Geen toepassingen)"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 #, fuzzy
 msgid "Specific Applications"
 msgstr "(Geen toepassingen)"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 #, fuzzy
 msgid "Custom Command"
 msgstr "Commando Uitvoeren"
@@ -6705,44 +6854,44 @@ msgstr "Verloren Vensters"
 msgid "Select a window"
 msgstr "Selecteer een venster"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 #, fuzzy
 msgid "IBar Settings"
 msgstr "basisinstellingen"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 #, fuzzy
 msgid "Icon Labels"
 msgstr "Icon Klasse"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 #, fuzzy
 msgid "Display App Name"
 msgstr "Display"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 #, fuzzy
 msgid "Display App Comment"
 msgstr "Display"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 #, fuzzy
 msgid "Display App Generic"
 msgstr "Display"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr ""
 
@@ -6760,31 +6909,31 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Weet je zeker dat je dit wilt verwijderen <br><b>%s</b> ?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 #, fuzzy
 msgid "Change Icon Properties"
 msgstr "Eigenschappen"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 #, fuzzy
 msgid "Remove Icon"
 msgstr "Icon maken"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 #, fuzzy
 msgid "Add An Icon"
 msgstr "(Geen toepassingen)"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 #, fuzzy
 msgid "Create New Icon"
 msgstr "Icon maken"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 #, fuzzy
 msgid "Add Application"
 msgstr "(Geen toepassingen)"
@@ -6844,143 +6993,143 @@ msgstr ""
 msgid "Pager Settings"
 msgstr "basisinstellingen"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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"
 
-#: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:164
+#: 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"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 #, fuzzy
 msgid "Popup Settings"
 msgstr "Activerings Instellingen"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 #, fuzzy
 msgid "Show popup for urgent windows"
 msgstr "Match alleen een venster"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 #, fuzzy
 msgid "Select and Slide button"
 msgstr "Selecteer een venster"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 msgid "Click to set"
 msgstr "Klikken om te activeren"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 #, fuzzy
 msgid "Drag whole desktop"
 msgstr "Virtueel bureaublad"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: 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
 msgid "%.0f px"
 msgstr "%1.0f pixels"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 #, fuzzy
 msgid "Resistance to dragging"
 msgstr "Weerstand tussen vensters:"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 #, fuzzy
 msgid "Popup pager height"
 msgstr "Popup snelheid "
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 #, fuzzy
 msgid "Popup speed"
 msgstr "Popup snelheid "
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f seconds"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 #, fuzzy
 msgid "Urgent Window Settings"
 msgstr "Venster oversla lijst"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 #, fuzzy
 msgid "Show popup on urgent window"
 msgstr "Match alleen een venster"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 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:344
+#: src/modules/pager/e_mod_config.c:343
 #, fuzzy
 msgid "Attetion"
 msgstr "Icon"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Onder"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "Activerings Instellingen"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "Bureaubladnaam"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "Bureaublad"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -7254,7 +7403,7 @@ msgstr ""
 msgid "Right:"
 msgstr "Licht"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 #, fuzzy
 msgid "Mute"
 msgstr "Test Menu Item"
@@ -7300,12 +7449,12 @@ msgstr "Activerings Instellingen"
 msgid "Mixer Settings Updated"
 msgstr "Configuratie Vernieuwd"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 #, fuzzy
 msgid "Controls"
 msgstr "Regelaar instellen"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -7343,6 +7492,18 @@ msgstr "(Geen toepassingen)"
 msgid "Networks"
 msgstr ""
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+msgid "Systray"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Virtueel bureaublad"
diff --git a/po/pl.gmo b/po/pl.gmo
index c7b4081..8c38b7a 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 0cc3de6..4b971e2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2009-02-27 09:10+0000\n"
 "Last-Translator: Stanislaw Gackowski <launchpad at soeb.eu>\n"
 "Language-Team: Polish <en at li.org>\n"
@@ -21,20 +21,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "O Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -68,52 +68,54 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Na pewno chcesz zakończyć ten program?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Tak"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nie"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Czy na pewno chcesz wyjść ?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Czy na pewno chcesz wylogować ?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Czy na pewno chcesz wyłączyć ?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Czy na pewno chcesz uruchomić ponownie komputer ?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -121,333 +123,333 @@ msgstr ""
 "Zażądałeś ponownego uruchomienia komputera.<br><br>Czy na pewno chcesz to "
 "zrobić?"
 
-#: src/bin/e_actions.c:2047
+#: src/bin/e_actions.c:2061
 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:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Czy na pewno chcesz zahibernować komputer ?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 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:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Okno : Akcje"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Przesuń"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr ""
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Menu Okna"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Podnieś"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Obniż"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Zabij"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Okno : Stan"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Znacznik Trybu Przyklejenia"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Znacznik Ikonizacji"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Znacznik Trybu Pełnego Ekranu"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maksymalizuj"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Maksymalizuj pionowo"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Maksymalizuj poziomo"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Maksymalizuj na Pełny Ekran"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Tryb Maksymalizacji \"Inteligentny\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Tryb Maksymalizacji \"Rozrzerzaj\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Tryb Maksymalizacji \"Wypełnij\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Znacznik Zwijania Do Góry"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Znacznik Zwijania w Dół"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "Znacznik Zwijania w Lewo"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Znacznik Zwijania w Prawo"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Znacznik Zwijania Do Góry"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Znaczik Braku ramki"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Pulpit"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Przełączaj Pulpity w Lewo"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Przełączaj Pulpity w Prawo"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Przełączaj Pulpity w Górę"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Przełączaj Pulpity w Dół"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Przełączaj Pulpity o..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Pokaż Pulpit"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
 msgstr "Pokaż półkę"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Przełączaj na Pulpit..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Przełączaj Pulpity Liniowo..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Pokaż Nazwę Pulpitu"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Przełącz na Pulpit 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Przełącz na Pulpit 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Przełącz na Pulpit 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Przełącz na Pulpit 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Przełącz na Pulpit 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Przełącz na Pulpit 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Przełącz na Pulpit 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Przełącz na Pulpit 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Przełącz na Pulpit 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Przełącz na Pulpit 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Przełącz na Pulpit 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Przełąćz na Pulpit..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Przejdź do pulpitu 0 (wszędzie)"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Przejdź do pulpitu 1 (wszędzie)"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Przejdź do pulpitu 2 (wszędzie)"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Przejdź do pulpitu 3 (wszędzie)"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Przejdź do pulpitu 4 (wszędzie)"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Przejdź do pulpitu 5 (wszędzie)"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Przejdź do pulpitu 6 (wszędzie)"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Przejdź do pulpitu 7 (wszędzie)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Przejdź do pulpitu 8 (wszędzie)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Przejdź do pulpitu 9 (wszędzie)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Przejdź do pulpitu 10 (wszędzie)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Przejdź do pulpitu 11 (wszędzie)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Przejdź do pulpitu... (wszędzie)"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -457,102 +459,117 @@ msgstr "Przejdź do pulpitu... (wszędzie)"
 msgid "Screen"
 msgstr "Ekran"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Przesuń Mysz na Ekran 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Przesuń Mysz na Ekran 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Przesuń Mysz na Ekran..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Przesuń Mysz do Przodu o 1 Ekran"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Przesuń Mysz do Tyłu o 1 Ekran"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Przesuń Mysz do Przodu/Tyłu o ... Ekranów"
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Okno : Przesuwanie"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "Do Następnego Pulpitu"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Do Poprzedniego Pulpitu"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "O # Pulpitów..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Do Pulpitu..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Pokaż Główne Menu"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Pokaż Menu Ulubione"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Pokaż Menu Wszystkie Aplikacje"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Pokaż Menu Klientów"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Pokaż Menu..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Polecenie"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Aplikacja"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Uruchom Ponownie"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Zakończ"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
 msgstr "Wyłącz teraz"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Moduł %s dla Enlightenment"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Znacznik Trybu Pełnego Ekranu"
+
+#: src/bin/e_actions.c:2813
+#, fuzzy
+msgid "Offline Mode Toggle"
+msgstr "Znacznik Zwijania Do Góry"
+
+#: 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -565,55 +582,55 @@ msgstr "Wyłącz teraz"
 msgid "System"
 msgstr "System"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Wyloguj"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Ponowne uruchamianie"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Usypianie"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Hibernacja"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 msgid "Lock"
 msgstr ""
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Uporządkuj Okna"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr "Ogólne : Akcje"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Ustaw jako tło"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr ""
 
@@ -621,13 +638,14 @@ msgstr ""
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -642,7 +660,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -654,7 +672,7 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 "
@@ -665,7 +683,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -674,11 +692,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
 msgstr "Ustawienia zaktualizowane"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -686,7 +704,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -696,7 +714,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -705,7 +723,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -714,7 +732,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -722,11 +740,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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,7 +770,7 @@ msgid "Modules"
 msgstr "Moduły"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Dodatki"
 
@@ -761,20 +779,20 @@ msgstr "Dodatki"
 msgid "Container %d"
 msgstr "Pojemnik %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Błąd - brak wsparcia dla PAM"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Blokada nie powiodła się"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -782,15 +800,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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Podaj hasło odblokowujące ekran"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Błąd Systemu Uwieżytelniania"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -801,6 +819,25 @@ 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
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Niekompletne Właściwości Okna"
@@ -900,23 +937,23 @@ msgstr "Wybierz Ikonę"
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Skasuj"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Wytnij"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Wklej"
 
@@ -950,260 +987,314 @@ msgstr ""
 "Enlightenment nie był w stanie uruchomić aplikacji:<br><br>%"
 "s<br><br>Aplikacja nie uruchomiła się."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Błąd Wykonania Aplikacji"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s niespodziewanie zakończył działanie"
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Dziennik Błędów"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Nie było wiadomości o błędzie"
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Zapamiętaj Ten Komunikat"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Informacja o Błędzie"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Informacja o Sygnale Błędu"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Dane Wyjściowe"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Nie było danych wyjściowych"
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr "Nieistniejąca ścieżka"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s nieistnieje"
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Błąd Uruchamiania"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Błąd Uruchamiania"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Błąd"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i Plików"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr "Anuluj"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Odświerz Widok"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Pokaż Ukryte Pliki"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nowy Katalog"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Zmień Nazwę"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Czcionka"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Ustawienia"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
 msgstr "Użyj domyślny"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Własne ikony"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Wielkość ikony (%d)"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Ustaw jako tło"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "Zawartość Półki"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr ""
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Stwórz Nowy Katalog"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Nazwa Nowego Katalogu:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Zmień Nazwę %s na:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Zmień Nazwę Pliku"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr "Spróbuj ponownie"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Błąd"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr "Nie dla wszystkich"
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr "Tak dla wszystkich"
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "Ładowanie"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Nie można skasować  <br><highlight>%s</highlight>"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr "Ignoruj"
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr "Ignoruj wszystkie"
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, 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:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Potwierdź Skasowanie"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, 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:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1264,8 +1355,8 @@ msgid "Preview"
 msgstr "Podgląd"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: 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"
 
@@ -1274,7 +1365,7 @@ msgid "Thumbnail"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Własne"
 
@@ -1290,70 +1381,70 @@ msgstr ""
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Zwykły"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Wstawka"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Wygląd"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Automatycznie przewiń zawartość"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Można zmieniać rozmiar"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Usuń Gadżet"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1402,8 +1493,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1411,7 +1502,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Położenie"
 
@@ -1589,12 +1680,12 @@ msgstr "Pełny Ekran"
 msgid "Window List"
 msgstr "Lista Okien"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Pager"
 
@@ -1872,11 +1963,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr "Ustawienia"
 
@@ -1910,8 +2001,8 @@ msgstr "Załadowane moduły"
 msgid "Unload Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1941,12 +2032,12 @@ msgstr "Wybrane Gadżety"
 msgid "Remove Gadget"
 msgstr "Usuń Gadżet"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: 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:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Ułożenie"
 
@@ -2032,122 +2123,122 @@ msgstr "(Brak Okien)"
 msgid "No name!!"
 msgstr "Bez nazwy!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Ustawienia Półek"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Malutki"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Średni"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Duży"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Ogromny"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Zawartość Półki"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Ponad Wszystkim"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Pod Oknami"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Poniżej Wszystkiego"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "Pozwól oknom na przykrywanie półki"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Zmniejsz do Rozmiaru Zawartości"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pikseli"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Style"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr ""
 
@@ -2509,7 +2600,7 @@ msgstr ""
 "Enlightenment nie może ustawić swojego systemu \"przeciągnij i upuść\"."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2696,30 +2787,37 @@ msgstr "Moduł %s dla Enlightenment"
 msgid "Would you like to unload this module?<br>"
 msgstr "Czy chciałbyś wyładować ten moduł?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 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:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 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:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Rozpocznij Przesuwanie/Zmianę Rozmiaru składników"
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Zawartość Półki"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Usuń tę półkę"
 
@@ -2864,7 +2962,7 @@ msgstr ""
 msgid "Set As Theme"
 msgstr ""
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Zawartość Półki"
@@ -2883,67 +2981,67 @@ 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:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bajtów"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "W przyszłości"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "Podczas ostatniej minuty"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li lat temu"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li miesięcy temu"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li tygodni temu"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li dni temu"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li godzin temu"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minut temu"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -2955,7 +3053,7 @@ msgstr "Nieznane"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Dodaj"
 
@@ -2978,7 +3076,7 @@ msgid "Add to Favorites"
 msgstr "Dodaj do Menu Ulubione"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3092,6 +3190,7 @@ msgid "Internal"
 msgstr ""
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
@@ -3103,24 +3202,24 @@ msgstr ""
 msgid "Battery"
 msgstr "Bateria"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr ""
 
@@ -3129,10 +3228,25 @@ msgid "Clock"
 msgstr "Zegar"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
 msgstr ""
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Pozycja"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "Wyłącz"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Moduły"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3155,7 +3269,7 @@ msgid "Restart Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr ""
 
@@ -3511,41 +3625,53 @@ msgstr "Rozciągnij"
 msgid "Desk"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Automatyczne Blokowanie"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: 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:176
+#: 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:180
+#: 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 sekund"
+
+#: 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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 min"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3556,27 +3682,27 @@ msgstr "%1.0f min"
 msgid "Personal"
 msgstr "Osobiste"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Ustawienia Okna Logowania"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
 msgstr "Pokaż wszystkie strefy ekrany"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr "Pokaż na aktualnej strefie ekranu"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
 msgstr "Pokaż w strefie ekranu #:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3585,29 +3711,49 @@ msgstr "Pokaż w strefie ekranu #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Tryb Tła Pulpitu"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
 #: src/modules/gadman/e_mod_config.c:149
 msgid "Theme Defined"
 msgstr "Zdefiniowany w Wystroju"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Tło Pulpitu z Wystroju"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "Tło Pulpitu z Wystroju"
+
+#: 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:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr ""
 
@@ -3615,60 +3761,75 @@ msgstr ""
 msgid "Screen Lock"
 msgstr "Blokada Ekranu"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Ilość Pulpitów"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Przeskakiwanie Między Pulpitami przy pomocy Myszy"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "Animowane przeskakiwanie"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Pulpity"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
 msgstr ""
 "Przeskocz do następnego pulpitu, gdy przeciągany obiekt jest na brzegu ekranu"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: src/modules/conf_desks/e_int_config_desks.c:298
 msgid "Wrap desktops around when flipping"
 msgstr "Zawijaj pulpity przy przełączaniu"
 
-#: src/modules/conf_desks/e_int_config_desks.c:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "Animacja Przeskakiwania"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Wyłącz"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "Przewijanie"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Powiększanie"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 sek"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Zmiana Tła"
+
+#: 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 "Wirtualne Pulpity"
@@ -3684,8 +3845,8 @@ msgstr ""
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -3835,23 +3996,23 @@ msgstr ""
 msgid "Display Power Management Settings"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: 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:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr ""
 
@@ -4420,7 +4581,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pikseli"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4637,7 +4798,7 @@ 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr ""
 
@@ -4982,55 +5143,50 @@ msgstr ""
 msgid "Scaling"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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:168
+#: 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:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f sekund"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr ""
 
@@ -5043,7 +5199,7 @@ msgid "Configured Shelves"
 msgstr "Skonfigurowane Półki"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Uruchamianie"
@@ -5089,10 +5245,6 @@ msgstr ""
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr ""
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr ""
@@ -5948,27 +6100,19 @@ msgstr "Cień"
 msgid "Run Command Dialog"
 msgstr "Okienko Uruchamiania poleceń"
 
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount error"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
 msgstr "Katalog Domowy"
 
-#: src/modules/fileman/e_mod_main.c:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -5979,7 +6123,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -5989,95 +6133,103 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Rozmiar Ikony"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
 msgstr "Widok"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Bazowy Rozmiar"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:257
-msgid "Show HAL icons on desktop"
-msgstr ""
-
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
 msgstr "Zachowanie"
 
-#: src/modules/fileman/e_fwin.c:1187
+#: 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:1462
 msgid "Go to Parent Directory"
 msgstr "Katalog Wyżej"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "Dodaj program..."
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "Aplikacje"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr ""
 
@@ -6166,39 +6318,39 @@ msgstr "Poprzednie Okna"
 msgid "Select a window"
 msgstr "Wybierz Okno"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Wybrane Żródło Paska"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Etykiety Ikon"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Pokaż etykietę ikony"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr ""
 
@@ -6214,27 +6366,27 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Czy na pewno chcesz skasować to źródło paska?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Zmień Ustawienia Ikon"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Usuń Ikonę"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Dodaj Aplikację"
 
@@ -6286,128 +6438,128 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: 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:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr "Ustawienia Okien Popup"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekund"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 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:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6650,7 +6802,7 @@ msgstr ""
 msgid "Right:"
 msgstr ""
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr ""
 
@@ -6690,11 +6842,11 @@ msgstr ""
 msgid "Mixer Settings Updated"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6728,6 +6880,19 @@ msgstr ""
 msgid "Networks"
 msgstr ""
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "System"
+
 #~ msgid "Configure Contents..."
 #~ msgstr "Konfiguracja Zawartości"
 
@@ -7361,9 +7526,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Nie można zmienić nazwy z <hilight>%s</hilight> na <hilight>%s</hilight>"
 
-#~ msgid "Font"
-#~ msgstr "Czcionka"
-
 #~ msgid "Available Applications"
 #~ msgstr "Dostępne Aplikacje"
 
diff --git a/po/pt.gmo b/po/pt.gmo
index 9788add..71c9d44 100644
Binary files a/po/pt.gmo and b/po/pt.gmo differ
diff --git a/po/pt.po b/po/pt.po
index 2336078..fb4b2f7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,14 +1,14 @@
 # Brazilian portuguese translation for Enlightenment
 # This file is put in the public domain.
-#
 # Rodrigo "MDK" Oliveira <mdkcore at gmail.com>, 2007.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment 0.17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
-"PO-Revision-Date: 2007-04-12 23:55-0300\n"
-"Last-Translator: MDK <mdkcore at gmail.com>\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
+"PO-Revision-Date: 2009-04-28 23:53+0100\n"
+"Last-Translator: Jean Dominique Ackle <jdalinux at yahoo.com.br>\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"
@@ -19,20 +19,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Sobre Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -71,49 +71,54 @@ msgid ""
 "window,<br>which has not been saved yet will be lost!<br><br>Are you sure "
 "you want to kill this window?"
 msgstr ""
+"Está prestes a matar %s.<br><br>Por favor tenha presente que todos os dados "
+"desta janela,<br>que ainda não foram gravados, serão perdidos!<br><br>Tem a "
+"certeza que quer matar esta janela?"
 
 #: src/bin/e_actions.c:357
 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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Sim"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Não"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Você tem certeza que deseja sair?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Você tem certeza que deseja deslogar-se?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Você tem certeza que deseja desligar?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -121,11 +126,11 @@ msgstr ""
 "Você requisitiu desligar o seu Computador.<br><br>Você tem certeza que "
 "deseja desligá-lo?"
 
-#: src/bin/e_actions.c:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Você tem certeza que deseja reiniciar?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -133,7 +138,7 @@ msgstr ""
 "Você requisitou reiniciar o seu Computador.<br><br>Você tem certeza que "
 "deseja reiniciá-lo?"
 
-#: src/bin/e_actions.c:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -141,11 +146,11 @@ msgstr ""
 "Você requisitou suspender o seu Computador.<br><br>Você tem certeza que "
 "deseja suspende-lo?"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Você tem certeza que deseja hibernar?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -153,338 +158,338 @@ msgstr ""
 "Você requisitou hibernar o seu Computador.<br><br>Você tem certeza que "
 "deseja suspende-lo ao disco?"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Janela : Ações"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Mover"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Menu da Janela"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Por cima"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Por baixo"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Matar"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Janela : Estado"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Maximizar Verticalmente"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Maximizar Horizontalmente"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Maximizar em Tela Cheia"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Modo de Maximização \"Inteligente\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Modo de Maximização \"Expandir\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Modo de Maximização \"Preencher\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Área de Trabalho"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Virar Área de Trabalho a Esquerda"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Virar Área de Trabalho a Direita"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Virar Área de Trabalho Acima"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Virar Área de Trabalho Abaixo"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Virar Área de Trabalho Por..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Mostrar a Área de Trabalho"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "Mostrar a Área de Trabalho"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Virar Área de Trabalho Para..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Virar Área de Trabalho Linearmente..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Mudar Para Área de Trabalho 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Mudar Para Área de Trabalho 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Mudar Para Área de Trabalho 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Mudar Para Área de Trabalho 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Mudar Para Área de Trabalho 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Mudar Para Área de Trabalho 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Mudar Para Área de Trabalho 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Mudar Para Área de Trabalho 7 "
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Mudar Para Área de Trabalho 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Mudar Para Área de Trabalho 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Mudar Para Área de Trabalho 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Mudar Para Área de Trabalho 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Mudar Para Área de Trabalho..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Virar Área de Trabalho a Esquerda"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Virar Área de Trabalho a Direita"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Virar Área de Trabalho Acima"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Virar Área de Trabalho Abaixo"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Virar Área de Trabalho Por..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Virar Área de Trabalho Para..."
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Virar Área de Trabalho Linearmente..."
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "Virar Área de Trabalho Para..."
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 0"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 1"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 2"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 3"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 4"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 5"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 6"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 7 "
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 8"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 9"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 10"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 11"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Mudar Para Área de Trabalho..."
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -494,103 +499,116 @@ msgstr "Mudar Para Área de Trabalho..."
 msgid "Screen"
 msgstr "Tela"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Enviar Mouse Para Tela 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Enviar Mouse Para Tela 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Enviar Mouse Para Tela..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Enviar Mouse Para Frente 1 Tela"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Enviar Mouse Para Trás 1 Tela"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Enviar Mouse Para Frente/Para Trás Pelas Telas..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Janela : Movimentação"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "Para a Próxima Área de Trabalho"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Para a Área de Trabalho Anterior"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "Por Área de Trabalho #... "
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Para Área de Trabalho..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Mostar Menu Principal"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Mostar Menu de Favoritos"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Mostrar Todos os Menus dos Aplicativos"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Mostrar Lista de Clientes"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Mostrar Menu"
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Comando"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Aplicativo"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Sair"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 #, fuzzy
 msgid "Exit Now"
 msgstr "Sair"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Módulo %s do Enlightenment"
+
+#: src/bin/e_actions.c:2808
+msgid "Presentation Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2813
+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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -603,59 +621,59 @@ msgstr "Sair"
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Deslogar-se"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Hibernar"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 #, fuzzy
 msgid "Lock"
 msgstr "Travas"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Limpar Janelas"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "Travas Genéricas"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Delayed Action"
 msgstr "Ações do Módulo"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 #, fuzzy
 msgid "Set As Background"
 msgstr "Papéis de Parede"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "Área de Trabalho %i, %i"
@@ -665,13 +683,14 @@ msgstr "Área de Trabalho %i, %i"
 msgid "Color Selector"
 msgstr "Seletor de Tema"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -686,7 +705,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -698,7 +717,7 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -718,7 +737,7 @@ msgstr ""
 "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:746
+#: src/bin/e_config.c:760
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -734,12 +753,12 @@ msgstr ""
 "sua configuração será restaurada agora para<br>os padrões. Desculpe pela "
 "inconveniência.<br>"
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "Configurações do Menu"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, fuzzy, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -751,7 +770,7 @@ msgstr ""
 "ocorreu foi:<br>%s<br><br>Este arquivo será apagado para evitar dados "
 "corrompidos.<br>"
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, fuzzy, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -767,7 +786,7 @@ msgstr ""
 "ocorreu foi:<br>%s<br><br>Este arquivo será apagado para evitar dados "
 "corrompidos.<br>"
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, fuzzy, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -780,7 +799,7 @@ msgstr ""
 "precisa de substituição.<br><br>O arquivo onde o erro ocorreu foi:<br>%"
 "s<br><br>Este arquivo será apagado para evitar dados corrompidos.<br>"
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, fuzzy, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -794,7 +813,7 @@ msgstr ""
 "ocorreu foi:<br>%s<br><br>Este arquivo será apagado para evitar dados "
 "corrompidos.<br>"
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, fuzzy, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -806,12 +825,12 @@ msgstr ""
 "foi:<br>%s<br><br>Este arquivo será apagado para evitar dados corrompidos."
 "<br>"
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemas ao Gravar as Configurações do Enlightenment"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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
@@ -837,7 +856,7 @@ msgid "Modules"
 msgstr "Módulos"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Extensões"
 
@@ -846,22 +865,22 @@ msgstr "Extensões"
 msgid "Container %d"
 msgstr "Contêiner %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Erro - sem suporte ao PAM"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 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:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Falha ao Travar"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -869,15 +888,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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Por favor entre com sua senha de destravamento"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Erro no Sistema de Autenticação"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -888,6 +907,25 @@ 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
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Propriedades da Janela Incimpletas"
@@ -993,24 +1031,24 @@ msgstr "Selecione um Ícone"
 msgid "Select an Executable"
 msgstr "Selecione uma Imagem"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 #, fuzzy
 msgid "Cut"
 msgstr "Customizado"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr ""
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 #, fuzzy
 msgid "Paste"
 msgstr "Vidraça"
@@ -1048,271 +1086,326 @@ 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:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Erro na Execução do Aplicativo"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s parou de rodar inesperadamente."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, 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:442
+#: src/bin/e_exec.c:443
 #, 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:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s foi interrompido por um Sinal de Abandono."
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s foi interrompido por um Sinal de Aborto."
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, 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:454
+#: src/bin/e_exec.c:455
 #, 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:457
+#: src/bin/e_exec.c:458
 #, 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:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s foi interrompido por um Pipe Quebrado."
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, 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:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s foi interrompido por um Erro do Bus."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, 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:525
+#: src/bin/e_exec.c:528
 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:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Logs de Erro"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Não ha mensagem de erro."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Salvar Esta Mensagem"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, 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:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Informação do Erro"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Informação do Sinal de Erro"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Dados de Saída"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Não ha saída."
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Erro ao Rodar"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Erro ao Rodar"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Erro ao Rodar"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i Arquivos"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 #, fuzzy
 msgid "Link"
 msgstr "Linear"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 #, fuzzy
 msgid "Abort"
 msgstr "Sobre"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Configurações de Seleção"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 #, fuzzy
 msgid "View Mode"
 msgstr "Modo Básico"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Atualizar Visão"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Mostar Arquivos Ocultos"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "Lembrar Ordem"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Sortear Agora"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Novo Diretório"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Erro ao Rodar"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 #, fuzzy
 msgid "Use default"
 msgstr "Usar Padrão"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 #, fuzzy
 msgid "Grid Icons"
 msgstr "Ícones de Arquivo"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 #, fuzzy
 msgid "Custom Icons"
 msgstr "Customizado"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 #, fuzzy
 msgid "List"
 msgstr "Lista da Janela"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "Tamanho da Fonte:"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Papéis de Parede"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "Conteúdo da Bandeja"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+#, fuzzy
+msgid "Clear"
+msgstr "Próximo"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Criar um Diretório novo"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Nome do Novo Diretório:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renomear %s para:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Renomear Arquivo"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 #, fuzzy
 msgid "Retry"
 msgstr "Reiniciar"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 #, fuzzy
 msgid "Error"
 msgstr "Erro ao Rodar"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "Inicializando %s"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Você tem certeza que deseja apagar<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Confirmar Apagar"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, 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:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1373,8 +1466,8 @@ msgid "Preview"
 msgstr "Prever"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: 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"
 
@@ -1383,7 +1476,7 @@ msgid "Thumbnail"
 msgstr "Miniatura"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Customizado"
 
@@ -1400,70 +1493,70 @@ msgstr "Informação do Erro"
 msgid "Select an Image"
 msgstr "Selecione uma Imagem"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "Desconhecido"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "Dispositivo Removível"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Plano"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Inserido"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Aparência"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Rolar conteúdo automaticamente"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Capaz de ser redimensionado"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Iniciar mover/redimensionar este gadget"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Remover este gadget"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "Parar mover/redimensionar este gadget"
 
@@ -1515,8 +1608,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1524,7 +1617,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Empilhamento"
 
@@ -1711,12 +1804,12 @@ msgstr "Tela Cheia"
 msgid "Window List"
 msgstr "Lista da Janela"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Pager"
 
@@ -1998,11 +2091,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 #, fuzzy
 msgid "Settings"
 msgstr "Configurações do Menu"
@@ -2043,8 +2136,8 @@ msgstr "Módulos"
 msgid "Unload Module"
 msgstr "Erro carregando Módulo"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2075,13 +2168,13 @@ msgstr "Gadgets Selecionados"
 msgid "Remove Gadget"
 msgstr "Remover Gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 #, fuzzy
 msgid "Toolbar Settings"
 msgstr "Configurações dos Módulos"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Esquema"
 
@@ -2167,125 +2260,125 @@ msgstr "(Sem Janelas)"
 msgid "No name!!"
 msgstr "Sem nome!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(Sem Bandejas)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Bandeja #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Adicionar Uma Bandeja"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Apagar Uma Bandeja"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: 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:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Minúsculo"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Médio"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grande"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Gigante"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Conteúdo da Bandeja"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Sobre Qualquer Coisa"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Abaixo das Janelas"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Abaixo de Qualquer Coisa"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Encolher ao Tamanho do Conteúdo"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Estilos"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 #, fuzzy
 msgid "Auto Hide"
 msgstr "Esconder Automaticamente"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "Esconder automaticamente a bandeja"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 #, fuzzy
 msgid "Show on mouse in"
 msgstr "Mostrar na zona da tela #:"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "Timeout para esconder"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f segundos"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "Esconder duração"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 #, fuzzy
 msgid "Show on all Desktops"
 msgstr "Mostrar a Área de Trabalho"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 #, fuzzy
 msgid "Show on specified Desktops"
 msgstr "Mostrar a Área de Trabalho"
@@ -2683,7 +2776,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment não pode ativar seu sistema dnd."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2889,11 +2982,18 @@ msgstr "Módulo %s do Enlightenment"
 msgid "Would you like to unload this module?<br>"
 msgstr "Você vai querer descarregar este módulo?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -2901,20 +3001,20 @@ msgstr ""
 "Você requisitou apagar esta bandeja.<br><br>Você tem certeza que deseja "
 "deletar isso?"
 
-#: src/bin/e_shelf.c:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Parar Movimentar/Redimensionar Items"
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Começar a Movimentar/Redimensionar Items"
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Conteúdo da Bandeja"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Apagar esta Bandeja"
 
@@ -3088,7 +3188,7 @@ msgstr "Sobre Este Tema"
 msgid "Set As Theme"
 msgstr "Selecione um Tema..."
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Conteúdo da Bandeja"
@@ -3104,67 +3204,67 @@ msgid ""
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr "Algumas janelas"
 
-#: src/bin/e_utils.c:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "No Futuro"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "No último Minuto"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Anos atrás"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Meses atrás"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Semanas atrás"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Dias atrás"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Horas atrás"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Minutos atrás"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3176,7 +3276,7 @@ msgstr "Desconhecido"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Adicionar"
 
@@ -3200,7 +3300,7 @@ msgid "Add to Favorites"
 msgstr "Adicionar a Favoritos"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3322,6 +3422,7 @@ msgid "Internal"
 msgstr "Geral"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
@@ -3334,25 +3435,25 @@ msgstr ""
 msgid "Battery"
 msgstr "Bateria"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "Mostrar alerta quando a bateria estiver baixa"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 #, fuzzy
 msgid "Battery Meter"
 msgstr "Bateria"
@@ -3362,11 +3463,26 @@ msgid "Clock"
 msgstr "Relógio"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 #, fuzzy
 msgid "Settings Panel"
 msgstr "Configurações do Menu"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Configurações da Área de Trabalho"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "Tempo da desligar"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Módulos"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3389,7 +3505,7 @@ msgid "Restart Applications"
 msgstr "Reiniciar Aplicativos"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "Todos Aplicativos"
 
@@ -3546,8 +3662,9 @@ msgid "Window Manager"
 msgstr "Gerenciador de Cores da Janela"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:48
+#, fuzzy
 msgid "About Dialog Title"
-msgstr ""
+msgstr "Sobre Este Tema"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:49
 msgid "About Dialog Version"
@@ -3575,8 +3692,9 @@ msgid "Menu Title"
 msgstr "Título"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
+#, fuzzy
 msgid "Menu Title Active"
-msgstr ""
+msgstr "Títulos do Menu de Item"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
 #: src/modules/conf_fonts/e_int_config_fonts.c:62
@@ -3607,8 +3725,9 @@ msgid "Winlist Item"
 msgstr "Lista da Janela"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:60
+#, fuzzy
 msgid "Winlist Label"
-msgstr ""
+msgstr "Lista da Janela"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:61
 #: src/modules/conf_fonts/e_int_config_fonts.c:69
@@ -3633,24 +3752,29 @@ msgid "Button Text Disabled"
 msgstr "Configurações dos Botões"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:70
+#, fuzzy
 msgid "Check Text"
-msgstr ""
+msgstr "Checar bateria a cada:"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:71
+#, fuzzy
 msgid "Check Text Disabled"
-msgstr ""
+msgstr "Configurações dos Botões"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:72
+#, fuzzy
 msgid "Entry Text"
-msgstr ""
+msgstr "Logs de Erro"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
+#, fuzzy
 msgid "Label Text"
-msgstr ""
+msgstr "Rótulos dos Ícones"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:74
+#, fuzzy
 msgid "List Item Text"
-msgstr ""
+msgstr "Menu da Lista do Cliente"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:75
 msgid "List Item Odd Text"
@@ -3663,20 +3787,24 @@ msgid "List Header"
 msgstr "Guia do Cliente"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:77
+#, fuzzy
 msgid "Radio Text"
-msgstr ""
+msgstr "Redimensionar"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:78
+#, fuzzy
 msgid "Radio Text Disabled"
-msgstr ""
+msgstr "Configurações dos Botões"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:79
+#, fuzzy
 msgid "Slider Text"
-msgstr ""
+msgstr "Tamanho"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:80
+#, fuzzy
 msgid "Slider Text Disabled"
-msgstr ""
+msgstr "Configurações dos Botões"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:87
 #, fuzzy
@@ -3768,42 +3896,55 @@ msgstr "Estender"
 msgid "Desk"
 msgstr "Área de Trabalho"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "Configurações de Trava de Tela"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Travamento Automático"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 #, fuzzy
 msgid "Lock when Enlightenment starts"
 msgstr "Usar Cursor do Enlightenment"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: 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:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+msgid "Time after screensaver activated"
+msgstr "Tempo até que o X screensaver alterne"
+
+#: 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 segundos"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
 msgid "Lock when idle time exceeded"
 msgstr "Travar quando o tempo ocioso estiver excedido"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:184
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
 msgid "Idle time to exceed"
 msgstr "Tempo ocioso para exceder"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 minutos"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3814,27 +3955,27 @@ msgstr "%1.0f minutos"
 msgid "Personal"
 msgstr "Pessoal"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Configurações da Caixa de Login "
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
 msgstr "Mostrar em todas as zonas da tela"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr "Mostrar na zona da tela corrente"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
 msgstr "Mostrar na zona da tela #:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3843,29 +3984,49 @@ msgstr "Mostrar na zona da tela #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Modo do Papel de Parede"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
 #: src/modules/gadman/e_mod_config.c:149
 msgid "Theme Defined"
 msgstr "Tema Definido"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Papel de Parede do Tema"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "Usar Papel de Parede do Tema"
+
+#: 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 "Customizar Trava de Tela"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "Usar trava de tela customizada"
 
@@ -3873,60 +4034,75 @@ msgstr "Usar trava de tela customizada"
 msgid "Screen Lock"
 msgstr "Travar Tela"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "Configurações de Áreas de Trabalho Virtuais"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Número de Áreas de Trabalho"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Virar Área de Trabalho com o Mouse"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 #, fuzzy
 msgid "Desktops"
 msgstr "Área de Trabalho"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Virar quando arrastar objetos na beira da tela"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Desligado"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "Vidraça"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 seg"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Mudança de Fundo"
+
+#: 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 "Áreas de Trabalho Virtuais"
@@ -3943,8 +4119,8 @@ msgstr "Ajustes dos Diálogos de Configuração"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -4123,25 +4299,25 @@ msgstr "O servidor de tela corrente não<br>tem a extensão DPMS."
 msgid "Display Power Management Settings"
 msgstr "Ajustes da Exibição de Gerenciamento de Energia"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
 #, fuzzy
 msgid "Enable Display Power Management"
 msgstr "Ativar Exibição de Gerenciamento de Energia"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 #, fuzzy
 msgid "Timers"
 msgstr "Temporizador(es)"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "Tempo para suspenção"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "Tempo para suspender"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "Tempo da desligar"
 
@@ -4456,8 +4632,9 @@ msgid "About Title"
 msgstr "Sobre Este Tema"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:72
+#, fuzzy
 msgid "About Version"
-msgstr ""
+msgstr "Sobre"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:73
 #, fuzzy
@@ -4488,16 +4665,19 @@ msgid "Splash Title"
 msgstr "Título do Display"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:79
+#, fuzzy
 msgid "Splash Text"
-msgstr ""
+msgstr "Título do Display"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:80
+#, fuzzy
 msgid "Splash Version"
-msgstr ""
+msgstr "Título do Display"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:83
+#, fuzzy
 msgid "Entry"
-msgstr ""
+msgstr "Reiniciar"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:84
 #, fuzzy
@@ -4520,12 +4700,14 @@ msgid "Slider"
 msgstr "Tamanho"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:88
+#, fuzzy
 msgid "Radio Buttons"
-msgstr ""
+msgstr "Botão %i"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:89
+#, fuzzy
 msgid "Check Buttons"
-msgstr ""
+msgstr "Botão %i"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:90
 #, fuzzy
@@ -4533,8 +4715,9 @@ msgid "Text List Item"
 msgstr "Menu da Lista do Cliente"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:91
+#, fuzzy
 msgid "List Item"
-msgstr ""
+msgstr "Menu da Lista do Cliente"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:94
 #, fuzzy
@@ -4542,8 +4725,9 @@ msgid "Filemanager"
 msgstr "Gerenciador"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:95
+#, fuzzy
 msgid "Typebuf"
-msgstr ""
+msgstr "Tipo do Arquivo:"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:97
 #, fuzzy
@@ -4551,8 +4735,9 @@ msgid "Desktop Icon"
 msgstr "Travar Área de Trabalho"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:103
+#, fuzzy
 msgid "Small Styled"
-msgstr ""
+msgstr "Normal"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:104
 #, fuzzy
@@ -4560,8 +4745,9 @@ msgid "Normal Styled"
 msgstr "Normal"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:105
+#, fuzzy
 msgid "Large Styled"
-msgstr ""
+msgstr "Normal"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
@@ -4747,7 +4933,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pixels"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4973,7 +5159,7 @@ msgid "Select an Edj File"
 msgstr "Selecione um Arquivo Edj"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Arquivos"
 
@@ -5338,55 +5524,50 @@ msgstr "Tamanho Máximo"
 msgid "Scaling"
 msgstr "Empilhamento"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Configurações da Proteção de Tela"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 "Habilitar X screensaver"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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 "Tempo(s) da Porteção de Tela"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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 "Tempo até que o X screensaver inicie"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
 msgstr "Tempo até que o X screensaver alterne"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f segundos"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "Blanqueando"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Preferido"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "Não Preferido"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr "Eventos de Exposição"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Permitir"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "Não Permitir"
 
@@ -5399,7 +5580,7 @@ msgid "Configured Shelves"
 msgstr "Bandejas Configuradas"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Inicializar"
@@ -5448,11 +5629,6 @@ msgstr "Categorias"
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-#, fuzzy
-msgid "Clear"
-msgstr "Próximo"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 #, fuzzy
 msgid "Clear All"
@@ -6341,29 +6517,20 @@ msgstr ""
 msgid "Run Command Dialog"
 msgstr "Janela de Diálogo para Executar Comando"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "Erro ao Rodar"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: 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:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 #, fuzzy
 msgid "Root"
 msgstr "Reiniciar"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: src/modules/fileman/e_mod_main.c:431
 #, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
@@ -6383,7 +6550,7 @@ msgstr ""
 "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:454
+#: src/modules/fileman/e_mod_main.c:444
 #, fuzzy
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
@@ -6400,103 +6567,111 @@ msgstr ""
 "sua configuração será restaurada agora para<br>os padrões. Desculpe pela "
 "inconveniência.<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 #, fuzzy
 msgid "Fileman Settings Updated"
 msgstr "Configurações do Menu"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 #, fuzzy
 msgid "Fileman Settings"
 msgstr "Configurações do Menu"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 #, fuzzy
 msgid "Icon Size"
 msgstr "Tamanho da Fonte:"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 #, fuzzy
 msgid "View"
 msgstr "Modo Básico"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Tamanho Base"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 #, fuzzy
 msgid "Show Icon Extension"
 msgstr "Mostrar Rótulo do Ícone"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 #, fuzzy
 msgid "Show Desktop Icons"
 msgstr "Mostrar a Área de Trabalho"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 #, fuzzy
 msgid "Show Toolbar"
 msgstr "Cor da Sombra"
 
-#: src/modules/fileman/e_mod_config.c:257
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:729
+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"
 
-#: src/modules/fileman/e_mod_config.c:261
-#: src/modules/gadman/e_mod_gadman.c:729
-msgid "Behavior"
+#: src/modules/fileman/e_mod_config.c:273
+msgid "Mount volumes on insert"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1187
+#: src/modules/fileman/e_mod_config.c:276
+msgid "Open filemanager on mount"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr "Ir para Diretório Acima"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "Adicionar Aplicação"
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Abrir"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Abrir com..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "Aplicativos"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Aplicativos Específicos"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 #, fuzzy
 msgid "Custom Command"
 msgstr "Executar Comando"
@@ -6598,40 +6773,40 @@ msgstr "Janela Anterior"
 msgid "Select a window"
 msgstr "Selecione uma janela"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 #, fuzzy
 msgid "IBar Settings"
 msgstr "Configurações Básicas"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Selecionada Fonte da Barra"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Rótulos dos Ícones"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Mostrar Rótulo do Ícone"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "Mostrar Nome da Aplicação"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "Mostrar Comentário da Aplicação"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "Mostrar Aplicação Genérica"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "Criar nova fonte do iBar"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "Entre com um nome para esta nova fonte:"
 
@@ -6648,29 +6823,29 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Você tem certeza que deseja apagar esta fonte da barra?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "iBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Mudar Propriedades do Ícone"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Remover Ícone"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 #, fuzzy
 msgid "Add An Icon"
 msgstr "Adicionar Aplicação"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 #, fuzzy
 msgid "Create New Icon"
 msgstr "Criar Ícone"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Adicionar Aplicação"
 
@@ -6727,101 +6902,101 @@ msgstr "iBox"
 msgid "Pager Settings"
 msgstr "Ajustes do Cache"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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"
 
-#: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:164
+#: 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"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr "Configurações do Popup"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 #, fuzzy
 msgid "Show popup on desktop change"
 msgstr "Mostrar Popup ao mudar área de trabalho"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 #, fuzzy
 msgid "Show popup for urgent windows"
 msgstr "Mostrar Popup na janela urgente"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 #, fuzzy
 msgid "Select and Slide button"
 msgstr "Selecione um Ícone"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "Clique para setar"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 #, fuzzy
 msgid "Drag and Drop button"
 msgstr "Arraste e selecione botão"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 #, fuzzy
 msgid "Drag whole desktop"
 msgstr "Área de Trabalho Virtual"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 #, fuzzy
 msgid "Resistance to dragging"
 msgstr "Resistência para Arrastar Janelas:"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 #, fuzzy
 msgid "Popup pager height"
 msgstr "Velocidade do Popup"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 #, fuzzy
 msgid "Popup speed"
 msgstr "Velocidade do Popup"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f segundos"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 #, fuzzy
 msgid "Urgent Window Settings"
 msgstr "Ajustes da Janela da Lista"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 #, fuzzy
 msgid "Show popup on urgent window"
 msgstr "Mostrar Popup na janela urgente"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr "Arrastar Botão do Pager"
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6829,12 +7004,12 @@ 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:344
+#: src/modules/pager/e_mod_config.c:343
 #, fuzzy
 msgid "Attetion"
 msgstr "Ação"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 #, fuzzy
 msgid ""
 "You cannot use the right mouse button in the<br>shelf for this as it is "
@@ -6844,32 +7019,32 @@ 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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Botão %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "Virar Área de Trabalho a Direita"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "Virar Área de Trabalho a Esquerda"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "Virar Área de Trabalho Acima"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "Virar Área de Trabalho Abaixo"
@@ -7138,7 +7313,7 @@ msgstr ""
 msgid "Right:"
 msgstr "Claro"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr ""
 
@@ -7183,12 +7358,12 @@ msgstr "Configurações dos Módulos"
 msgid "Mixer Settings Updated"
 msgstr "Configuração Atualizada"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 #, fuzzy
 msgid "Controls"
 msgstr "Sistema"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -7226,6 +7401,35 @@ msgstr "Aplicativos Específicos"
 msgid "Networks"
 msgstr ""
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "Sistema"
+
+#, fuzzy
+#~ msgid "Add File"
+#~ msgstr "Adicionar Tecla"
+
+#, fuzzy
+#~ msgid "Add Gradient"
+#~ msgstr "Adicionar Gadget"
+
+#, fuzzy
+#~ msgid "Add Online"
+#~ msgstr "Adicionar Ligação"
+
+#, fuzzy
+#~ msgid "Wallpaper 2"
+#~ msgstr "Papel de Parede"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Configurar Áreas de Trabalho Virtuais"
 
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 2f90945..74bb334 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 54da0b5..1d7b9dd 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-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2008-01-24 01:22-0200\n"
 "Last-Translator: Rodrigo -MDK- Oliveira <mdkcore at gmail.com>\n"
 "Language-Team: None. But contact-me on <mdkcore at gmail.com>\n"
@@ -19,20 +19,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Sobre Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -76,44 +76,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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Sim"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Não"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Você tem certeza que deseja sair?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Você tem certeza que deseja deslogar-se?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Você tem certeza que deseja desligar?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -121,11 +123,11 @@ msgstr ""
 "Você requisitiu desligar o seu Computador.<br><br>Você tem certeza que "
 "deseja desligá-lo?"
 
-#: src/bin/e_actions.c:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Você tem certeza que deseja reiniciar?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -133,7 +135,7 @@ msgstr ""
 "Você requisitou reiniciar o seu Computador.<br><br>Você tem certeza que "
 "deseja reiniciá-lo?"
 
-#: src/bin/e_actions.c:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -141,11 +143,11 @@ msgstr ""
 "Você requisitou suspender o seu Computador.<br><br>Você tem certeza que "
 "deseja suspende-lo?"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Você tem certeza que deseja hibernar?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -153,338 +155,338 @@ msgstr ""
 "Você requisitou hibernar o seu Computador.<br><br>Você tem certeza que "
 "deseja suspende-lo ao disco?"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Janela : Ações"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Mover"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Menu da Janela"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Por cima"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Por baixo"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Matar"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Janela : Estado"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Alternar Modo Viscoso"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Alternar Modo de Iconificação"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Alternar Modo Tela Cheia"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Maximizar Verticalmente"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Maximizar Horizontalmente"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Maximizar em Tela Cheia"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Modo de Maximização \"Inteligente\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Modo de Maximização \"Expandir\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Modo de Maximização \"Preencher\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Alternar Modo de Sombra para Cima"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Alternar Modo de Sombra para Baixo"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "Alternar Modo de Sombra para Esquerda"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Alternar Modo de Sobra para Direita"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Alternar Modo de Sombra"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Alernar Estado Sem Borda"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "Alternar Estado Rreso"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Área de Trabalho"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Virar Área de Trabalho a Esquerda"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Virar Área de Trabalho a Direita"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Virar Área de Trabalho Acima"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Virar Área de Trabalho Abaixo"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Virar Área de Trabalho Por..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Mostrar a Área de Trabalho"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "Mostrar a Área de Trabalho"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Virar Área de Trabalho Para..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Virar Área de Trabalho Linearmente..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Mudar Para Área de Trabalho 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Mudar Para Área de Trabalho 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Mudar Para Área de Trabalho 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Mudar Para Área de Trabalho 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Mudar Para Área de Trabalho 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Mudar Para Área de Trabalho 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Mudar Para Área de Trabalho 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Mudar Para Área de Trabalho 7 "
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Mudar Para Área de Trabalho 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Mudar Para Área de Trabalho 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Mudar Para Área de Trabalho 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Mudar Para Área de Trabalho 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Mudar Para Área de Trabalho..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Virar Área de Trabalho a Esquerda"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Virar Área de Trabalho a Direita"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Virar Área de Trabalho Acima"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Virar Área de Trabalho Abaixo"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Virar Área de Trabalho Por..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Virar Área de Trabalho Para..."
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Virar Área de Trabalho Linearmente..."
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "Virar Área de Trabalho Para..."
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 0"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 1"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 2"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 3"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 4"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 5"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 6"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 7 "
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 8"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 9"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 10"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Mudar Para Área de Trabalho 11"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Mudar Para Área de Trabalho..."
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -494,103 +496,118 @@ msgstr "Mudar Para Área de Trabalho..."
 msgid "Screen"
 msgstr "Tela"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Enviar Mouse Para Tela 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Enviar Mouse Para Tela 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Enviar Mouse Para Tela..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Enviar Mouse Para Frente 1 Tela"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Enviar Mouse Para Trás 1 Tela"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Enviar Mouse Para Frente/Para Trás Pelas Telas..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Janela : Movimentação"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "Para a Próxima Área de Trabalho"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Para a Área de Trabalho Anterior"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "Por Área de Trabalho #... "
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Para Área de Trabalho..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Mostar Menu Principal"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Mostar Menu de Favoritos"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Mostrar Todos os Menus dos Aplicativos"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Mostrar Lista de Clientes"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Mostrar Menu"
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Comando"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Aplicativo"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Sair"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 #, fuzzy
 msgid "Exit Now"
 msgstr "Sair"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Módulo %s do Enlightenment"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Alternar Modo Tela Cheia"
+
+#: src/bin/e_actions.c:2813
+#, fuzzy
+msgid "Offline Mode Toggle"
+msgstr "Alternar Modo de Sombra"
+
+#: 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -603,58 +620,58 @@ msgstr "Sair"
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Deslogar-se"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Hibernar"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 #, fuzzy
 msgid "Lock"
 msgstr "Travas"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Limpar Janelas"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "Janela : Ações"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Delayed Action"
 msgstr "Aplicativos Selecionados"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Colocar Como Papel de Parede"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "Varredura nos arquivos da Área de Trabalho pronta"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "Varredura por arquivo na Área de Trabalho"
 
@@ -663,13 +680,14 @@ msgstr "Varredura por arquivo na Área de Trabalho"
 msgid "Color Selector"
 msgstr "Seletor de Perfil"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -684,7 +702,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -696,7 +714,7 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -716,7 +734,7 @@ msgstr ""
 "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:746
+#: src/bin/e_config.c:760
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -732,12 +750,12 @@ msgstr ""
 "sua configuração será restaurada agora para<br>os padrões. Desculpe pela "
 "inconveniência.<br>"
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "Configurações da Área de Trabalho"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, fuzzy, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -749,7 +767,7 @@ msgstr ""
 "ocorreu foi:<br>%s<br><br>Este arquivo será apagado para evitar dados "
 "corrompidos.<br>"
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, fuzzy, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -765,7 +783,7 @@ msgstr ""
 "ocorreu foi:<br>%s<br><br>Este arquivo será apagado para evitar dados "
 "corrompidos.<br>"
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, fuzzy, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -778,7 +796,7 @@ msgstr ""
 "precisa de substituição.<br><br>O arquivo onde o erro ocorreu foi:<br>%"
 "s<br><br>Este arquivo será apagado para evitar dados corrompidos.<br>"
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, fuzzy, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -792,7 +810,7 @@ msgstr ""
 "ocorreu foi:<br>%s<br><br>Este arquivo será apagado para evitar dados "
 "corrompidos.<br>"
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, fuzzy, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -804,12 +822,12 @@ msgstr ""
 "foi:<br>%s<br><br>Este arquivo será apagado para evitar dados corrompidos."
 "<br>"
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemas ao Gravar as Configurações do Enlightenment"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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
@@ -835,7 +853,7 @@ msgid "Modules"
 msgstr "Módulos"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Extensões"
 
@@ -844,22 +862,22 @@ msgstr "Extensões"
 msgid "Container %d"
 msgstr "Contêiner %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Erro - sem suporte ao PAM"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 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:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Falha ao Travar"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -867,15 +885,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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Por favor entre com sua senha de destravamento"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Erro no Sistema de Autenticação"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -886,6 +904,25 @@ 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
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Propriedades da Janela Incimpletas"
@@ -986,23 +1023,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:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Colar"
 
@@ -1038,268 +1075,322 @@ 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:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Erro na Execução do Aplicativo"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s parou de rodar inesperadamente."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, 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:442
+#: src/bin/e_exec.c:443
 #, 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:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s foi interrompido por um Sinal de Abandono."
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s foi interrompido por um Sinal de Aborto."
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, 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:454
+#: src/bin/e_exec.c:455
 #, 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:457
+#: src/bin/e_exec.c:458
 #, 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:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s foi interrompido por um Pipe Quebrado."
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, 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:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s foi interrompido por um Erro do Bus."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, 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:525
+#: src/bin/e_exec.c:528
 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:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Logs de Erro"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Não ha mensagem de erro."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Salvar Esta Mensagem"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, 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:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Informação do Erro"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Informação do Sinal de Erro"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Dados de Saída"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Não ha saída."
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 #, fuzzy
 msgid "Nonexistent path"
 msgstr "Caminho inexistente"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, fuzzy, c-format
 msgid "%s doesn't exist."
 msgstr "%s não existe"
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Erro ao Rodar"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Erro ao Rodar"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Erro ao Rodar"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i Arquivos"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 #, fuzzy
 msgid "Link"
 msgstr "Linear"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 #, fuzzy
 msgid "Abort"
 msgstr "Sobre"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Configurações de Seleção"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Modo de Visão"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Atualizar Visão"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Mostar Arquivos Ocultos"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "Lembrar Ordem"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Sortear Agora"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Novo Diretório"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Títulos do Menu de Item"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 #, fuzzy
 msgid "Use default"
 msgstr "Usar Padrão"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Ícones Customizados"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "Tamanho do Ícone"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Colocar Como Papel de Parede"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "Conteúdo da Bandeja"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Limpar"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Criar um Diretório novo"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Nome do Novo Diretório:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renomear %s para:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Renomear Arquivo"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 #, fuzzy
 msgid "Retry"
 msgstr "Reiniciar"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 #, fuzzy
 msgid "Error"
 msgstr "Erro ao Rodar"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "Iniciando"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Você tem certeza que deseja apagar<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Confirmar Apagar"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, 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:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1360,8 +1451,8 @@ msgid "Preview"
 msgstr "Prever"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: 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"
 
@@ -1370,7 +1461,7 @@ msgid "Thumbnail"
 msgstr "Miniatura"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Customizado"
 
@@ -1386,70 +1477,70 @@ msgstr "Informação de Ligação"
 msgid "Select an Image"
 msgstr "Selecione uma Imagem"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volume Desconhecido"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "Dispositivo Removível"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Plano"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Inserido"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Aparência"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Rolar conteúdo automaticamente"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Capaz de ser redimensionado"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Iniciar mover/redimensionar este gadget"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Remover este gadget"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "Parar mover/redimensionar este gadget"
 
@@ -1501,8 +1592,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1510,7 +1601,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Empilhamento"
 
@@ -1693,12 +1784,12 @@ msgstr "Tela Cheia"
 msgid "Window List"
 msgstr "Lista da Janela"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Pager"
 
@@ -1978,11 +2069,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 #, fuzzy
 msgid "Settings"
 msgstr "Configurações da Área de Trabalho"
@@ -2018,8 +2109,8 @@ msgstr "Módulos Carregados"
 msgid "Unload Module"
 msgstr "Descarregar Módulo"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2049,13 +2140,13 @@ msgstr "Gadgets Selecionados"
 msgid "Remove Gadget"
 msgstr "Remover Gadget"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 #, fuzzy
 msgid "Toolbar Settings"
 msgstr "Configurações do Pager"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Esquema"
 
@@ -2141,123 +2232,123 @@ msgstr "(Sem Janelas)"
 msgid "No name!!"
 msgstr "Sem nome!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(Sem Bandejas)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Bandeja #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Adicionar Uma Bandeja"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Apagar Uma Bandeja"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: 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:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Minúsculo"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Médio"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grande"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Gigante"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Conteúdo da Bandeja"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Sobre Qualquer Coisa"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Abaixo das Janelas"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Abaixo de Qualquer Coisa"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 #, fuzzy
 msgid "Allow windows to overlap the shelf"
 msgstr "Permitir que as janelas sobrepões a prateleira"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Encolher ao Tamanho do Conteúdo"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Estilos"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "Esconder Automaticamente"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "Esconder automaticamente a bandeja"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "Mostrar com o mouse em"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "Mostrar com o clique do mouse"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "Timeout para esconder"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f segundos"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "Esconder duração"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "Mostrar em todas as Áreas de Trabalho"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "Mostrar numa Área de Trabalho específica"
 
@@ -2648,7 +2739,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment não pode ativar seu sistema dnd."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2848,11 +2939,18 @@ msgstr "Módulo %s do Enlightenment"
 msgid "Would you like to unload this module?<br>"
 msgstr "Você vai querer descarregar este módulo?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -2860,20 +2958,20 @@ msgstr ""
 "Você requisitou apagar esta bandeja.<br><br>Você tem certeza que deseja "
 "deletar isso?"
 
-#: src/bin/e_shelf.c:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Parar Movimentar/Redimensionar Items"
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Começar a Movimentar/Redimensionar Items"
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Conteúdo da Bandeja"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Apagar esta Bandeja"
 
@@ -3045,7 +3143,7 @@ msgstr "Sobre Este Tema"
 msgid "Set As Theme"
 msgstr "Definir como Tema..."
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Conteúdo da Barra de Ferramentas"
@@ -3061,67 +3159,67 @@ msgid ""
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr "Algumas janelas"
 
-#: src/bin/e_utils.c:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "No Futuro"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "No último Minuto"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Anos atrás"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Meses atrás"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Semanas atrás"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Dias atrás"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Horas atrás"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Minutos atrás"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3133,7 +3231,7 @@ msgstr "Desconhecido"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Adicionar"
 
@@ -3156,7 +3254,7 @@ msgid "Add to Favorites"
 msgstr "Adicionar a Favoritos"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3277,6 +3375,7 @@ msgid "Internal"
 msgstr "Interno"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
@@ -3289,25 +3388,25 @@ msgstr ""
 msgid "Battery"
 msgstr "Bateria"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "Mostrar alerta quando a bateria estiver baixa"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr "Medidor de Bateria"
 
@@ -3316,11 +3415,26 @@ msgid "Clock"
 msgstr "Relógio"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 #, fuzzy
 msgid "Settings Panel"
 msgstr "Configurações da Área de Trabalho"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Configurações da Área de Trabalho"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "Tempo da desligar"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Módulos"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3343,7 +3457,7 @@ msgid "Restart Applications"
 msgstr "Reiniciar Aplicativos"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "Todos Aplicativos"
 
@@ -3718,42 +3832,55 @@ msgstr "Selecionar"
 msgid "Desk"
 msgstr "Área de Trabalho"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "Configurações de Trava de Tela"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Travamento Automático"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 #, fuzzy
 msgid "Lock when Enlightenment starts"
 msgstr "Usar Cursor do Enlightenment"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: 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:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+msgid "Time after screensaver activated"
+msgstr "Tempo até que o X screensaver alterne"
+
+#: 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 segundos"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
 msgid "Lock when idle time exceeded"
 msgstr "Travar quando o tempo ocioso estiver excedido"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:184
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
 msgid "Idle time to exceed"
 msgstr "Tempo ocioso para exceder"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 minutos"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3764,27 +3891,27 @@ msgstr "%1.0f minutos"
 msgid "Personal"
 msgstr "Pessoal"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Configurações da Caixa de Login "
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
 msgstr "Mostrar em todas as zonas da tela"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr "Mostrar na zona da tela corrente"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
 msgstr "Mostrar na zona da tela #:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3793,29 +3920,49 @@ msgstr "Mostrar na zona da tela #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Modo do Papel de Parede"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
 #: src/modules/gadman/e_mod_config.c:149
 msgid "Theme Defined"
 msgstr "Tema Definido"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Papel de Parede do Tema"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "Usar Papel de Parede do Tema"
+
+#: 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 "Customizar Trava de Tela"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "Usar trava de tela customizada"
 
@@ -3823,60 +3970,75 @@ msgstr "Usar trava de tela customizada"
 msgid "Screen Lock"
 msgstr "Travar Tela"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "Configurações de Áreas de Trabalho Virtuais"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Número de Áreas de Trabalho"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Virar Área de Trabalho com o Mouse"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Áreas de Trabalho"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Virar quando arrastar objetos na beira da tela"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: src/modules/conf_desks/e_int_config_desks.c:298
 #, fuzzy
 msgid "Wrap desktops around when flipping"
 msgstr "Girar áreas de trabalho em volta quando XXX"
 
-#: src/modules/conf_desks/e_int_config_desks.c:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Desligado"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "Vidraça"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 seg"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Mudança de Fundo"
+
+#: 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 "Áreas de Trabalho Virtuais"
@@ -3892,8 +4054,8 @@ msgstr "Configurações dos Diálogos"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -4070,24 +4232,24 @@ msgstr "O servidor de tela corrente não<br>tem a extensão DPMS."
 msgid "Display Power Management Settings"
 msgstr "Configurações de Gerenciamento de Energia da Tela"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
 msgid "Enable Display Power Management"
 msgstr "Ativar Gerenciamento de Energia da Tela"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 #, fuzzy
 msgid "Timers"
 msgstr "Temporizador(es)"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "Tempo para suspenção"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "Tempo para suspender"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "Tempo da desligar"
 
@@ -4695,7 +4857,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pixels"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4918,7 +5080,7 @@ msgid "Select an Edj File"
 msgstr "Selecione um Arquivo Edj"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Arquivos"
 
@@ -5280,55 +5442,50 @@ msgstr "Tamanho Máximo"
 msgid "Scaling"
 msgstr "Empilhamento"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Configurações da Proteção de Tela"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 "Habilitar X screensaver"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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 "Tempo(s) da Porteção de Tela"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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 "Tempo até que o X screensaver inicie"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
 msgstr "Tempo até que o X screensaver alterne"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f segundos"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "Blanqueando"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Preferido"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "Não Preferido"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr "Eventos de Exposição"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Permitir"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "Não Permitir"
 
@@ -5341,7 +5498,7 @@ msgid "Configured Shelves"
 msgstr "Bandejas Configuradas"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Configurar FM"
@@ -5389,10 +5546,6 @@ msgstr "Categorias de Temas"
 msgid "Assign"
 msgstr "Atribuir"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "Limpar"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "Limpar Tudo"
@@ -6279,30 +6432,21 @@ msgstr ""
 msgid "Run Command Dialog"
 msgstr "Janela de Diálogo para Executar Comando"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "Erro ao Rodar"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: 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:332
+#: src/modules/fileman/e_mod_main.c:322
 #, fuzzy
 msgid "Favorites"
 msgstr "Menu de Favoritos"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 #, fuzzy
 msgid "Root"
 msgstr "Reiniciar"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: src/modules/fileman/e_mod_main.c:431
 #, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
@@ -6322,7 +6466,7 @@ msgstr ""
 "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:454
+#: src/modules/fileman/e_mod_main.c:444
 #, fuzzy
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
@@ -6339,99 +6483,107 @@ msgstr ""
 "sua configuração será restaurada agora para<br>os padrões. Desculpe pela "
 "inconveniência.<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 #, fuzzy
 msgid "Fileman Settings Updated"
 msgstr "Configurações do Menu"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 #, fuzzy
 msgid "Fileman Settings"
 msgstr "Configurações do Menu"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Tamanho do Ícone"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 #, fuzzy
 msgid "View"
 msgstr "Modo de Visão"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr "Abrir Diretórino num Lugar"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "Ordenar Diretórios Primeiro"
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Tamanho Base"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "Usar Clique Único"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr "Mostrar Extensão do Ícone"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "Mostrar Caminho Completo"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr "Mostrar Ícones da Área de Trabalho"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr "Mostrar Barra de Ferramentas"
 
-#: src/modules/fileman/e_mod_config.c:257
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:729
+msgid "Behavior"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:270
 #, fuzzy
 msgid "Show HAL icons on desktop"
 msgstr "Mostrar em todas as Áreas de Trabalho"
 
-#: src/modules/fileman/e_mod_config.c:261
-#: src/modules/gadman/e_mod_gadman.c:729
-msgid "Behavior"
+#: 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:1187
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr "Ir para Diretório Acima"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "Adicionar Aplicação"
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Abrir"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Abrir com..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "Aplicativos"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Aplicativos Específicos"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr "Comando Customizado"
 
@@ -6532,40 +6684,40 @@ msgstr "Janela Anterior"
 msgid "Select a window"
 msgstr "Selecione uma janela"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 #, fuzzy
 msgid "IBar Settings"
 msgstr "Configurações Básicas"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Selecionada Fonte da Barra"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Rótulos dos Ícones"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Mostrar Rótulo do Ícone"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "Mostrar Nome da Aplicação"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "Mostrar Comentário da Aplicação"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "Mostrar Aplicação Genérica"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "Criar nova fonte do iBar"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "Entre com um nome para esta nova fonte:"
 
@@ -6582,27 +6734,27 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Você tem certeza que deseja apagar esta fonte da barra?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "iBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Mudar Propriedades do Ícone"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Remover Ícone"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr "Adicionar Um Ícone"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr "Criar Ícone Novo"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Adicionar Aplicação"
 
@@ -6656,99 +6808,99 @@ msgstr "iBox"
 msgid "Pager Settings"
 msgstr "Configurações do Pager"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 msgid "Flip desktop on mouse wheel"
 msgstr "Virar área de trabalho com a roda do mouse"
 
-#: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:164
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 #, fuzzy
 msgid "Show desktop names"
 msgstr "Mostrar Ícones da Área de Trabalho"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 #, fuzzy
 msgid "Popup Settings"
 msgstr "Configurações do Popup do Pager"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 #, fuzzy
 msgid "Show popup on desktop change"
 msgstr "Mostrar Popup ao mudar área de trabalho"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 #, fuzzy
 msgid "Show popup for urgent windows"
 msgstr "Mostrar Popup sobre janela urgente"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr "Botão Selecione e Deslize"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "Clique para setar"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 #, fuzzy
 msgid "Drag and Drop button"
 msgstr "Botão Arrastar e Soltar"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 #, fuzzy
 msgid "Drag whole desktop"
 msgstr "Área de Trabalho Virtual"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "Resistência ao arrastar"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 #, fuzzy
 msgid "Popup pager height"
 msgstr "Altura do Popup do Pager"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 #, fuzzy
 msgid "Popup speed"
 msgstr "Velocidade do Popup"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f segundos"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 #, fuzzy
 msgid "Urgent Window Settings"
 msgstr "Ajustes da Janela da Lista"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 #, fuzzy
 msgid "Show popup on urgent window"
 msgstr "Mostrar Popup sobre janela urgente"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr "Arrastar Botão do Pager"
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6756,12 +6908,12 @@ 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:344
+#: src/modules/pager/e_mod_config.c:343
 #, fuzzy
 msgid "Attetion"
 msgstr "Ação"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 #, fuzzy
 msgid ""
 "You cannot use the right mouse button in the<br>shelf for this as it is "
@@ -6771,33 +6923,33 @@ 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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Botão %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 #, fuzzy
 msgid "Show Pager Popup"
 msgstr "Configurações do Popup do Pager"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "Virar Área de Trabalho a Direita"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "Virar Área de Trabalho a Esquerda"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "Virar Área de Trabalho Acima"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "Virar Área de Trabalho Abaixo"
@@ -7067,7 +7219,7 @@ msgstr ""
 msgid "Right:"
 msgstr "Claro"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 #, fuzzy
 msgid "Mute"
 msgstr "Títulos do Menu de Item"
@@ -7114,12 +7266,12 @@ msgstr "Configurações dos Módulos"
 msgid "Mixer Settings Updated"
 msgstr "Configuração Atualizada"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 #, fuzzy
 msgid "Controls"
 msgstr "Configurar Controles do Sistema"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -7158,6 +7310,19 @@ msgstr "Aplicativos Específicos"
 msgid "Networks"
 msgstr ""
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "Sistema"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Configurar Áreas de Trabalho Virtuais"
 
diff --git a/po/ru.gmo b/po/ru.gmo
index 3f76f31..f99c8ba 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index 603cbd7..2424635 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment 0.17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2009-02-08 20:27+0000\n"
 "Last-Translator: Koptev Oleg <koptev.oleg at gmail.com>\n"
 "Language-Team: Koptev Oleg\n"
@@ -19,20 +19,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Об Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -78,43 +78,45 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Вы действительно хотите убить это окно?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Да"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Нет"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Вы действительно хотите выйти?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Вы запросили выйти из Enlightenment.<br><br>Вы действительно хотите выйти?"
 
-#: src/bin/e_actions.c:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Вы действительно хотите завершить сессию?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Вы действительно хотите выключить компьютер?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -122,28 +124,28 @@ msgstr ""
 "Вы запросили выключить ваш компьютер.<br><br>Вы действительно хотите "
 "выключить?"
 
-#: src/bin/e_actions.c:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Вы действительно хотите перегрузить компьютер?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 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:2047
+#: src/bin/e_actions.c:2061
 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:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Вы действительно хотите \"заморозить\" систему?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -151,316 +153,316 @@ msgstr ""
 "Вы запросили \"заморозить\" ваш компьютер.<br><br>Вы действительно хотите "
 "этого?"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Окно: Действия"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Двигать"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Изменить Размер"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Меню"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Меню Окна"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Повысить"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Понизить"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Убить"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Окно: Состояние"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Включить Режим Окна \"Липкий\""
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Переключить Режим Иконки"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Переключить Полноэкранный Режим"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Увеличить"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Увеличить вертикально"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Увеличить горизонтально"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Увеличить в Полный Экран"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Режим Увеличения \"Умный\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Режим Увеличения \"Расширить\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Режим Увеличения \"Заполнить\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Переключить Режим Свернуть Вверх"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Переключить Режим Свернуть Вниз"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "Переключить Режим Свернуть Влево"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Переключить Режим Свернуть Вправо"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Переключить Свёрнутый Режим"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Переключить Режим Без Бордюра"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "Переключить Режим Прикрепления"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Рабочий стол"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Перенести Стол Влево"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Перенести Стол Вправо"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Перенести Стол Вверх"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Перенести Стол Вниз"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Перенести Стол По..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Показать Рабочий Стол"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
 msgstr ""
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Перенести Стол На..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Перенести Стол Линейно..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Переключить на Рабочий Стол 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Переключить на Рабочий Стол 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Переключить на Рабочий Стол 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Переключить на Рабочий Стол 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Переключить на Рабочий Стол 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Переключить на Рабочий Стол 6"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Переключить на Рабочий Стол 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Переключить на Рабочий Стол 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Переключить на Рабочий Стол 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Переключить на Рабочий Стол 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Переключить на Рабочий Стол 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Переключить на Рабочий Стол 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Переключить на Рабочий Стол..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Перенести Стол Влево (Все Экраны)"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Перенести Стол Вправо (Все Экраны)"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Перенести Стол Вверх (Все Экраны)"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Перенести Стол Вниз (Все Экраны)"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Перенести Стол Через... (Все Экраны)"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Перенести Стол На... (Все Экраны)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Перенести Стол Линейно... (Все Экраны)"
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Переключиться На Раб. Стол 0 (Все Экраны)"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Переключиться На Раб. Стол 1 (Все Экраны)"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Переключиться На Раб. Стол 2 (Все Экраны)"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Переключиться На Раб. Стол 3 (Все Экраны)"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Переключиться На Раб. Стол 4 (Все Экраны)"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Переключиться На Раб. Стол 5 (Все Экраны)"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Переключиться На Раб. Стол 6 (Все Экраны)"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Переключиться На Раб. Стол 7 (Все Экраны)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Переключиться На Раб. Стол 8 (Все Экраны)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Переключиться На Раб. Стол 9 (Все Экраны)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Переключиться На Раб. Стол 10 (Все Экраны)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Переключиться На Раб. Стол 11 (Все Экраны)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Переключиться На Рабочий Стол... (Все Экраны)"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -470,102 +472,117 @@ msgstr "Переключиться На Рабочий Стол... (Все Эк
 msgid "Screen"
 msgstr "Экран"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Послать Мышь На Экран 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Послать Мышь На Экран 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Послать Мышь На Экран..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Послать Мышь 1 Экран Вперёд"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Послать Мышь 1 Экран Назад"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Послать Мышь Вперед/Назад..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Окно: Передвижение"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "На Следующий Рабочий Стол"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "На Предыдущий Рабочий Стол"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "По # Стола..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "На Рабочий Стол..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Показать Главное Меню"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Показать Избранное Меню"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Показать Меню \"Все Приложения\""
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Показать Меню Клиента"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Показать Меню..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Комманда"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Приложение"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Перезапустить"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Выход"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Модуль %s для Enlightenment"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Переключить Полноэкранный Режим"
+
+#: src/bin/e_actions.c:2813
+#, 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -578,55 +595,55 @@ msgstr ""
 msgid "System"
 msgstr "Система"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Выход из Сессии"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Перегрузить"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Приостановить"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Заморозить"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 msgid "Lock"
 msgstr ""
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Расчистить Окна"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr "Общее: Действия"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
 msgstr "Отложеное Выполнение"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Установить Как Фон"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "Сканирование файлов запуска программ завершено"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "Сканирование файлов запуска программ"
 
@@ -634,13 +651,14 @@ msgstr "Сканирование файлов запуска программ"
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -655,7 +673,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -667,7 +685,7 @@ msgstr "ОК"
 msgid "Cancel"
 msgstr "Отменить"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 "
@@ -678,7 +696,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 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 +710,11 @@ msgstr ""
 "версия Enlightenment.<br>Это неправильно, и поэтому ваша конфигурация "
 "была<br>восстановлена на стандартную. Извините за неудобство.<br>"
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
 msgstr "Параметры обновлены"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -707,7 +725,7 @@ msgstr ""
 "может быть<br>определена.<br><br>Файл в котором возникла ошибка:<br>%"
 "s<br><br>Этот файл был удалён с целью предотвращения повреждения данных.<br>"
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -722,7 +740,7 @@ msgstr ""
 "домашнего<br><br>каталога. Файл, в котором возникла ошибка:<br>%"
 "s<br><br>Этот файл был удалён с целью предотвращения повреждения данных.<br>"
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -735,7 +753,7 @@ msgstr ""
 "котором<br><br>возникла ошибка:<br>%s<br><br>Этот файл был удалён с целью "
 "предотвращения повреждения данных.<br>"
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -749,7 +767,7 @@ msgstr ""
 "котором<br><br>возникла ошибка:<br>%s<br><br>Этот файл был удалён с целью "
 "предотвращения повреждения данных.<br>"
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -757,11 +775,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr "Проблемы при сохранении параметров Enlightenment"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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
@@ -787,7 +805,7 @@ 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Расширения"
 
@@ -796,22 +814,22 @@ msgstr "Расширения"
 msgid "Container %d"
 msgstr "Контейнер %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Ошибка - нет поддержки PAM"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Поддержка PAM не была включена при сборке Enlightenment, "
 "поэтому<br>запирание экрана отключено."
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Не Удалось Замкнуть"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -820,15 +838,15 @@ msgstr ""
 "клавиатура<br>удерживаются каким-то приложением, и это удерживание не "
 "возможно разорвать"
 
-#: src/bin/e_desklock.c:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Пожалуйста введите ваш пароль"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Ошибка Системы Опознавания"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -839,6 +857,25 @@ msgstr ""
 "<hilight>%i</hilight>.<br>Это плохо и такого не должно случатьса."
 "<br>Пожалуйста сообщите об этой ошибке."
 
+#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Неполные Свойства Окна"
@@ -939,23 +976,23 @@ msgstr "Выбрать Иконку"
 msgid "Select an Executable"
 msgstr "Выберите Исполняемый Файл"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Стереть"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Вырезать"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Копировать"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Вставить"
 
@@ -989,260 +1026,313 @@ msgstr ""
 "Enlightenment не смог запустить приложение:<br><br>%s<br><br>приложение не "
 "запустилось."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Ошибка Выполнения Приложения"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s неожиданно закончил исполнение."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Код выхода %i был возвращен из %s."
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s было прервано Сигналом Прерыва."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s было прервано Сигналом Выхода."
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s было прервано Сигналом Аварийного прекращения работы."
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s было прервано Ошибкой Плавающей Запятой."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s было прервано Сигналом Uninterruptable Kill."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s было прервано Ошибкой Сегментации."
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s было прервано Ошибкой Broken Pipe."
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s было прервано Сигналом Завершения."
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s было прервано Ошибкой Bus Error."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s было прервано сигналом номер %i."
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "*** Остаток вывода был обрезан. Сохраните для просмотра. ***\n"
 
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Лог Ошибки"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Не было сообщения ошибки."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Сохранить Это Сообщение"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Этот лог об ошибке будет сохранён как %s/%s.log"
 
-#: src/bin/e_exec.c:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Информация об Ошибке"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Информация Сигнала об Ошибке"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Выход Данных"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Не было никаких данных."
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr "Несуществующий путь"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s не существует."
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Ошибка Запуска"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Ошибка Запуска"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Ошибка"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i файлов"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr "Отменить"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Режим Отображения"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Обновить Вид"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Показать  Скрытые Файлы"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "Запомнить Очередность"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Сортировать"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Новый Каталог"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr "Отключить"
+
+#: src/bin/e_fm.c:8063
+msgid "Mount"
+msgstr "Подключить"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr "Извлечь"
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
 msgstr "По умолчанию"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Сетка Иконок"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Свои Иконки"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Список"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Размер значка (%d)"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Установить Как Фон"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "Содержимое Полки"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Очистить"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Создать новый каталог"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Имя Нового Каталога:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Переименовать %s в:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Переименовать Файл"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr "Повторить"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr "Нет для всего"
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr "Да для всего"
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "Запускается"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Вы действительно хотите стереть <br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr "Пропустить это"
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr "Пропустить все"
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "Во время исполнения произошла ошибка.<br>%s"
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Подтвердите Удаление"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Вы действительно хотите стереть <br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1303,8 +1393,8 @@ msgid "Preview"
 msgstr "Предосмотр"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "По Умолчанию"
 
@@ -1313,7 +1403,7 @@ msgid "Thumbnail"
 msgstr "Миниатюра"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Личные"
 
@@ -1329,70 +1419,70 @@ msgstr "Информация о Ссылке"
 msgid "Select an Image"
 msgstr "Выбрать Изображение"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%lluТиБ"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu ГиБ"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu МиБ"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu КиБ"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu Б"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr "Не известный Носитель"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "Съёмное Устройство"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Гладко"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "В Сэте"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Вид"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Автопрокрутка содержимого"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Может менять размер"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Начать сдвиг/размер этого гаджета"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Убрать этот гаджет"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "Завершить сдвиг/размер этого гаджета"
 
@@ -1443,8 +1533,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1452,7 +1542,7 @@ msgstr "Размер"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
 #: src/bin/e_int_border_menu.c:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Уровень"
 
@@ -1630,12 +1720,12 @@ msgstr "Полный Экран"
 msgid "Window List"
 msgstr "Список Окон"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Пэйджер"
 
@@ -1913,11 +2003,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr "Настройки"
 
@@ -1951,8 +2041,8 @@ msgstr "Загруженные Модули"
 msgid "Unload Module"
 msgstr "Выгрузить Модуль"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1982,12 +2072,12 @@ msgstr "Выбранные Гаджеты"
 msgid "Remove Gadget"
 msgstr "Убрать Гаджет"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: 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:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Расположение"
 
@@ -2073,122 +2163,122 @@ msgstr "(Нет окон)"
 msgid "No name!!"
 msgstr "Нет имени!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(Нет Полок)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Полка #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Добавить Полку"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Стереть Полку"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Настройки Полки"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Тини"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Средне"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Большой"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Огромный"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Содержимое Полки"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Над Всем"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Под Окнами"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Под Всем"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "Позволять окнам перекрывать полку"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Ужимать под Размер Содержимого"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f пикс."
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Стили"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "Авто-сокрытие"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "Прятать полку автоматически"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "Показывать при мыши в"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "Показывать при щелчке мышью"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "Время задержки до сокрытия"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f сек"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "Время сокрытия"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "Показывать на всех Рабочих Столах"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "Показывать на указанных Рабочих Столах"
 
@@ -2574,7 +2664,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment не может настроить свою систему ДНД."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2763,31 +2853,38 @@ msgstr "Модуль %s для Enlightenment"
 msgid "Would you like to unload this module?<br>"
 msgstr "Хотите выгрузить этот модуль?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 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:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Закончить Перемещения/Изменения Элементов"
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Начать Перемещения/Изменения Элементов"
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Содержимое Полки"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Стереть эту Полку"
 
@@ -2932,7 +3029,7 @@ msgstr "О теме"
 msgid "Set As Theme"
 msgstr "Установить Как Тему"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Содержимое Панели Инструментов"
@@ -2951,67 +3048,67 @@ msgstr ""
 "Enlightenment не даст себе выйти, пока эти окна не будут закрыты,<br>или вы "
 "не уберёте флаг защиты.<br>"
 
-#: src/bin/e_utils.c:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Байт"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f Кб"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f Мб"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f Гб"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "В Будущем"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "За последнюю минуту"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Лет назад"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Месяцев назад"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Недель назад"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Дней назад"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Часов назад"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Минут назад"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3023,7 +3120,7 @@ msgstr "Не известный"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Добавить"
 
@@ -3046,7 +3143,7 @@ msgid "Add to Favorites"
 msgstr "Добавить в Избранное"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3160,6 +3257,7 @@ msgid "Internal"
 msgstr "Встроеный"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
@@ -3171,24 +3269,24 @@ msgstr ""
 msgid "Battery"
 msgstr "Батарея"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr "Низкий заряд батареи!"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr "Рекомендовано сетевое питание."
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr "Н/Д"
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr "ОШИБКА"
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr "Индикатор Батареи"
 
@@ -3197,10 +3295,25 @@ msgid "Clock"
 msgstr "Часы"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
 msgstr "Панель параметров"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Взаимодействие"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "Время выключения"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+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"
@@ -3223,7 +3336,7 @@ msgid "Restart Applications"
 msgstr "Перезапускаемые Приложения"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "Все Приложения"
 
@@ -3580,41 +3693,54 @@ msgstr "Выбрать"
 msgid "Desk"
 msgstr "Стол"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "Настройки Запирания Экрана"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Автоматическое Запирание"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 msgid "Lock when Enlightenment starts"
 msgstr "Заблокировать при старте Enlightenment"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: 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:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+msgid "Time after screensaver activated"
+msgstr "Время до смены X скринсейвера"
+
+#: 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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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:240
+#: 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
@@ -3625,27 +3751,27 @@ msgstr "%1.0f мин."
 msgid "Personal"
 msgstr "Личный"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Настройки Login"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: 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:337
+#: 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:341
+#: 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:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3654,29 +3780,49 @@ msgstr "Показывать на экране #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Режим Обоев"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Обои из Темы"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+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:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "Использовать особое запирание экрана"
 
@@ -3684,59 +3830,74 @@ msgstr "Использовать особое запирание экрана"
 msgid "Screen Lock"
 msgstr "Запереть Экран"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "Настройки Виртуального Стола"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Количество Рабочих Столов"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "Анимация перехода"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Рабочие столы"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: 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:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "Анимация Перехода"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Выкл."
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "Гладко"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Увеличение"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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
+#, fuzzy
+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 "Виртуальные Столы"
@@ -3752,8 +3913,8 @@ msgstr "Настройки Диалога"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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 "Общие Настройки"
@@ -3919,23 +4080,23 @@ msgstr "Текущий сервер экрана<br>не имеет расшир
 msgid "Display Power Management Settings"
 msgstr "Настройки Управления Питанием Экрана (DPMS)"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: 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:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
 msgstr "Таймеры"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "Время ожидания"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "Время приостановить"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "Время выключения"
 
@@ -4509,7 +4670,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f пикс."
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4731,7 +4892,7 @@ msgid "Select an Edj File"
 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Файл"
 
@@ -5076,55 +5237,50 @@ msgstr "Максимум"
 msgid "Scaling"
 msgstr "Масштаб"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Настройки Хранителя Экрана"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 скринсейвер"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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 скринсейвера"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
 msgstr "Время до смены X скринсейвера"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f сек."
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "Затемнение"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "Желательно"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "Не Желательно"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr "Действия Показа"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Разрешить"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "Не Позволять"
 
@@ -5137,7 +5293,7 @@ msgid "Configured Shelves"
 msgstr "Настроенные Полки"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Настройка ФМ"
@@ -5184,10 +5340,6 @@ msgstr "Категории Тем"
 msgid "Assign"
 msgstr "Назначить"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "Очистить"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "Очистить Всё"
@@ -6039,27 +6191,19 @@ msgstr "Тень"
 msgid "Run Command Dialog"
 msgstr "Диалог Запуска Комманды"
 
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount error"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: 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:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -6070,7 +6214,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -6085,96 +6229,104 @@ msgstr ""
 "новая версия ФМ.<br>Это плохо, и поэтому ваша конфигурация была "
 "восстановлена на стандартную.<br>Извините за неудобство.<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
 msgstr "Параметры Файлового Менеджера обновлены"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr "Настройка Файлового Менеджера"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Размер Иконки"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 #, fuzzy
 msgid "View"
 msgstr "Режим Отображения"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr "Открывать Директории На Месте"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "Директории Отсортированы Первыми"
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Базовый Размер"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "Использовать Один Щелчок"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr "Показывать Расширения Иконок"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "Показывать Полный Путь"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr "Показывать Иконки на Рабочем Столе"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr "Показывать Панель Инструментов"
 
-#: src/modules/fileman/e_mod_config.c:257
-msgid "Show HAL icons on desktop"
-msgstr "Показывать иконки HAL на столе"
-
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
 msgstr "Поведение"
 
-#: src/modules/fileman/e_fwin.c:1187
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr "Показывать иконки HAL на столе"
+
+#: 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:1462
 msgid "Go to Parent Directory"
 msgstr "В Родительский Каталог"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "Добавить Приложение..."
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Открыть"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Открыть через..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "Приложения"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Указаные Приложения"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr "Своя Команда"
 
@@ -6263,39 +6415,39 @@ msgstr "Предыдущее Окно"
 msgid "Select a window"
 msgstr "Выбрать Окно"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
 msgstr "Параметры IBar"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Выбранный Источник Раздела"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Ярлыки Иконки"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Показывать Ярлык Иконки"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "Показывать Имя App"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "Показывать Комментарий App"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "Показывать Общие App"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "Создать новый источник IBar"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "Введите имя для этого нового источника:"
 
@@ -6312,27 +6464,27 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Вы действительно хотите стереть источник этого пространства?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Изменить Свойства Иконки"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Убрать Иконку"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr "Добавить Иконку"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr "Создать Новою Иконку"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Добавить Приложение"
 
@@ -6384,89 +6536,89 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr "Параметры пейджера"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: 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:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr "Настройка Подсказок"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr "Показать подсказку при смене стола"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr "Показывать подсказку для срочных окон"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr "Выбор и Передвижение - кнопка"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "Нажать для установки"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr "Кнопка Тащи-и-Бросай"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr "Тянуть весь рабочий стол"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr "Высота подсказки ключевого действия"
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f пикс."
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "Сопротивление к перетаскиванию"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr "Высота подсказки пэйджера"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr "Скорость подсказки"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f сек"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr "Настройки Срочного Окна"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr "Показывать подсказку на срочном окне"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Подсказка залипает на экране при срочном окне"
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr "Кнопки Захвата Пэйджера"
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6474,11 +6626,11 @@ msgstr ""
 "Пожалуйста нажмите клавишу мыши<br>Нажмите <hilight>Escape</hilight> для "
 "отмены<br>Или <hilight>Del</hilight> для сброса кнопки."
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr "Внимание"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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 "
@@ -6488,29 +6640,29 @@ msgstr ""
 "занята внутренним<br>кодом для контекстных меню.<br>Эта кнопка работает "
 "только в Подсказках"
 
-#: src/modules/pager/e_mod_config.c:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Кнопка %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr "Показывать Подсказку Пэйджера"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr "Передвинуть вправо"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr "Передвинуть влево"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr "Передвинуть вверх"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr "Передвинуть вниз"
 
@@ -6756,7 +6908,7 @@ msgstr "Левый:"
 msgid "Right:"
 msgstr "Правый:"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr "Звук выкл."
 
@@ -6796,11 +6948,11 @@ msgstr "Настройки модулей микшера"
 msgid "Mixer Settings Updated"
 msgstr "Настройки микшера обновлены"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6836,6 +6988,19 @@ msgstr "Указанное Устройство"
 msgid "Networks"
 msgstr "Сети"
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "Система"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Настроить Виртуальные Столы"
 
diff --git a/po/sk.gmo b/po/sk.gmo
index 8c7c164..bb4ffee 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index e173ea7..7a01f48 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: e HEAD\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2009-03-26 18:11+0000\n"
 "Last-Translator: helix84 <Unknown>\n"
 "Language-Team: Slovakian\n"
@@ -17,20 +17,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "O Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -75,54 +75,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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Áno"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nie"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Ste si istý, že chcete skončiť?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Ste si istý, že sa chcete odhlásiť?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Ste si istý, že chcete vypnúť počítač?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Ste si istý, že chcete reštartovať počítač?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -130,7 +132,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:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -138,11 +140,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:2109
+#: src/bin/e_actions.c:2123
 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:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -150,316 +152,316 @@ 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:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Okno : Operácie"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Presunúť"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Zmeniť veľkosť"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Menu Okna"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Vyššie"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Nižšie"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Násilne ukončiť"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Okno : Stav"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Zmeniť Lepkavosť"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Zmeniť Ikonifikáciu"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Zmeniť Na celú obrazovku"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maximalizovať"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Maximalizovať zvisle"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Maximalizovať vodorovne"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Maximalizovať na celú obrazovka"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Inteligentný režim maximalizácie"
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Režim maximalizácie „Zväčšiť“"
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Režim maximalizácie „Vyplniť“"
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Nastaviť režim Tieň hore"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Nastaviť režim Tieň dole"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "Nastaviť režim Tieň doľava"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Nastaviť režim Tieň doprava"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Zmeniť režim Tieňa"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Zmeniť stav Bez okrajov"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "Zmeniť stav Pripnutia"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Plocha"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Preklopiť plochu doľava"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Preklopiť plochu doprava"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Preklopiť Plochu hore"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Preklopiť plochu dolu"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Preklopiť plochu podľa..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Zobraziť plochu"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
 msgstr "Zobraziť policu"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Preklopiť plochu na..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Preklopiť plochu lineárne..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Prepnúť na plochu 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Prepnúť na plochu 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Prepnúť na plochu 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Prepnúť na plochu 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Prepnúť na plochu 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Prepnúť na plochu 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Prepnúť na plochu 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Prepnúť na plochu 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Prepnúť na plochu 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Prepnúť na plochu 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Prepnúť na plochu 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Prepnúť na plochu 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Prepnúť na plochu 12"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Preklopiť plochu vľavo (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Preklopiť plochu vpravo (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Preklopiť plochu hore (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Preklopiť plochu dolu (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Preklopiť plochu podľa... (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Preklopiť plochu do... (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Preklopiť plochu lineárne... (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Preklopiť na plochu 0 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Preklopiť na plochu 1 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Preklopiť na plochu 2 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Preklopiť na plochu 3 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Preklopiť na plochu 4 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Preklopiť na plochu 5 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Preklopiť na plochu 6 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Preklopiť na plochu 7 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Preklopiť na plochu 8 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Preklopiť na plochu 9 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Preklopiť na plochu 10 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Preklopiť na plochu 11 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Preklopiť na plochu... (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -469,102 +471,117 @@ msgstr "Preklopiť na plochu... (všetky obrazovky)"
 msgid "Screen"
 msgstr "Obrazovka"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Poslať myš na obrazovku 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Poslať myš na obrazovku 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Poslať myš na obrazovku..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Poslať myš dopredu o 1 obrazovku"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Poslať myš dozadu o 1 obrazovku"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Poslať myš dopredu/dozadu o obrazovky..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Okno : Presun"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "Na ďalšiu plochu"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Na predošlú plochu"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "Podľa č. plochy..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Na plochu..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Zobraziť Hlavné menu"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Zobraziť menu Obľúbené"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Zobraziť menu Klienti"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Zobraziť menu..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Príkaz"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Aplikácia"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Reštartovať"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
 msgstr "Ukončiť teraz"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment %s Modul"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Zmeniť Na celú obrazovku"
+
+#: src/bin/e_actions.c:2813
+#, fuzzy
+msgid "Offline Mode Toggle"
+msgstr "Zmeniť režim Tieňa"
+
+#: 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -577,55 +594,55 @@ msgstr "Ukončiť teraz"
 msgid "System"
 msgstr "Systém"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Odhlásiť sa"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr "Vypnúť teraz"
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr "Vypnúť"
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Reštartovať"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Úsporný režim"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Režim spánku"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Usporiadať Okná"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr "Všeobecné : Operácie"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
 msgstr "Odložená operácia"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr ""
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "Sken súborov plochy dokončený"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "Sken súboru plochy"
 
@@ -633,13 +650,14 @@ msgstr "Sken súboru plochy"
 msgid "Color Selector"
 msgstr "Výber farieb"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -654,7 +672,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -666,7 +684,7 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 +703,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:746
+#: src/bin/e_config.c:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -699,11 +717,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:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
 msgstr "Nastavenia aktualizované"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -714,7 +732,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:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -729,7 +747,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:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -742,7 +760,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:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -755,7 +773,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:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -766,11 +784,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:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problémy so zápisom nastavení Enlightenment"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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
@@ -796,7 +814,7 @@ msgid "Modules"
 msgstr "Moduly"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Rozšírenia"
 
@@ -805,22 +823,22 @@ msgstr "Rozšírenia"
 msgid "Container %d"
 msgstr "Kontajner %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Chyba - chýba popdora PAM"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 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:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Zamknutie zlyhalo"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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."
@@ -829,15 +847,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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Prosím, zadajte heslo na odomknutie"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "Chyba autentifikačného systému"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -848,6 +866,25 @@ 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
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Nastavenia nedokončeného okna"
@@ -947,23 +984,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:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Zmazať"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Vystrihnúť"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Vložiť"
 
@@ -997,262 +1034,316 @@ msgstr ""
 "Enlightenment nemôže spustiť aplikáciu.<br><br>%s<br><br>Aplikácia zlyhala "
 "pri spustení."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Chyba pri Spustení Aplikácie"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s neočakávane ukončil svoj beh."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, 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:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s prerušil signál Interrupt."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s prerušil signál Quit."
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s prerušil signál Abort."
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s prerušila chyba pohyblivej desatinnej čiarky."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s prerušil signál Uninterruptable Kill."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s prerušila chyba segmentácie."
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s prerušila prerušená rúra."
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s prerušil signál Termination."
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s prerušila chyba zbernice."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s prerušil signál č. %i."
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 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:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Záznamy chýb"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Žiadne chybové hlásenie."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Uložiť túto správu"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, 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:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Informácia o chybe"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Informácia chybového signálu"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Výstupné dáta"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Žiaden výstup."
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Chyba pri Spustení"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Chyba pri Spustení"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Chyba"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr ""
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr ""
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nový Adresár"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Premenovať"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Font"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr ""
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Pozadie Témy"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "Nakonfigurovať Obsah..."
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr ""
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr ""
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Chyba"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "Nabíjam"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr ""
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1311,8 +1402,8 @@ msgid "Preview"
 msgstr "Náhľad"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr ""
 
@@ -1321,7 +1412,7 @@ msgid "Thumbnail"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr ""
 
@@ -1337,70 +1428,70 @@ msgstr ""
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Priame"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Zabudovaný"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Vzhľad"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Automaticky rolovať obsah"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Umožniť Zmenu Veľkosti"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Odstrániť túto špecialitu"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1449,8 +1540,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1458,7 +1549,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Usporiadanie"
 
@@ -1636,12 +1727,12 @@ msgstr "Celá Obrazovka"
 msgid "Window List"
 msgstr "Zoznam Okien"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Pager"
 
@@ -1921,11 +2012,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr ""
 
@@ -1959,8 +2050,8 @@ msgstr ""
 msgid "Unload Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1990,12 +2081,12 @@ msgstr ""
 msgid "Remove Gadget"
 msgstr "Odstrániť Špecialitu"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: 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:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Rozloženie"
 
@@ -2081,122 +2172,122 @@ msgstr "(Žiadne Okná)"
 msgid "No name!!"
 msgstr "Žiadne meno!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Nastavenia Šelfu"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Drobné"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Stredne Veľké"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Veľký"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Obrovské"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Nakonfigurovať Obsah..."
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Nad Všetkým"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Pod Oknami"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Pod Všetkým"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Zmenšiť na Veľkosť Obsahu"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixelov"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Štýly"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr ""
 
@@ -2548,7 +2639,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment nemôže spustiť systém dnd."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2731,11 +2822,18 @@ msgstr "Enlightenment %s Modul"
 msgid "Would you like to unload this module?<br>"
 msgstr "Chceš unloadnúť tento modul?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -2743,20 +2841,20 @@ msgstr ""
 "Požadujete zmazanie tohoto šelfu.<br><br>Ste si istý, že chcete ho chcete "
 "zmazať?"
 
-#: src/bin/e_shelf.c:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 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:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 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:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Nakonfigurovať Obsah Šelfu"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Zmazať tento Šelf"
 
@@ -2898,7 +2996,7 @@ msgstr ""
 msgid "Set As Theme"
 msgstr ""
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 msgid "Set Toolbar Contents"
 msgstr ""
 
@@ -2916,67 +3014,67 @@ 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:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -2988,7 +3086,7 @@ msgstr "Neznámy"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Pridať"
 
@@ -3011,7 +3109,7 @@ msgid "Add to Favorites"
 msgstr ""
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3125,6 +3223,7 @@ msgid "Internal"
 msgstr ""
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
@@ -3137,24 +3236,24 @@ msgstr ""
 msgid "Battery"
 msgstr "Batéria"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr ""
 
@@ -3163,10 +3262,24 @@ msgid "Clock"
 msgstr "Hodiny"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
 msgstr ""
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Umiestnenie"
+
+#: src/modules/conf/e_mod_main.c:241
+msgid "Offline"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Moduly"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3189,7 +3302,7 @@ msgid "Restart Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr ""
 
@@ -3544,41 +3657,53 @@ msgstr ""
 msgid "Desk"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Automatické Uzamykanie"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: 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:176
+#: 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:180
+#: 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 sekúnd"
+
+#: 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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 minút"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3589,27 +3714,27 @@ msgstr "%1.0f minút"
 msgid "Personal"
 msgstr "Osobné"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Nastavenia prihlasovacej obrazovky"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
 msgstr "Ukázať na všetkých zónach obrazovky"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr "Ukázať na aktuálnej zóne obrazovky"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
 msgstr "Ukázať v zóne obrazovky #:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3618,29 +3743,48 @@ msgstr "Ukázať v zóne obrazovky #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: 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:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr ""
 
@@ -3648,59 +3792,74 @@ msgstr ""
 msgid "Screen Lock"
 msgstr "Uzamykanie Obrazovky"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Počet Plôch"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Preklopenie Plochy Myšou"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Pracovné Plochy"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: 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:283
+#: src/modules/conf_desks/e_int_config_desks.c:298
 msgid "Wrap desktops around when flipping"
 msgstr "Umožniť preklápanie plôch dookola"
 
-#: src/modules/conf_desks/e_int_config_desks.c:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 sek"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Nastavenia Pozadia"
+
+#: 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 "Virtuálne Plochy"
@@ -3716,8 +3875,8 @@ msgstr ""
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -3867,23 +4026,23 @@ msgstr ""
 msgid "Display Power Management Settings"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: 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:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr ""
 
@@ -4452,7 +4611,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pixelov"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4669,7 +4828,7 @@ 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr ""
 
@@ -5011,55 +5170,50 @@ msgstr ""
 msgid "Scaling"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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:168
+#: 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:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f sekúnd"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr ""
 
@@ -5072,7 +5226,7 @@ msgid "Configured Shelves"
 msgstr "Nakonfigurované Šelfy"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Spustenie"
@@ -5118,10 +5272,6 @@ msgstr ""
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr ""
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr ""
@@ -5968,27 +6118,19 @@ msgstr "Tieň"
 msgid "Run Command Dialog"
 msgstr "Spustiť Príkazový Dialóg"
 
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount error"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
 msgstr "Home"
 
-#: src/modules/fileman/e_mod_main.c:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -5999,7 +6141,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -6009,95 +6151,103 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Veľkosť Ikony"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
 msgstr "Ukázať"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Základná Veľkosť"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:257
-msgid "Show HAL icons on desktop"
-msgstr ""
-
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
 msgstr "Chovanie"
 
-#: src/modules/fileman/e_fwin.c:1187
+#: 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:1462
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "Aplikácia"
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Otvoriť"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "(Žiadne Aplikácie)"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr ""
 
@@ -6186,39 +6336,39 @@ msgstr "Predchádzajúce Okno"
 msgid "Select a window"
 msgstr "Vybrať Okno"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Vybraný Zdroj Lišty"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Označenia Ikony"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Ukázať Označenie Ikony"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr ""
 
@@ -6235,27 +6385,27 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Ste si istý, že chcete zmazať zdroj tejto lišty?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Zmeniť Nastavenia Ikony"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Odstrániť Ikonu"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr ""
 
@@ -6307,128 +6457,128 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: 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:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr "Nastavenie Popup"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekúnd"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 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:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6671,7 +6821,7 @@ msgstr ""
 msgid "Right:"
 msgstr ""
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr ""
 
@@ -6711,11 +6861,11 @@ msgstr ""
 msgid "Mixer Settings Updated"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6749,6 +6899,19 @@ msgstr ""
 msgid "Networks"
 msgstr ""
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "Systém"
+
 #~ msgid "Shelf Size"
 #~ msgstr "Velkosť Šelfu"
 
@@ -7248,9 +7411,6 @@ msgstr ""
 #~ msgid "Show windows from all zones"
 #~ msgstr "Ukázať okná zo všetkých zón"
 
-#~ msgid "Font"
-#~ msgstr "Font"
-
 #~ msgid "Stop editing"
 #~ msgstr "Ukončiť editovanie"
 
@@ -7365,9 +7525,6 @@ msgstr ""
 #~ msgid "Theme Desklock Background"
 #~ msgstr "Pozadie pre Tému Uzamknutej Plochy"
 
-#~ msgid "Theme Background"
-#~ msgstr "Pozadie Témy"
-
 #~ msgid "Exebuf Settings"
 #~ msgstr "Nastavenia Exebuf"
 
@@ -7410,9 +7567,6 @@ msgstr ""
 #~ msgid "About…"
 #~ msgstr "O..."
 
-#~ msgid "Background Settings"
-#~ msgstr "Nastavenia Pozadia"
-
 #~ msgid "To the left"
 #~ msgstr "Doľava"
 
diff --git a/po/sl.gmo b/po/sl.gmo
index a8bfd3d..1f07c1f 100644
Binary files a/po/sl.gmo and b/po/sl.gmo differ
diff --git a/po/sl.po b/po/sl.po
index 7c077ac..4b83efa 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-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2006-03-21 02:50+0100\n"
 "Last-Translator: Perat Tomaž <pithlit at gmail.com>\n"
 "Language-Team:  <pithlit at gmail.com>\n"
@@ -17,20 +17,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "O Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -75,47 +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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Da"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Ne"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Ste prepričani, da bi radi zapustili Enlightenment?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 #, fuzzy
 msgid "Are you sure you want to log out?"
 msgstr "Ste prepričani, da bi radi zapustili Enlightenment?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 #, 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 #, fuzzy
 msgid "Are you sure you want to turn off?"
 msgstr "Ste prepričani, da bi radi zapustili Enlightenment?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 #, fuzzy
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
@@ -123,12 +125,12 @@ msgid ""
 msgstr ""
 "Zahtevali ste izhod iz Enlightenment.<br><br>Ste prepričani, da bi to radi?"
 
-#: src/bin/e_actions.c:1981
+#: src/bin/e_actions.c:1995
 #, fuzzy
 msgid "Are you sure you want to reboot?"
 msgstr "Ste prepričani, da bi radi zapustili Enlightenment?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 #, fuzzy
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
@@ -136,7 +138,7 @@ msgid ""
 msgstr ""
 "Zahtevali ste izhod iz Enlightenment.<br><br>Ste prepričani, da bi to radi?"
 
-#: src/bin/e_actions.c:2047
+#: src/bin/e_actions.c:2061
 #, fuzzy
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
@@ -144,12 +146,12 @@ msgid ""
 msgstr ""
 "Zahtevali ste izhod iz Enlightenment.<br><br>Ste prepričani, da bi to radi?"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 #, fuzzy
 msgid "Are you sure you want to hibernate?"
 msgstr "Ste prepričani, da bi radi zapustili Enlightenment?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 #, fuzzy
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
@@ -157,372 +159,372 @@ msgid ""
 msgstr ""
 "Zahtevali ste izhod iz Enlightenment.<br><br>Ste prepričani, da bi to radi?"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Izbira Okenskih Okvirjev"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 #, fuzzy
 msgid "Move"
 msgstr "Jaz"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 #, fuzzy
 msgid "Resize"
 msgstr "Upor"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Meni"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 #, fuzzy
 msgid "Window Menu"
 msgstr "Vloga Okna"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr ""
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 #, fuzzy
 msgid "Lower"
 msgstr "Nizko"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Uniči"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Ime Okna"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 #, fuzzy
 msgid "Fullscreen Mode Toggle"
 msgstr "Celozaslonsko stanje"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maksimiraj"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 #, fuzzy
 msgid "Maximize Vertically"
 msgstr "Maksimirano po vertikali"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 #, fuzzy
 msgid "Maximize Horizontally"
 msgstr "Maksimirano po horizontali"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 #, fuzzy
 msgid "Maximize Fullscreen"
 msgstr "Celozaslonsko"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 #, fuzzy
 msgid "Maximize Mode \"Smart\""
 msgstr "Maksimirano stanje"
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 #, fuzzy
 msgid "Maximize Mode \"Fill\""
 msgstr "Taktika Maksimiranja"
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 #, fuzzy
 msgid "Toggle Borderless State"
 msgstr "Brez okvirjev"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 #, fuzzy
 msgid "Toggle Pinned State"
 msgstr "Brez okvirjev"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Desktop"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 #, fuzzy
 msgid "Flip Desktop Left"
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 #, fuzzy
 msgid "Flip Desktop Right"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 #, fuzzy
 msgid "Flip Desktop Up"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 #, fuzzy
 msgid "Flip Desktop Down"
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 #, fuzzy
 msgid "Flip Desktop By..."
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 #, fuzzy
 msgid "Show The Desktop"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 #, fuzzy
 msgid "Flip Desktop To..."
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 #, fuzzy
 msgid "Switch To Desktop 0"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 #, fuzzy
 msgid "Switch To Desktop 1"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 #, fuzzy
 msgid "Switch To Desktop 2"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 #, fuzzy
 msgid "Switch To Desktop 3"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 #, fuzzy
 msgid "Switch To Desktop 4"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 #, fuzzy
 msgid "Switch To Desktop 5"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 #, fuzzy
 msgid "Switch To Desktop 6"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 #, fuzzy
 msgid "Switch To Desktop 7"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 #, fuzzy
 msgid "Switch To Desktop 8"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 #, fuzzy
 msgid "Switch To Desktop 9"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 #, fuzzy
 msgid "Switch To Desktop 10"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 #, fuzzy
 msgid "Switch To Desktop 11"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 #, fuzzy
 msgid "Switch To Desktop..."
 msgstr "Pošlji na namizje"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Pošlji na namizje"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -533,116 +535,131 @@ msgstr "Pošlji na namizje"
 msgid "Screen"
 msgstr "Zakleni zaslon"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: 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
 msgid "Window : Moving"
 msgstr "Zasenčevanje oken"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 #, fuzzy
 msgid "To Next Desktop"
 msgstr "Pošlji na namizje"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 #, fuzzy
 msgid "To Previous Desktop"
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 #, fuzzy
 msgid "By Desktop #..."
 msgstr "Desktop"
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 #, fuzzy
 msgid "To Desktop..."
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 #, fuzzy
 msgid "Show Main Menu"
 msgstr "Prikaži Ime v Meniju"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 #, fuzzy
 msgid "Show Favorites Menu"
 msgstr "Prikaži Ime v Meniju"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 #, fuzzy
 msgid "Show All Applications Menu"
 msgstr "(Ni Programov)"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 #, fuzzy
 msgid "Show Clients Menu"
 msgstr "Prikaži Komentar v Meniju"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 #, fuzzy
 msgid "Show Menu..."
 msgstr "Prikaži Ime v Meniju"
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 #, fuzzy
 msgid "Command"
 msgstr "Poženi ukaz"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 #, fuzzy
 msgid "Application"
 msgstr "(Ni Programov)"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr ""
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 #, fuzzy
 msgid "Exit"
 msgstr "Počakaj z izhodom"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 #, fuzzy
 msgid "Exit Now"
 msgstr "Počakaj z izhodom"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment %s Modul"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Celozaslonsko stanje"
+
+#: src/bin/e_actions.c:2813
+#, 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -655,61 +672,61 @@ msgstr "Počakaj z izhodom"
 msgid "System"
 msgstr ""
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr ""
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr ""
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 #, fuzzy
 msgid "Hibernate"
 msgstr "Brez Mehčanja"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 #, fuzzy
 msgid "Lock"
 msgstr "Zaklepi"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Razporedi Okna"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "Izbira Okenskih Okvirjev"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Delayed Action"
 msgstr "Dejanja Modula"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 #, fuzzy
 msgid "Set As Background"
 msgstr "Nastavi Ozadje za"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 #, fuzzy
 msgid "Desktop files scan done"
 msgstr "Desktop"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "Desktop"
@@ -719,13 +736,14 @@ msgstr "Desktop"
 msgid "Color Selector"
 msgstr "Tematski izbirnik"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -740,7 +758,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -752,7 +770,7 @@ msgstr "V Redu"
 msgid "Cancel"
 msgstr "Pozabi"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -770,7 +788,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:746
+#: src/bin/e_config.c:760
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -786,12 +804,12 @@ msgstr ""
 "nastavili na privzete vrednosti. Prosimo, sprejmite naše<br>opravičilo za "
 "vse nevšečnosti.<br>"
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "Nastavitve Namizij"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -799,7 +817,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -809,7 +827,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -818,7 +836,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -827,7 +845,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -835,12 +853,12 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Nastavitev Enlightenment"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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,7 +884,7 @@ msgid "Modules"
 msgstr "Moduli"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr ""
 
@@ -875,20 +893,20 @@ msgstr ""
 msgid "Container %d"
 msgstr "Območje %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Zaklep neuspešen"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 #, fuzzy
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
@@ -897,15 +915,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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Vnesite vaše geslo za odklep"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -913,6 +931,25 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
+#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr ""
@@ -1016,24 +1053,24 @@ msgstr "Izberi okno"
 msgid "Select an Executable"
 msgstr "Izberi okno"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Izbriši"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 #, fuzzy
 msgid "Cut"
 msgstr "Odreži"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 #, fuzzy
 msgid "Paste"
 msgstr "Hitro"
@@ -1069,275 +1106,330 @@ msgstr ""
 "Enlightenment ni uspelo zagnati programa:<br><br>%s<br><br>Program se ni "
 "zagnal."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Napaka pri zagonu programa"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s se je nepričakovano zaustavil"
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, 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:442
+#: src/bin/e_exec.c:443
 #, fuzzy, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s je bil prekinjen z \"Interrupt\" signalom"
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, fuzzy, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s je bil prekinjen s \"Quit\" signalom"
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, fuzzy, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s je bil prekinjen z \"Abort\" signalom"
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, 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:454
+#: src/bin/e_exec.c:455
 #, 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:457
+#: src/bin/e_exec.c:458
 #, 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:460
+#: src/bin/e_exec.c:461
 #, 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:463
+#: src/bin/e_exec.c:464
 #, fuzzy, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s je bil prekinjen s \"Termination\" signalom"
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, 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:469
+#: src/bin/e_exec.c:470
 #, 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:525
+#: src/bin/e_exec.c:528
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Zapisniki Napak"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Ni bilo poročila o napaki"
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Shrani to sporočilo"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Informacija o napaki"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Informacija o napaki signala"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Izhodni podatki"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Ni bilo izhodnih podatkov"
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Napaka pri zagonu"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Napaka pri zagonu"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Napaka"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, fuzzy, c-format
 msgid "%i Files"
 msgstr "%1.0f files"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 #, fuzzy
 msgid "Link"
 msgstr "Linearno"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 #, fuzzy
 msgid "Abort"
 msgstr "O"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Namestitev izbire"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 #, fuzzy
 msgid "View Mode"
 msgstr "Urejevalni Način"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 #, fuzzy
 msgid "Refresh View"
 msgstr "Stopnja osveževanja"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 #, fuzzy
 msgid "Remember Ordering"
 msgstr "Zapomni si uporabo"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 #, fuzzy
 msgid "New Directory"
 msgstr "Mapa"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Meni"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 #, fuzzy
 msgid "Use default"
 msgstr "Privzeto Namizje"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 #, fuzzy
 msgid "Grid Icons"
 msgstr "Informacije o Datoteki:"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 #, fuzzy
 msgid "Custom Icons"
 msgstr "Avtomatsko prilagodi ikone"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 #, fuzzy
 msgid "List"
 msgstr "Seznam Oken"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "Velikost ikon"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Nastavi Ozadje za"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "Nastavitve"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+#, fuzzy
+msgid "Clear"
+msgstr "Blizu"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 #, fuzzy
 msgid "New Directory Name:"
 msgstr "Mapa"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, fuzzy, c-format
 msgid "Rename %s to:"
 msgstr "Preimenuj"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 #, fuzzy
 msgid "Rename File"
 msgstr "Preimenuj"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Napaka"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "Zaganjam %s"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, 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:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 #, fuzzy
 msgid "Confirm Delete"
 msgstr "Potrdi"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, 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:8730
+#: src/bin/e_fm.c:9251
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1401,8 +1493,8 @@ msgid "Preview"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: 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"
@@ -1412,7 +1504,7 @@ msgid "Thumbnail"
 msgstr ""
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 #, fuzzy
 msgid "Custom"
 msgstr "Odreži"
@@ -1431,71 +1523,71 @@ msgstr "Informacija o napaki"
 msgid "Select an Image"
 msgstr "Izberi okno"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "Neznan"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 #, fuzzy
 msgid "Inset"
 msgstr "Ikone"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1544,8 +1636,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1553,7 +1645,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Razvrščanje"
 
@@ -1743,12 +1835,12 @@ msgstr "Celozaslonsko"
 msgid "Window List"
 msgstr "Seznam Oken"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 #, fuzzy
 msgid "Pager"
 msgstr "Nevarno"
@@ -2042,11 +2134,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 #, fuzzy
 msgid "Settings"
 msgstr "Nastavitve Namizij"
@@ -2086,8 +2178,8 @@ msgstr "(Ni naloženih modulov)"
 msgid "Unload Module"
 msgstr "Napaka pri nalaganju modula"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -2121,13 +2213,13 @@ msgstr "Izberi Drugo Temo"
 msgid "Remove Gadget"
 msgstr "Pripomočki"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 #, fuzzy
 msgid "Toolbar Settings"
 msgstr "Nastavitve Ovijanja"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr ""
 
@@ -2217,132 +2309,132 @@ msgstr "(Ni Oken)"
 msgid "No name!!"
 msgstr "Ni Imena!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 #, fuzzy
 msgid "Delete A Shelf"
 msgstr "Izbriši"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 #, fuzzy
 msgid "Shelf Settings"
 msgstr "Nastavitev velikosti"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Srednje"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Nastavitve"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 #, fuzzy
 msgid "Above Everything"
 msgstr "Vse"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 #, fuzzy
 msgid "Below Windows"
 msgstr "(Ni Oken)"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 #, fuzzy
 msgid "Below Everything"
 msgstr "Vse"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 #, fuzzy
 msgid "Allow windows to overlap the shelf"
 msgstr "Prikaži okna na drugih zaslonih"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pikslov"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 #, fuzzy
 msgid "Auto Hide"
 msgstr "Avtomatsko privzdigovanje"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 #, fuzzy
 msgid "Show on mouse in"
 msgstr "prikazi na zaslonski coni :"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, fuzzy, c-format
 msgid "%.1f seconds"
 msgstr "%1.1f sekund"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 #, fuzzy
 msgid "Hide duration"
 msgstr "Brez Mehčanja"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 #, fuzzy
 msgid "Show on all Desktops"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 #, fuzzy
 msgid "Show on specified Desktops"
 msgstr "Prikaži ime namizja"
@@ -2730,7 +2822,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment ne more nastaviti svojega sistema dnd."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2925,12 +3017,19 @@ msgstr "Enlightenment %s Modul"
 msgid "Would you like to unload this module?<br>"
 msgstr "Bi radi razbremenili ta modul?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 #, fuzzy
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
@@ -2938,20 +3037,20 @@ msgid ""
 msgstr ""
 "Zahtevali ste izhod iz Enlightenment.<br><br>Ste prepričani, da bi to radi?"
 
-#: src/bin/e_shelf.c:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Nastavi nadzornika"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr ""
 
@@ -3108,7 +3207,7 @@ msgstr "O tej temi"
 msgid "Set As Theme"
 msgstr "O tej temi"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Nastavitve"
@@ -3127,67 +3226,67 @@ 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:805
+#: src/bin/e_utils.c:806
 #, fuzzy, c-format
 msgid "%'.0f Bytes"
 msgstr "%1.0f minut"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, fuzzy, c-format
 msgid "%'.0f KB"
 msgstr "%1.0f MB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, fuzzy, c-format
 msgid "%'.0f MB"
 msgstr "%1.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, fuzzy, c-format
 msgid "%'.1f GB"
 msgstr "%1.1f MB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3199,7 +3298,7 @@ msgstr "Neznan"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr ""
 
@@ -3223,7 +3322,7 @@ msgid "Add to Favorites"
 msgstr ""
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3346,6 +3445,7 @@ msgid "Internal"
 msgstr "Pod oknom"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
@@ -3358,25 +3458,25 @@ msgstr ""
 msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "Prikaži obvestilo ob prazni bateriji"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 #, fuzzy
 msgid "Battery Meter"
 msgstr "Preveri baterijo vsake:"
@@ -3387,11 +3487,25 @@ msgid "Clock"
 msgstr "Zaklepi"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 #, fuzzy
 msgid "Settings Panel"
 msgstr "Nastavitve Namizij"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Nastavitve Namizij"
+
+#: src/modules/conf/e_mod_main.c:241
+msgid "Offline"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Moduli"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 #, fuzzy
@@ -3418,7 +3532,7 @@ msgid "Restart Applications"
 msgstr "Priljubljeni programi"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 #, fuzzy
 msgid "All Applications"
 msgstr "(Ni Programov)"
@@ -3810,44 +3924,57 @@ msgstr "Izbriši"
 msgid "Desk"
 msgstr "Desktop"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 #, fuzzy
 msgid "Screen Lock Settings"
 msgstr "Nastavitve Drsenja"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Avtomatsko zaklepanje"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 #, fuzzy
 msgid "Lock when Enlightenment starts"
 msgstr "Uporabi Enlightenment kazalec"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
 #, fuzzy
 msgid "Lock when X screensaver activates"
 msgstr "Zakleni ko se zažene ohranjevalnik zaslona"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+msgid "Time after screensaver activated"
+msgstr "Čas do zagona ohranjevalnika zaslona"
+
+#: 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 sekund"
+
+#: 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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 minut"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3859,30 +3986,30 @@ msgstr "%1.0f minut"
 msgid "Personal"
 msgstr "Dovoljenja:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Nastavitve vstopnega okenca"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 #, fuzzy
 msgid "Show on all screen zones"
 msgstr "Prikaži na vseh zaslonskih conah"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 #, fuzzy
 msgid "Show on current screen zone"
 msgstr "Prikaži na trenutni zaslonski coni"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 #, fuzzy
 msgid "Show on screen zone #:"
 msgstr "prikazi na zaslonski coni :"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3891,31 +4018,51 @@ msgstr "prikazi na zaslonski coni :"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 #, fuzzy
 msgid "Theme Wallpaper"
 msgstr "Tematski izbirnik"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "Preskok na namizje z miško"
+
+#: 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
 #, fuzzy
 msgid "Custom Screenlock"
 msgstr "Zaslonsko Območje"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr ""
 
@@ -3924,64 +4071,79 @@ msgstr ""
 msgid "Screen Lock"
 msgstr "Zaslonsko Območje"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 #, fuzzy
 msgid "Virtual Desktops Settings"
 msgstr "Navidezno Namizje"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Število Namizij"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Preskok na namizje z miško"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Namizja"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: src/modules/conf_desks/e_int_config_desks.c:296
 #, fuzzy
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Preskoči na naslednje namizje ko se kazalec dotakne roba zaslona"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 #, fuzzy
 msgid "Flip Animation"
 msgstr "Podatki prikazovanja"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 #, fuzzy
 msgid "Pane"
 msgstr "Nevarno"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 #, fuzzy
 msgid "Zoom"
 msgstr "Spodaj"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 sek"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Nastavitve Ozadij"
+
+#: 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
 #, fuzzy
 msgid "Virtual Desktops"
@@ -3999,8 +4161,8 @@ msgstr "Nastavitve Pogovornega Okna"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -4172,25 +4334,25 @@ msgstr ""
 msgid "Display Power Management Settings"
 msgstr "Nastavitve Prikazovalnika"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: 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:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 #, fuzzy
 msgid "Timers"
 msgstr "Naslov"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 #, fuzzy
 msgid "Suspend time"
 msgstr "Pošlji na namizje"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr ""
 
@@ -4817,7 +4979,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pikslov"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -5057,7 +5219,7 @@ msgid "Select an Edj File"
 msgstr "Izberi okno"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 #, fuzzy
 msgid "Files"
 msgstr "Datoteka:"
@@ -5433,61 +5595,56 @@ msgstr "Maksimiraj"
 msgid "Scaling"
 msgstr "Razvrščanje"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 #, fuzzy
 msgid "Screen Saver Settings"
 msgstr "Nastavitve Drsenja"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:138
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:176
 #, fuzzy
 msgid "Screensaver Timer(s)"
 msgstr "Nastavi \"timeout\" ohranjevalnika zaslona"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:140
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:178
 #, fuzzy
 msgid "Time until X screensaver starts"
 msgstr "Čas do zagona ohranjevalnika zaslona"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 #, fuzzy
 msgid "Time until X screensaver alternates"
 msgstr "Čas do zagona ohranjevalnika zaslona"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f sekund"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 #, fuzzy
 msgid "Blanking"
 msgstr "Razvrščanje"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 #, fuzzy
 msgid "Allow"
 msgstr "Počasi"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr ""
 
@@ -5502,7 +5659,7 @@ msgid "Configured Shelves"
 msgstr "Nastavitve"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Ostro"
@@ -5551,11 +5708,6 @@ msgstr "Tematski izbirnik"
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-#, fuzzy
-msgid "Clear"
-msgstr "Blizu"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 #, fuzzy
 msgid "Clear All"
@@ -6463,30 +6615,21 @@ msgstr ""
 msgid "Run Command Dialog"
 msgstr "Poženi ukaz"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "Napaka pri zagonu"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
 msgstr "Doma"
 
-#: src/modules/fileman/e_mod_main.c:332
+#: src/modules/fileman/e_mod_main.c:322
 #, fuzzy
 msgid "Favorites"
 msgstr "Prikaži Ime v Meniju"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 #, fuzzy
 msgid "Root"
 msgstr "Ločljivost"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: src/modules/fileman/e_mod_main.c:431
 #, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
@@ -6504,7 +6647,7 @@ msgstr ""
 "stara nastavitvena datoteka ne vsebuje. Sedaj<br>pa lahko ponovno nastavite "
 "stvari po svoje. Opravičujemo se za kolcanje.<br>"
 
-#: src/modules/fileman/e_mod_main.c:454
+#: src/modules/fileman/e_mod_main.c:444
 #, fuzzy
 msgid ""
 "Your Fileman Module configuration is NEWER than Fileman Module version. This "
@@ -6521,103 +6664,111 @@ msgstr ""
 "nastavili na privzete vrednosti. Prosimo, sprejmite naše<br>opravičilo za "
 "vse nevšečnosti.<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 #, fuzzy
 msgid "Fileman Settings Updated"
 msgstr "Nastavitev velikosti"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 #, fuzzy
 msgid "Fileman Settings"
 msgstr "Nastavitev velikosti"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 #, fuzzy
 msgid "Icon Size"
 msgstr "Velikost ikon"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
 msgstr "Pogled"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Velikost"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 #, fuzzy
 msgid "Show Icon Extension"
 msgstr "prikazi na zaslonski coni :"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 #, fuzzy
 msgid "Show Desktop Icons"
 msgstr "Prikaži ime namizja"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 #, fuzzy
 msgid "Show Toolbar"
 msgstr "Prikaži sledilnik"
 
-#: src/modules/fileman/e_mod_config.c:257
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:729
+msgid "Behavior"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:270
 #, fuzzy
 msgid "Show HAL icons on desktop"
 msgstr "Prikaži ime namizja"
 
-#: src/modules/fileman/e_mod_config.c:261
-#: src/modules/gadman/e_mod_gadman.c:729
-msgid "Behavior"
+#: 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:1187
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "(Ni Programov)"
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "(Ni Programov)"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 #, fuzzy
 msgid "Specific Applications"
 msgstr "(Ni Programov)"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 #, fuzzy
 msgid "Custom Command"
 msgstr "Poženi ukaz"
@@ -6722,44 +6873,44 @@ msgstr "Izgubljena Okna"
 msgid "Select a window"
 msgstr "Izberi okno"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 #, fuzzy
 msgid "IBar Settings"
 msgstr "Nastavitve Ovijanja"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 #, fuzzy
 msgid "Icon Labels"
 msgstr "Razred Ikone"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 #, fuzzy
 msgid "Display App Name"
 msgstr "Prikaz"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 #, fuzzy
 msgid "Display App Comment"
 msgstr "Prikaži enote"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 #, fuzzy
 msgid "Display App Generic"
 msgstr "Prikaži enote"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr ""
 
@@ -6776,31 +6927,31 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Ste prepričani, da hočete pobrisati <br><b>%s</b> ?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 #, fuzzy
 msgid "Change Icon Properties"
 msgstr "Lastnosti"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 #, fuzzy
 msgid "Remove Icon"
 msgstr "Ustvari ikono"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 #, fuzzy
 msgid "Add An Icon"
 msgstr "(Ni Programov)"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 #, fuzzy
 msgid "Create New Icon"
 msgstr "Ustvari ikono"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 #, fuzzy
 msgid "Add Application"
 msgstr "(Ni Programov)"
@@ -6864,102 +7015,102 @@ msgstr ""
 msgid "Pager Settings"
 msgstr "Nastavitve Ovijanja"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 #, fuzzy
 msgid "Flip desktop on mouse wheel"
 msgstr "Preskoči na naslednje namizje ko se kazalec dotakne roba zaslona"
 
-#: src/modules/pager/e_mod_config.c:124 src/modules/pager/e_mod_config.c:164
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 #, fuzzy
 msgid "Show desktop names"
 msgstr "Prikaži ime namizja"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 #, fuzzy
 msgid "Popup Settings"
 msgstr "Nastavitev Popup"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 #, fuzzy
 msgid "Show popup on desktop change"
 msgstr "Prikaži minimirana okna"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 #, fuzzy
 msgid "Show popup for urgent windows"
 msgstr "Prikaži minimirana okna"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 #, fuzzy
 msgid "Select and Slide button"
 msgstr "Izberi okno"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 msgid "Click to set"
 msgstr "Fokus na Klik"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 #, fuzzy
 msgid "Drag whole desktop"
 msgstr "Navidezno Namizje"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: 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
 msgid "%.0f px"
 msgstr "%1.0f fps"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 #, fuzzy
 msgid "Resistance to dragging"
 msgstr "Upor med Okni:"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 #, fuzzy
 msgid "Popup pager height"
 msgstr "Hitrost popup-a"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 #, fuzzy
 msgid "Popup speed"
 msgstr "Hitrost popup-a"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekund"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 #, fuzzy
 msgid "Urgent Window Settings"
 msgstr "Nastavitve Seznama Oken"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 #, fuzzy
 msgid "Show popup on urgent window"
 msgstr "Prikaži minimirana okna"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 #, fuzzy
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Prikaži okna na drugih zaslonih"
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 #, fuzzy
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
@@ -6968,45 +7119,45 @@ msgstr ""
 "Pritisnite željeno zaporedje tipk,<br>ali <hilight>Izhod</hilight> za "
 "opustitev"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:343
 #, fuzzy
 msgid "Attetion"
 msgstr "Dejanje"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "Spodaj"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 #, fuzzy
 msgid "Show Pager Popup"
 msgstr "Nastavitev Popup"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "Vsa Namizja"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "To Namizje"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "Vsa Namizja"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "To Namizje"
@@ -7275,7 +7426,7 @@ msgstr ""
 msgid "Right:"
 msgstr "Svetla"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 #, fuzzy
 msgid "Mute"
 msgstr "Meni"
@@ -7321,12 +7472,12 @@ msgstr "Nastavitve Modulov"
 msgid "Mixer Settings Updated"
 msgstr "Nastavitve Osvežene"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 #, fuzzy
 msgid "Controls"
 msgstr "Nastavi nadzornika"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -7364,6 +7515,18 @@ msgstr "(Ni Programov)"
 msgid "Networks"
 msgstr ""
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+msgid "Systray"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Navidezno Namizje"
diff --git a/po/sv.gmo b/po/sv.gmo
index c481d27..c603d41 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index e28bc38..0333af6 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-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2009-03-08 02:01+0000\n"
 "Last-Translator: ersi <Unknown>\n"
 "Language-Team: Swedish\n"
@@ -19,20 +19,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Om Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -69,385 +69,387 @@ 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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nej"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Är du säker på att du vill avsluta?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Vill du verkligen logga ut?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 
-#: src/bin/e_actions.c:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 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:1919
+#: src/bin/e_actions.c:1933
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 
-#: src/bin/e_actions.c:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Är du säker på att du vill starta om?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 
-#: src/bin/e_actions.c:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 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:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Fönster : Händelser"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Flytta"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Ändra storlek"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Meny"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Fönstermeny"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Höj"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Sänk"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Döda"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Fönster : Tillstånd"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Gör klibbig"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "Minimera"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Aktivera helskärmsläge"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Maximera"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Maximera vertikalt"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Maximera horisontalt"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Maximera helskärm"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximeringspolicy \"Smart\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximeringspolicy \"Expandera\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximeringspolicy \"Fyll\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Gör ramlös"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Skrivbord"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Vänd skrivbord åt vänster"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Vänd skrivbord åt höger"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Vänd skrivbord uppåt"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Vänd skrivbord nedåt"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Vänd skrivbord med..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Visa skrivbordet"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
 msgstr "Visa hyllan"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Vänd skrivbord till..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Vänd skrivbord linjärt..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Byt till skrivbord 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Byt till skrivbord 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Byt till skrivbord 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Byt till skrivbord 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Byt till skrivbord 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Byt till skrivbord 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Byt till skrivbord 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Byt till skrivbord 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Byt till skrivbord 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Byt till skrivbord 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Byt till skrivbord 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Byt till skrivbord 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Byt till skrivbord..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Vänd skrivbord vänster (Alla skärmar)"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Vänd skrivbord höger (Alla skärmar)"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Vänd skrivbord uppåt (Alla skärmar)"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Vänd skrivbord nedåt (Alla skärmar)"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Vänd skrivbord till... (Alla skärmar)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Vänd skrivbort linjärt... (Alla skärmar)"
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Byt till skrivbord 0 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Byt till skrivbord 1 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Byt till skrivbord 2 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Byt till skrivbord 3 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Byt till skrivbord 4 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Byt till skrivbord 5 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Byt till skrivbord 6 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Byt till skrivbord 7 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Byt till skrivbord 8 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Byt till skrivbord 9 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Byt till skrivbord 10 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Byt till skrivbord 11 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Byt till skrivbord... (Alla skärmar)"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -457,102 +459,117 @@ msgstr "Byt till skrivbord... (Alla skärmar)"
 msgid "Screen"
 msgstr "Skärm"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Skicka musen till skärm 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Skicka musen till skärm 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Skicka musen till skärm..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Skicka musen 1 skärm framåt"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Skicka musen 1 skärm bakåt"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Skicka musen till skärmen framför/bakom..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Fönster : Flytta"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "Till nästa skrivbord"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Till föregående skrivbord"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Till skrivbord..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Visa huvudmenyn"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Visa favoritprogramsmenyn"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "Visa klientmeny"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Visa meny..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Kommando"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Applikation"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Starta om"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
 msgstr "Avsluta nu"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment %s modul"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Aktivera helskärmsläge"
+
+#: src/bin/e_actions.c:2813
+#, 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -565,55 +582,55 @@ msgstr "Avsluta nu"
 msgid "System"
 msgstr "System"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Logga ut"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr "Stäng av nu"
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr "Stäng av"
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Starta om"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Vänteläge"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "Viloläge"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 msgid "Lock"
 msgstr "Lås"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Städa upp fönster"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Sätt som bakgrund"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr ""
 
@@ -621,13 +638,14 @@ msgstr ""
 msgid "Color Selector"
 msgstr "Färgväljare"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -642,7 +660,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -654,7 +672,7 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 "
@@ -665,7 +683,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -674,11 +692,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
 msgstr "Inställningar uppdaterade"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -686,7 +704,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -696,7 +714,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -705,7 +723,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -714,7 +732,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -722,11 +740,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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,7 +770,7 @@ msgid "Modules"
 msgstr "Moduler"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Tillbehör"
 
@@ -761,34 +779,34 @@ msgstr "Tillbehör"
 msgid "Container %d"
 msgstr "Behållare %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Fel - Inget PAM-stöd"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Kan inte låsa"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Ange ditt lösenord för att låsa upp"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -796,6 +814,25 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
+#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Ofullständiga fönsteregenskaper"
@@ -890,23 +927,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:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Kopiera"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Klistra in"
 
@@ -940,260 +977,314 @@ msgstr ""
 "Enlightenment kunde inte köra programmet:<br><br>%s<br><br>Programmet "
 "startar inte."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Programexekveringsfel"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s stannade oväntat."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Felloggar"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Det finns inget felmeddelande."
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Spara detta meddelande"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Felinformation"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Signalinformation"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Utdata"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Det finns ingen utdata."
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s existerar inte."
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Körfel"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Körfel"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Fel"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i filer"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
 msgstr "Länk"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr "Avbryt"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
 msgstr "Ärv förälderinställningar"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Visningsläge"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Uppdatera vy"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Visa dolda filer"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "Kom ihåg ordning"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Sortera nu"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Ny katalog"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Byt namn"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Typsnitt"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Rutnätsikoner"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Ikonstorlek (%d)"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Sätt som bakgrund"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "Panelens innehåll"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Rensa"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Skapa ny mapp"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Namn på ny mapp:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "Döp om %s till:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Byt namn"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Fel"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr "Nej till allt"
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr "Ja till allt"
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "Startar"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, 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:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr "Ignorera"
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr "Ignorera alla"
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Bekräfta borttagning"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, 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:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1254,8 +1345,8 @@ msgid "Preview"
 msgstr "Förhandsgranska"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr ""
 
@@ -1264,7 +1355,7 @@ msgid "Thumbnail"
 msgstr "Tumnagel"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr ""
 
@@ -1280,70 +1371,70 @@ msgstr "Länkinformation"
 msgid "Select an Image"
 msgstr "Välj en bild"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr "Okänd volym"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Enkel"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "Infälld"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Utseende"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "Rulla innehåll automatiskt"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Storlek kan ändras"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Ta bort denna modul"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1392,8 +1483,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1401,7 +1492,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Stapla"
 
@@ -1579,12 +1670,12 @@ msgstr "Helskärm"
 msgid "Window List"
 msgstr "Fönsterlista"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Sökare"
 
@@ -1861,11 +1952,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr "Inställningar"
 
@@ -1899,8 +1990,8 @@ msgstr "Laddade moduler"
 msgid "Unload Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1930,12 +2021,12 @@ msgstr "Valda moduler"
 msgid "Remove Gadget"
 msgstr "Ta bort"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: 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:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Placering"
 
@@ -2021,122 +2112,122 @@ msgstr "(Inga fönster)"
 msgid "No name!!"
 msgstr "Inget namn!!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Panelinställningar"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Medium"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Stora"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Panelens innehåll"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Alltid överst"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Under fönster"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Alltid nederst"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "Annpassa storlek efter innehåll"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixlar"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Tema"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "Dölj automatiskt"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f seconds"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "Visa på alla skrivbord"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "Visa på valda skrivbord"
 
@@ -2483,7 +2574,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment kan inte starta sitt dnd system."
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2664,11 +2755,18 @@ msgstr "Enlightenment %s modul"
 msgid "Would you like to unload this module?<br>"
 msgstr "Vill du stänga av denna modulen?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -2676,20 +2774,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:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Sluta flytta/ändra storlek på moduler"
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Flytta/ändra storlek på moduler"
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Panelens innehåll"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Ta bort denna panel"
 
@@ -2831,7 +2929,7 @@ msgstr ""
 msgid "Set As Theme"
 msgstr ""
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Panelens innehåll"
@@ -2850,67 +2948,67 @@ 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:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li år sedan"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li månader sedan"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li veckor sedan"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li dagar sedan"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li timmar sedan"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minuter sedan"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -2922,7 +3020,7 @@ msgstr "Okänd"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Lägg till"
 
@@ -2945,7 +3043,7 @@ msgid "Add to Favorites"
 msgstr ""
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3059,6 +3157,7 @@ msgid "Internal"
 msgstr ""
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
@@ -3070,24 +3169,24 @@ msgstr "Hårdvara"
 msgid "Battery"
 msgstr "Batteri"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr "Batterimätare"
 
@@ -3096,10 +3195,24 @@ msgid "Clock"
 msgstr "Klocka"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
 msgstr "Inställningspanel"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Interaktion"
+
+#: src/modules/conf/e_mod_main.c:241
+msgid "Offline"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Moduler"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3122,7 +3235,7 @@ msgid "Restart Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr ""
 
@@ -3479,41 +3592,54 @@ msgstr "Sträck"
 msgid "Desk"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Automatisk lås"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: 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:176
+#: 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:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+msgid "Time after screensaver activated"
+msgstr "Tid innan X-skärmsläckare startar"
+
+#: 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 sekunder"
+
+#: 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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 minuter"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3524,27 +3650,27 @@ msgstr "%1.0f minuter"
 msgid "Personal"
 msgstr "Personlig"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "Inloggningsruta"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
 msgstr "Visa på alla skärmområde"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:337
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr "Visa på aktuellt skärmområde"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:341
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
 msgstr "Visa på skärmområde #:"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3553,29 +3679,49 @@ msgstr "Visa på skärmområde #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "Använd temats bakgrund"
+
+#: 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:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr ""
 
@@ -3583,59 +3729,74 @@ msgstr ""
 msgid "Screen Lock"
 msgstr "Skärmlås"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Antal skrivbord"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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 "Skrivbordsbyte med mus"
 
-#: src/modules/conf_desks/e_int_config_desks.c:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Skrivbord"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Byt skrivbord när objekt dras till kanten på skärmen"
 
-#: src/modules/conf_desks/e_int_config_desks.c:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 sek"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Bakgrund"
+
+#: 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 "Virtuella skrivbord"
@@ -3651,8 +3812,8 @@ msgstr ""
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -3802,23 +3963,23 @@ msgstr ""
 msgid "Display Power Management Settings"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: 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:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr ""
 
@@ -4387,7 +4548,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f pixlar"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4604,7 +4765,7 @@ 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Filer"
 
@@ -4946,55 +5107,50 @@ msgstr "Maximum"
 msgid "Scaling"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Skärmsläckarinställningar"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 "Aktivera X-skärmsläckare"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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 "Tid innan X-skärmsläckare startar"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: 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:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f sekunder"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "Blankning"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "Tillåt"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "Tillåt inte"
 
@@ -5007,7 +5163,7 @@ msgid "Configured Shelves"
 msgstr "Befintliga paneler"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Uppstart"
@@ -5054,10 +5210,6 @@ msgstr "Temakategorier"
 msgid "Assign"
 msgstr "Tilldela"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "Rensa"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "Rensa alla"
@@ -5901,27 +6053,19 @@ msgstr ""
 msgid "Run Command Dialog"
 msgstr "Kör kommando"
 
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount error"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
 msgstr "Hem"
 
-#: src/modules/fileman/e_mod_main.c:332
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -5932,7 +6076,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -5942,95 +6086,103 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Storlek på ikoner"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
 msgstr "Visa"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Grundstorlek"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "Använd enkelklick"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:257
-msgid "Show HAL icons on desktop"
-msgstr ""
-
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
 msgstr "Beteende"
 
-#: src/modules/fileman/e_fwin.c:1187
+#: 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:1462
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "Lägg till applikation..."
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Öppna"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Öppna med..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "Applikationer"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Specifik applikation"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr ""
 
@@ -6119,39 +6271,39 @@ msgstr "Föregående fönster"
 msgid "Select a window"
 msgstr "Välj ett fönster"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "Välj källa"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Ikonbeskrivning"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Visa ikonetikett"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr ""
 
@@ -6168,27 +6320,27 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Är du säker på att du vill ta bort denna källa?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Ändra ikonegenskaper"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Ta bort ikon"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr "Lägg till en ikon"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr "Skapa ny ikon"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Lägg till applikation"
 
@@ -6240,128 +6392,128 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: 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:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr "Popup inställningar"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr "Dra hela skrivbordet"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekunder"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 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:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6604,7 +6756,7 @@ msgstr "Vänster:"
 msgid "Right:"
 msgstr "Höger:"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr ""
 
@@ -6644,11 +6796,11 @@ msgstr ""
 msgid "Mixer Settings Updated"
 msgstr ""
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
 msgstr "Kontroller"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6682,6 +6834,19 @@ msgstr ""
 msgid "Networks"
 msgstr "Nätverk"
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "System"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Konfiguera virituella skrivbord"
 
@@ -7126,9 +7291,6 @@ msgstr "Nätverk"
 #~ msgid "Show windows from all zones"
 #~ msgstr "Visa fönster från alla zoner"
 
-#~ msgid "Font"
-#~ msgstr "Typsnitt"
-
 #~ msgid "Stop editing"
 #~ msgstr "Sluta redigera"
 
@@ -7291,9 +7453,6 @@ msgstr "Nätverk"
 #~ msgid "About…"
 #~ msgstr "Om..."
 
-#~ msgid "Background Settings"
-#~ msgstr "Bakgrund"
-
 #~ msgid "To the left"
 #~ msgstr "Till vänster"
 
diff --git a/po/tr.gmo b/po/tr.gmo
index e5e54fa..66e458f 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index a95bad3..b783802 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-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2009-03-19 23:19+0200\n"
 "Last-Translator: H. İbrahim Güngör <h.ibrahim.gungor at gmail.com>\n"
 "Language-Team: Turkish <>\n"
@@ -22,20 +22,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Enlightenment Hakkında"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -79,55 +79,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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Evet"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Hayır"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "Çıkmak istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 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:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "Oturumu Kapatmak istediğinizden eminmisiniz?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "Kapatmak istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "Yeniden başlatmak istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -135,7 +137,7 @@ msgstr ""
 "Bilgisayarınızı yeniden başlatmak istediniz.<br><br>Bilgisayarı yeniden "
 "başlatmak istediğinize emin misiniz?"
 
-#: src/bin/e_actions.c:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -143,11 +145,11 @@ msgstr ""
 "Bilgisayarınızı askıya almak istediniz.<br><br>Askıya lamak istediğinizden "
 "emin misiniz?"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "Uyku moduna geçmek istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -155,317 +157,317 @@ msgstr ""
 "Bilgisayarınızı uyku moduna almak istediniz<br><br>Diske askıya almak "
 "istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "Pencere : Eylemler"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Taşı"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "Boyutlandır"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menü"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "Pencere Menüsü"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "Üste Çıkar"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "Alta Gönder"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "Sonlandır"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "Pencere : Durum"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "Yapışkan Mod Değiştir"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "İcon Modu Değiştir"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "Tam Ekran Modu Değiştir"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "Büyüt"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "Dikey Büyüt"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "Yatay Büyüt"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "Tam Ekran Büyüt"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "Büyüt \"Smart\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "Büyüt \"Expand\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "Büyüt \"Fill\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "Yukarı Gölgelendir Değiştir"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "Aşağı Gölgelendir Değiştir"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "Sola Gölgelendir Değiştir"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "Sağa Gölgelendir Değiştir"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "Gölgelendirme Modu Değiştir"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "Çerçevesiz Durum Değiştir"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "İğnelenmiş Durum Değiştir"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "Masaüstü"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "Masaüstünü Sola Çevir"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "Masaüstünü Sağa Çevir"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "Masaüstünü Yukarı Çevir"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "Masaüstünü Aşagı Çevir"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "Masaüstünü ...ile Çevir"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "Masaüstünü Göster"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
 msgstr "Rafı Göster"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "Masaüstünü ...'e çevir"
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "Masaüstünü Doğrusal Olarak Çevir"
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "Masaüstü 0 'a geç"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "Masaüstü 1 'e geç"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "Masaüstü 2 'ye geç"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "Masaüstü 3 'e geç"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "Masaüstü 4 'e geç"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "Masaüstü 5 'e geç"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "Masaüstü 6 'ya geç"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "Masaüstü 7 'ye geç"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "Masaüstü 8 'e geç"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "Masaüstü 9 'a geç"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "Masaüstü 10 'a geç"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "Masaüstü 11 'e geç"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "Masaüstü ... geç"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Masaüstünü Sola Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Masaüstünü Sağa Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Masaüstünü Yukarı Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Masaüstünü Aşağı Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Masaüstünü ... ile Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Masaüstünü ... 'e Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Masaüstünü Doğrusal Olarak Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "Masaüstünü ...'e çevir"
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Masaüstü 0'a geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Masaüstü 1'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Masaüstü 2'ye geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Masaüstü 3'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Masaüstü 4'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Masaüstü 5'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Masaüstü 6'ya geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Masaüstü 7'ye geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Masaüstü 8'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Masaüstü 9'a geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Masaüstü 10'a geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Masaüstü 11'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Masaüstü...'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/modules/conf_desklock/e_mod_main.c:34
 #: src/modules/conf_desks/e_mod_main.c:34
 #: src/modules/conf_display/e_mod_main.c:34
@@ -475,103 +477,118 @@ msgstr "Masaüstü...'e geç (Tüm Ekranlar)"
 msgid "Screen"
 msgstr "Ekran"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "Fareyi Ekran 0'a Gönder"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "Fareyi Ekran 1'e Gönder"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "Fareyi ekran... Gönder"
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Fareyi 1 Ekran İleri Gönder"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "Fareyi 1 Ekran Geri Gönder"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Fareyi İleri/Geri Ekran... Göder"
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "Pencere : Taşı"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "İleri Masaüstüne"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "Geri Masaüstüne"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "Masaüstü ile #..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "Masaüstüne..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "Ana Menüyü Göster"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "Favoriler Menüsünü Göster"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "Tüm Uygulamalar Menüsünü Göster"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "İstemciler Menüsünü Göster"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "Menüyü... Göster"
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Komut"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "Uygulama"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Yeniden Başlat"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Çık"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 #, fuzzy
 msgid "Exit Now"
 msgstr "Çık"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment %s Modülü"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "Tam Ekran Modu Değiştir"
+
+#: src/bin/e_actions.c:2813
+#, fuzzy
+msgid "Offline Mode Toggle"
+msgstr "Gölgelendirme Modu Değiştir"
+
+#: 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -584,57 +601,57 @@ msgstr "Çık"
 msgid "System"
 msgstr "Sistem"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "Oturumu Kapat"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "Yeniden Başlat"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "Askıya Al"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 #, fuzzy
 msgid "Hibernate"
 msgstr "Uykuya Alınıyor"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 #, fuzzy
 msgid "Lock"
 msgstr "Kilitler"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "Pencereleri Temizle"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr "Genel : Eylemler"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
 msgstr "Ertelenmiş Eylem"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Masaüstü Arkaplanı Yap"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "Masaüstü dosya  araması bitti"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "Masaüstü dosya araması"
 
@@ -643,13 +660,14 @@ msgstr "Masaüstü dosya araması"
 msgid "Color Selector"
 msgstr "Profil Seçici"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -664,7 +682,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -676,7 +694,7 @@ msgstr "Tamam"
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 "
@@ -687,7 +705,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -696,11 +714,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
 msgstr ""
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -708,7 +726,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -718,7 +736,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -727,7 +745,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -736,7 +754,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -744,11 +762,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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
@@ -774,7 +792,7 @@ msgid "Modules"
 msgstr "Modüller"
 
 #: 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "Eklentiler"
 
@@ -783,34 +801,34 @@ msgstr "Eklentiler"
 msgid "Container %d"
 msgstr "Taşıycı %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "Hata- PAM desteği yok"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "Kilitleme Başarısız Oldu"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "Lütfen kilidi açma parolanızı giriniz"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -818,6 +836,25 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
+#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "Tamamlanmamış Pencere Özellikleri"
@@ -912,23 +949,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:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Sil"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "Kes"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "Kopyala"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "Yapıştır"
 
@@ -962,261 +999,315 @@ msgstr ""
 "Enlightenment uygulamayı çalıştıramadı:<br><br>%s<br><br>Uygulama "
 "çalıştırılamadı."
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "Uygulama Çalıştırma Hatası"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s beklenmedik şekilde çalışmayı durdurdu."
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, 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:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s Kesme Sinyali ile durduruldu."
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s Çık Sinyali ile durduruldu."
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s Durdur Sinyali ile durduruldu."
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s Ondalıklı Sayı Hatası ile durduruldu."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s Durdurulamaz Sonlandırma Sinyali ile durduruldu."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s Bölümleme Hatası tarafından durduruldu."
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s Hatalı İletici tarafından duruduruldu."
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s Bitirme Sinyali tarafından durudurldu."
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s Veriyolu Hatası tarafından durdurldu."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s %i sinyal numarası tarafından durduruldu."
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 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:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "Hata Kayıtları"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "Hata mesajı yoktu"
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "Mesajı Kaydet"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, 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:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "Hata Bilgsi"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "Hata Sinyali Bilgisi"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "Veri Çıktısı"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "Çıktı yok."
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr "Mevcut olmayan yol"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s mevcut değil."
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Yürütme Hatası"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Yürütme Hatası"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Hata"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i Dosya"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 #, fuzzy
 msgid "Link"
 msgstr "Doğrusal"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr "Vazgeç"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Etkileşim Ayarları"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Görünüm Kipi"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "Görünümü Yenile"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "Gizli Dosyaları Göster"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "Sıralamayı Hatırla"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "Şimdi Sırala"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Yeni Dizin"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "Yeniden Adlandır"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Sessiz"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
 msgstr "Öntanımlıyı kullan"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Özel Simgeler"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Listele"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Simge Boyutu (%d)"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "Masaüstü Arkaplanı Yap"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "Raf İçeriği"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Temizle"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "Yeni Dizin Oluştur"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "Yeni Dizin Adı:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "Dosyayı Yeniden Adlandır"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr "Yeniden Dene"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "Hata"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr "Tümüne hayır"
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr "Tümüne evet"
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 msgid "Warning"
 msgstr ""
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr "Görmezden gel"
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr "Tümünü görmezden gel"
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "Silme İşlemini Onayla"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1275,8 +1366,8 @@ msgid "Preview"
 msgstr "Önizleme"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: 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ı"
 
@@ -1285,7 +1376,7 @@ msgid "Thumbnail"
 msgstr "Parçacık"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Özel"
 
@@ -1301,70 +1392,70 @@ msgstr "Bağlantı Bilgisi"
 msgid "Select an Image"
 msgstr "Resim Seç"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
 msgstr "Bilinmeyen Hacim"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "Kaldırılabilir Aygıt"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "Düz"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "Görünüm"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "İçeriği otomatik kaydır"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "Yeniden boyutlandırılabilir"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "Aleti oynat/yeniden boyutlandır"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "Bu aleti kaldır"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1413,8 +1504,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1422,7 +1513,7 @@ 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:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "Kümeleme"
 
@@ -1600,12 +1691,12 @@ msgstr "Tam Ekran"
 msgid "Window List"
 msgstr "Pencere Listesi"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "Sayfalayıcı"
 
@@ -1855,11 +1946,11 @@ msgstr "Açılışta her zaman odakla"
 #: 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr "Ayarlar"
 
@@ -1893,8 +1984,8 @@ msgstr "Yüklenmiş Modüller"
 msgid "Unload Module"
 msgstr "Modülü Kaldır"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1924,12 +2015,12 @@ msgstr "Seçili Aletler"
 msgid "Remove Gadget"
 msgstr "Aleti Kaldır"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 msgid "Toolbar Settings"
 msgstr "Araç Çubugu Ayarları"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "Yerleşim Planı"
 
@@ -2012,122 +2103,122 @@ msgstr "(Pencere Yok)"
 msgid "No name!!"
 msgstr "Ad yok!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(Raf Yok)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Raf #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "Raf Ekle"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "Rafı Sil"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Raf Ayarları"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Ufak"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Orta"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Geniş"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Kocaman"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Raf İçeriği"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "Herşeyin Üstünde"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "Pencerelerin Altında"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "Herşeyin Altında"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "İçeriğin Boyutuna Göre Küçült"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f piksel"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "Biçemler"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "Otomatik Gizle"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "Rafı otomatik gizle"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f saniye"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "Gizli kalma süresi"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "Tüm masaüstlerinde göster"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "Belirli masaüstlerinde göster"
 
@@ -2432,7 +2523,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2606,30 +2697,37 @@ msgstr "Enlightenment %s Modülü"
 msgid "Would you like to unload this module?<br>"
 msgstr "Bu modülü çıkarmak istiyor musunuz?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 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:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Nesneleri Taşımayı/Boyutlandırmayı Durdur"
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Nesneleri Taşımaya/Boyutlandırmaya Başla"
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Raf İçeriği"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "Bu Rafı Sil"
 
@@ -2775,7 +2873,7 @@ msgstr "Tema Hakında"
 msgid "Set As Theme"
 msgstr "Tema Olarak Ayarla"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "Araç Çubuğu İçeriği"
@@ -2794,67 +2892,67 @@ 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:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bayt"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "Gelecekte"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "Geçen dakika içinde"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Yıl önce"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Ay önce"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Hafta önce"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Gün önce"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Saat önce"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Dakika önce"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -2866,7 +2964,7 @@ msgstr "Bilinmiyor"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "Ekle"
 
@@ -2889,7 +2987,7 @@ msgid "Add to Favorites"
 msgstr "Favorilere Ekle"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3009,6 +3107,7 @@ msgid "Internal"
 msgstr "Dahili"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
@@ -3021,24 +3120,24 @@ msgstr ""
 msgid "Battery"
 msgstr "Pil"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr "Pil zayıf!"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr "AC güce geçmeniz önerilir."
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr "HATA"
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr "Pil Göstergesi"
 
@@ -3047,10 +3146,25 @@ msgid "Clock"
 msgstr "Saat"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
 msgstr "Ayarlar Paneli"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "Ayarlar"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "Çevrimiçi..."
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "Modüller"
+
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
@@ -3073,7 +3187,7 @@ msgid "Restart Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "Tüm Uygulamalar"
 
@@ -3430,41 +3544,54 @@ msgstr "Uzat"
 msgid "Desk"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "Ekran Kilidi Ayarları"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "Otomatik Kilitleme"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 msgid "Lock when Enlightenment starts"
 msgstr "Enlightenment başlayınca kilitle"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
 msgstr "X ekran koruyucu etkinleşince kilitle"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+msgid "Time after screensaver activated"
+msgstr "X ekran koruyucu etkinleşince kilitle"
+
+#: 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 saniye"
+
+#: 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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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 dakika"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:240
+#: 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
@@ -3475,27 +3602,27 @@ msgstr "%1.0f dakika"
 msgid "Personal"
 msgstr "Kişisel"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr ""
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: 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:337
+#: 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:341
+#: 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:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3504,29 +3631,49 @@ msgstr ""
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "Duvarkağıdı Modu"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
 #: src/modules/gadman/e_mod_config.c:149
 msgid "Theme Defined"
 msgstr "Tanımlı Tema"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Tema Duvarkağıdı"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+msgid "User Wallpaper"
+msgstr "Tema Duvarkağıdını Kullan"
+
+#: 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 "Özek Ekran Kilidi"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "Özel ekrankilidi kullan"
 
@@ -3534,59 +3681,74 @@ msgstr "Özel ekrankilidi kullan"
 msgid "Screen Lock"
 msgstr "Ekran Kilidi"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "Sanal Masaüstü Ayarları"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "Masaüstü Sayısı"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "Masaüstleri"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: 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:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "Kapalı"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr ""
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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 saniye"
 
+#: src/modules/conf_desks/e_int_config_desks.c:317
+#, fuzzy
+msgid "Background panning"
+msgstr "Arkaplan Değişimi"
+
+#: 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 "Sanal Masaüstleri"
@@ -3602,8 +3764,8 @@ msgstr "Diyalog Ayarları"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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"
@@ -3753,23 +3915,23 @@ msgstr ""
 msgid "Display Power Management Settings"
 msgstr "Ekran Güç Yönetimi Ayarları"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
 msgid "Enable Display Power Management"
 msgstr "Ekran Güç Yönetimini Etkinleştir"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
 msgstr "Zamanlayıcılar"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr ""
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr ""
 
@@ -4344,7 +4506,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f piksel"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4561,7 +4723,7 @@ msgid "Select an Edj File"
 msgstr "Edj Dosyası Seç"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "Dosyalar"
 
@@ -4906,55 +5068,50 @@ msgstr "Azami"
 msgid "Scaling"
 msgstr "Ölçekleme"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "Ekran Koruyucu Ayarları"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 ekran koruyucuyu etkinleştir"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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:168
+#: 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:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f saniye"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "İzin Ver"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "İzin Verme"
 
@@ -4967,7 +5124,7 @@ msgid "Configured Shelves"
 msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "Dosya Yöneticisini Ayarla"
@@ -5012,10 +5169,6 @@ msgstr "Tema Kategorileri"
 msgid "Assign"
 msgstr "Ata"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "Temizle"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "Tümünü Temizle"
@@ -5857,30 +6010,21 @@ msgstr ""
 msgid "Run Command Dialog"
 msgstr "Komut Çalıştırma Diyalogu"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "Yürütme Hatası"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
 msgstr "Ev"
 
-#: src/modules/fileman/e_mod_main.c:332
+#: src/modules/fileman/e_mod_main.c:322
 #, fuzzy
 msgid "Favorites"
 msgstr "Favoriler Menüsü"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 #, fuzzy
 msgid "Root"
 msgstr "Yeniden Başlat"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -5891,7 +6035,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -5901,96 +6045,104 @@ msgid ""
 "for the inconvenience.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr "Dosya Yöneticisi Ayarları"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "Simge Boyutu"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 #, fuzzy
 msgid "View"
 msgstr "Görünüm Kipi"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr "Dizinleri Olduğu Yerde Aç"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "Önce Dizinleri Sırala"
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "Temel Boyut"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "Tek Tık Kullan"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr "Simge Uzantısını Göster"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "Tam Yolu Göster"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr "Masaüstü Simgelerini Göster"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr "Araç Çubuğunu Göster"
 
-#: src/modules/fileman/e_mod_config.c:257
-msgid "Show HAL icons on desktop"
-msgstr "Masaüstünde HAL simgelerini göster"
-
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
 msgstr "Davranış"
 
-#: src/modules/fileman/e_fwin.c:1187
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr "Masaüstünde HAL simgelerini göster"
+
+#: 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:1462
 msgid "Go to Parent Directory"
 msgstr "Üst Dizine Git"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "Uygulama Ekle"
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "Aç"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "Şununla Aç..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "Uygulamalar"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "Belirli Uygulamalar"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr "Özel Komut"
 
@@ -6080,39 +6232,39 @@ msgstr "Önceki Pencere"
 msgid "Select a window"
 msgstr "Bir Pencere Seç"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
 msgstr "IBar Ayarları"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "Simge Etiketleri"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "Simge Etiketini Göster"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "Uygulama Adını Göster"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "Uygulama Yorumunu Göster"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr ""
 
@@ -6127,27 +6279,27 @@ msgstr ""
 msgid "Are you sure you want to delete this bar source?"
 msgstr ""
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "Simge Özelliklerini Değiştir"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "Simgeyi Kaldır"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr "Simge Ekle"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr "Yeni Simge Oluştur"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "Uygulama Ekle"
 
@@ -6199,128 +6351,128 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr "Sayfalayıcı Ayarları"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 msgid "Show desktop names"
 msgstr "Masaüstü adlarını göster"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr "Sürükle ve Bırak düğmesi"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr "Tüm masaüstünü sürükle"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "Sürüklemeye karşı direnç"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f saniye"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 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:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "%i Düğmesi"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6564,7 +6716,7 @@ msgstr "Sol:"
 msgid "Right:"
 msgstr "Sağ:"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr "Sessiz"
 
@@ -6604,12 +6756,12 @@ msgstr "Karıştırıcı Modülü Ayarları"
 msgid "Mixer Settings Updated"
 msgstr "Karıştırı Ayarları Güncellendi"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 #, fuzzy
 msgid "Controls"
 msgstr "Sistem Kontrolleri"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6643,6 +6795,19 @@ msgstr "Belirli Aygıt"
 msgid "Networks"
 msgstr "Ağlar"
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "Sistem"
+
 #~ msgid "Defined Command"
 #~ msgstr "Tanımlanmış Komut"
 
diff --git a/po/uk.gmo b/po/uk.gmo
new file mode 100644
index 0000000..d4ab99d
Binary files /dev/null and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
new file mode 100644
index 0000000..a113ca1
--- /dev/null
+++ b/po/uk.po
@@ -0,0 +1,6732 @@
+# This file is put in the public domain.
+#
+# Daniel Korostil <ted.korostiled at gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: e.HEAD\n"
+"Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
+"PO-Revision-Date: 2009-06-07 22:51+0300\n"
+"Last-Translator: Daniel Korostil <ted.korostiled at gmail.com>\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"
+
+#: 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:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
+#: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
+#: src/modules/conf/e_conf.c:178
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_theme/e_int_config_theme_web.c:130
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
+#: src/modules/fileman/e_fwin.c:1876 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:666
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
+#: src/modules/wizard/page_000.c:27
+msgid "Enlightenment"
+msgstr "Enlightenment"
+
+#: src/bin/e_about.c:26
+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-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>"
+
+#: 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: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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+msgid "No"
+msgstr "Ні"
+
+#: src/bin/e_actions.c:1769
+msgid "Are you sure you want to exit?"
+msgstr ""
+
+#: src/bin/e_actions.c:1771
+msgid ""
+"You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
+msgstr ""
+
+#: src/bin/e_actions.c:1867
+msgid "Are you sure you want to log out?"
+msgstr ""
+
+#: src/bin/e_actions.c:1869
+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
+msgid "Are you sure you want to turn off?"
+msgstr ""
+
+#: src/bin/e_actions.c:1933
+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
+msgid "Are you sure you want to reboot?"
+msgstr ""
+
+#: src/bin/e_actions.c:1997
+msgid ""
+"You requested to reboot your Computer.<br><br>Are you sure you want to "
+"restart it?"
+msgstr ""
+
+#: src/bin/e_actions.c:2061
+msgid ""
+"You requested to suspend your Computer.<br><br>Are you sure you want to "
+"suspend?"
+msgstr ""
+
+#: src/bin/e_actions.c:2123
+msgid "Are you sure you want to hibernate?"
+msgstr ""
+
+#: src/bin/e_actions.c:2125
+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
+msgid "Window : Actions"
+msgstr "Вікно : дії"
+
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
+msgid "Move"
+msgstr "Пересунути"
+
+#: src/bin/e_actions.c:2470
+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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
+msgid "Menu"
+msgstr "Меню"
+
+#: src/bin/e_actions.c:2481
+msgid "Window Menu"
+msgstr "Меню вікна"
+
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
+msgid "Raise"
+msgstr ""
+
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
+msgid "Lower"
+msgstr ""
+
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
+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
+msgid "Window : State"
+msgstr "Вікна : стан"
+
+#: src/bin/e_actions.c:2509
+msgid "Sticky Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2516
+msgid "Iconic Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2523
+msgid "Fullscreen Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
+#: src/bin/e_int_border_menu.c:350
+msgid "Maximize"
+msgstr ""
+
+#: src/bin/e_actions.c:2532
+msgid "Maximize Vertically"
+msgstr ""
+
+#: src/bin/e_actions.c:2535
+msgid "Maximize Horizontally"
+msgstr ""
+
+#: src/bin/e_actions.c:2538
+msgid "Maximize Fullscreen"
+msgstr ""
+
+#: src/bin/e_actions.c:2540
+msgid "Maximize Mode \"Smart\""
+msgstr ""
+
+#: src/bin/e_actions.c:2542
+msgid "Maximize Mode \"Expand\""
+msgstr ""
+
+#: src/bin/e_actions.c:2544
+msgid "Maximize Mode \"Fill\""
+msgstr ""
+
+#: src/bin/e_actions.c:2551
+msgid "Shade Up Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2553
+msgid "Shade Down Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2555
+msgid "Shade Left Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2557
+msgid "Shade Right Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2559
+msgid "Shade Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2566
+msgid "Toggle Borderless State"
+msgstr ""
+
+#: src/bin/e_actions.c:2571
+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: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:687
+#: 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
+msgid "Desktop"
+msgstr "Стільниця"
+
+#: src/bin/e_actions.c:2576
+msgid "Flip Desktop Left"
+msgstr ""
+
+#: src/bin/e_actions.c:2578
+msgid "Flip Desktop Right"
+msgstr ""
+
+#: src/bin/e_actions.c:2580
+msgid "Flip Desktop Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2582
+msgid "Flip Desktop Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2584
+msgid "Flip Desktop By..."
+msgstr ""
+
+#: src/bin/e_actions.c:2590
+msgid "Show The Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2595
+msgid "Show The Shelf"
+msgstr ""
+
+#: src/bin/e_actions.c:2600
+msgid "Flip Desktop To..."
+msgstr ""
+
+#: src/bin/e_actions.c:2606
+msgid "Flip Desktop Linearly..."
+msgstr ""
+
+#: src/bin/e_actions.c:2612
+msgid "Switch To Desktop 0"
+msgstr ""
+
+#: src/bin/e_actions.c:2614
+msgid "Switch To Desktop 1"
+msgstr ""
+
+#: src/bin/e_actions.c:2616
+msgid "Switch To Desktop 2"
+msgstr ""
+
+#: src/bin/e_actions.c:2618
+msgid "Switch To Desktop 3"
+msgstr ""
+
+#: src/bin/e_actions.c:2620
+msgid "Switch To Desktop 4"
+msgstr ""
+
+#: src/bin/e_actions.c:2622
+msgid "Switch To Desktop 5"
+msgstr ""
+
+#: src/bin/e_actions.c:2624
+msgid "Switch To Desktop 6"
+msgstr ""
+
+#: src/bin/e_actions.c:2626
+msgid "Switch To Desktop 7"
+msgstr ""
+
+#: src/bin/e_actions.c:2628
+msgid "Switch To Desktop 8"
+msgstr ""
+
+#: src/bin/e_actions.c:2630
+msgid "Switch To Desktop 9"
+msgstr ""
+
+#: src/bin/e_actions.c:2632
+msgid "Switch To Desktop 10"
+msgstr ""
+
+#: src/bin/e_actions.c:2634
+msgid "Switch To Desktop 11"
+msgstr ""
+
+#: src/bin/e_actions.c:2636
+msgid "Switch To Desktop..."
+msgstr ""
+
+#: src/bin/e_actions.c:2642
+msgid "Flip Desktop Left (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2644
+msgid "Flip Desktop Right (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2646
+msgid "Flip Desktop Up (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2648
+msgid "Flip Desktop Down (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2650
+msgid "Flip Desktop By... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2656
+msgid "Flip Desktop To... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2662
+msgid "Flip Desktop Linearly... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2668
+msgid "Flip Desktop In Direction..."
+msgstr ""
+
+#: src/bin/e_actions.c:2673
+msgid "Switch To Desktop 0 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2675
+msgid "Switch To Desktop 1 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2677
+msgid "Switch To Desktop 2 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2679
+msgid "Switch To Desktop 3 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2681
+msgid "Switch To Desktop 4 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2683
+msgid "Switch To Desktop 5 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2685
+msgid "Switch To Desktop 6 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2687
+msgid "Switch To Desktop 7 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2689
+msgid "Switch To Desktop 8 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2691
+msgid "Switch To Desktop 9 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2693
+msgid "Switch To Desktop 10 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2695
+msgid "Switch To Desktop 11 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2697
+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/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
+msgid "Screen"
+msgstr "Екран"
+
+#: src/bin/e_actions.c:2704
+msgid "Send Mouse To Screen 0"
+msgstr ""
+
+#: src/bin/e_actions.c:2706
+msgid "Send Mouse To Screen 1"
+msgstr ""
+
+#: src/bin/e_actions.c:2708
+msgid "Send Mouse To Screen..."
+msgstr ""
+
+#: src/bin/e_actions.c:2713
+msgid "Send Mouse Forward 1 Screen"
+msgstr ""
+
+#: src/bin/e_actions.c:2715
+msgid "Send Mouse Back 1 Screen"
+msgstr ""
+
+#: src/bin/e_actions.c:2717
+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
+msgid "Window : Moving"
+msgstr ""
+
+#: src/bin/e_actions.c:2755
+msgid "To Next Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2757
+msgid "To Previous Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2759
+msgid "By Desktop #..."
+msgstr ""
+
+#: src/bin/e_actions.c:2765
+msgid "To Desktop..."
+msgstr ""
+
+#: src/bin/e_actions.c:2771
+msgid "Show Main Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2773
+msgid "Show Favorites Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2775
+msgid "Show All Applications Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2777
+msgid "Show Clients Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2779
+msgid "Show Menu..."
+msgstr ""
+
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
+#: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
+#: 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
+msgid "Command"
+msgstr "Команду"
+
+#: src/bin/e_actions.c:2791
+msgid "Application"
+msgstr "Програму"
+
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+msgid "Restart"
+msgstr "Перезапустити"
+
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+msgid "Exit"
+msgstr "Вийти"
+
+#: src/bin/e_actions.c:2803
+msgid "Exit Now"
+msgstr "Вийти зараз"
+
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+msgid "Enlightenment : Mode"
+msgstr ""
+
+#: src/bin/e_actions.c:2808
+msgid "Presentation Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2813
+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_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_wallpaper/e_int_config_wallpaper.c:513
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: 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
+msgid "Log Out"
+msgstr "Вийти"
+
+#: src/bin/e_actions.c:2821
+msgid "Power Off Now"
+msgstr "Вимкнути зараз"
+
+#: src/bin/e_actions.c:2825
+msgid "Power Off"
+msgstr "Вимкнути"
+
+#: src/bin/e_actions.c:2829
+msgid "Reboot"
+msgstr "Перезавантажити"
+
+#: src/bin/e_actions.c:2833
+msgid "Suspend"
+msgstr ""
+
+#: src/bin/e_actions.c:2837
+msgid "Hibernate"
+msgstr ""
+
+#: src/bin/e_actions.c:2845
+msgid "Lock"
+msgstr ""
+
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+msgid "Cleanup Windows"
+msgstr ""
+
+#: src/bin/e_actions.c:2855
+msgid "Generic : Actions"
+msgstr ""
+
+#: src/bin/e_actions.c:2855
+msgid "Delayed Action"
+msgstr ""
+
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+msgid "Set As Background"
+msgstr ""
+
+#: src/bin/e_border.c:5080
+msgid "Desktop files scan done"
+msgstr ""
+
+#: src/bin/e_border.c:5092
+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:1788
+#: src/bin/e_config_dialog.c:249 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:323
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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_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/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:777
+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:8531
+#: src/bin/e_fm_prop.c:514 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_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/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:778
+msgid "Cancel"
+msgstr "Скасувати"
+
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
+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:760
+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:1689
+msgid "Settings Upgraded"
+msgstr ""
+
+#: src/bin/e_config.c:1712
+#, 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:1723
+#, 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:1736
+#, 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:1747
+#, 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:1759
+#, 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:1784
+msgid "Enlightenment Settings Write Problems"
+msgstr ""
+
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
+#: 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:228
+msgid "Basic"
+msgstr ""
+
+#: src/bin/e_config_dialog.c:251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+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:197
+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:1076
+msgid "Extensions"
+msgstr ""
+
+#: src/bin/e_container.c:117
+#, c-format
+msgid "Container %d"
+msgstr ""
+
+#: src/bin/e_desklock.c:174
+msgid "Error - no PAM support"
+msgstr ""
+
+#: src/bin/e_desklock.c:175
+msgid ""
+"No PAM support was built into Enlightenment, so<br>desk locking is disabled."
+msgstr ""
+
+#: src/bin/e_desklock.c:241
+msgid "Lock Failed"
+msgstr ""
+
+#: src/bin/e_desklock.c:242
+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
+msgid "Please enter your unlock password"
+msgstr ""
+
+#: src/bin/e_desklock.c:709
+msgid "Authentication System Error"
+msgstr ""
+
+#: src/bin/e_desklock.c:710
+#, 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:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 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:400
+#: 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
+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:8031
+#: src/modules/conf_applications/e_int_config_apps.c:269
+#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: 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:7938
+msgid "Cut"
+msgstr "Вирізати"
+
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
+msgid "Copy"
+msgstr "Копіювати"
+
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
+msgid "Paste"
+msgstr "Вставити"
+
+#: src/bin/e_entry.c:529
+msgid "Select All"
+msgstr "Вибрати всі"
+
+#: src/bin/e_exec.c:220 src/bin/e_utils.c:201
+#: 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:221 src/bin/e_utils.c:202
+#: 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:314
+msgid "Application run error"
+msgstr ""
+
+#: src/bin/e_exec.c:316
+#, 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:418
+msgid "Application Execution Error"
+msgstr ""
+
+#: src/bin/e_exec.c:430
+#, c-format
+msgid "%s stopped running unexpectedly."
+msgstr ""
+
+#: src/bin/e_exec.c:436
+#, c-format
+msgid "An exit code of %i was returned from %s."
+msgstr ""
+
+#: src/bin/e_exec.c:443
+#, c-format
+msgid "%s was interrupted by an Interrupt Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:445
+#, c-format
+msgid "%s was interrupted by a Quit Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:449
+#, c-format
+msgid "%s was interrupted by an Abort Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:452
+#, c-format
+msgid "%s was interrupted by a Floating Point Error."
+msgstr ""
+
+#: src/bin/e_exec.c:455
+#, c-format
+msgid "%s was interrupted by an Uninterruptable Kill Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:458
+#, c-format
+msgid "%s was interrupted by a Segmentation Fault."
+msgstr ""
+
+#: src/bin/e_exec.c:461
+#, c-format
+msgid "%s was interrupted by a Broken Pipe."
+msgstr ""
+
+#: src/bin/e_exec.c:464
+#, c-format
+msgid "%s was interrupted by a Termination Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:467
+#, c-format
+msgid "%s was interrupted by a Bus Error."
+msgstr ""
+
+#: src/bin/e_exec.c:470
+#, c-format
+msgid "%s was interrupted by the signal number %i."
+msgstr ""
+
+#: src/bin/e_exec.c:528
+msgid ""
+"***The remaining output has been truncated. Save the output to view.***\n"
+msgstr ""
+
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
+msgid "Error Logs"
+msgstr ""
+
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
+msgid "There was no error message."
+msgstr ""
+
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
+msgid "Save This Message"
+msgstr ""
+
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
+#, c-format
+msgid "This error log will be saved as %s/%s.log"
+msgstr ""
+
+#: src/bin/e_exec.c:631
+msgid "Error Information"
+msgstr ""
+
+#: src/bin/e_exec.c:639
+msgid "Error Signal Information"
+msgstr ""
+
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
+msgid "Output Data"
+msgstr ""
+
+#: src/bin/e_exec.c:657
+msgid "There was no output."
+msgstr ""
+
+#: src/bin/e_fm.c:934
+msgid "Nonexistent path"
+msgstr ""
+
+#: src/bin/e_fm.c:937
+#, c-format
+msgid "%s doesn't exist."
+msgstr ""
+
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "Запустити помилку"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "Запустити помилку"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "Запустити помилку"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
+#, c-format
+msgid "%i Files"
+msgstr ""
+
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
+msgid "Link"
+msgstr "Посилання"
+
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
+msgid "Abort"
+msgstr "Про"
+
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
+msgid "Inherit parent settings"
+msgstr ""
+
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
+msgid "View Mode"
+msgstr ""
+
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
+msgid "Refresh View"
+msgstr ""
+
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
+msgid "Show Hidden Files"
+msgstr ""
+
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
+msgid "Remember Ordering"
+msgstr ""
+
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
+msgid "Sort Now"
+msgstr ""
+
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
+#: src/modules/conf_paths/e_int_config_paths.c:208
+msgid "New Directory"
+msgstr ""
+
+#: src/bin/e_fm.c:8039
+msgid "Rename"
+msgstr ""
+
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "Про"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
+msgid "Properties"
+msgstr ""
+
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
+msgid "Use default"
+msgstr ""
+
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
+msgid "Grid Icons"
+msgstr ""
+
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
+msgid "Custom Icons"
+msgstr ""
+
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
+msgid "List"
+msgstr "Список"
+
+#: src/bin/e_fm.c:8380
+#, c-format
+msgid "Icon Size (%d)"
+msgstr ""
+
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+msgid "Set background..."
+msgstr ""
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+msgid "Set overlay..."
+msgstr ""
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "Очистити"
+
+#: src/bin/e_fm.c:8754
+msgid "Create a new Directory"
+msgstr "Створити нову теку"
+
+#: src/bin/e_fm.c:8755
+msgid "New Directory Name:"
+msgstr ""
+
+#: src/bin/e_fm.c:8809
+#, c-format
+msgid "Rename %s to:"
+msgstr ""
+
+#: src/bin/e_fm.c:8811
+msgid "Rename File"
+msgstr "Змінити назву файла"
+
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
+msgid "Retry"
+msgstr ""
+
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
+msgid "Error"
+msgstr ""
+
+#: src/bin/e_fm.c:8957
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: src/bin/e_fm.c:9009
+msgid "No to all"
+msgstr "Ні для всіх"
+
+#: src/bin/e_fm.c:9011
+msgid "Yes to all"
+msgstr "Так для всіх"
+
+#: src/bin/e_fm.c:9014
+msgid "Warning"
+msgstr "Попередження"
+
+#: src/bin/e_fm.c:9017
+#, c-format
+msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
+msgstr ""
+
+#: src/bin/e_fm.c:9089
+msgid "Ignore this"
+msgstr "Проігнорувати це"
+
+#: src/bin/e_fm.c:9090
+msgid "Ignore all"
+msgstr "Ігнорувати все"
+
+#: src/bin/e_fm.c:9095
+#, c-format
+msgid "An error occured while performing an operation.<br>%s"
+msgstr ""
+
+#: src/bin/e_fm.c:9240
+msgid "Confirm Delete"
+msgstr ""
+
+#: src/bin/e_fm.c:9245
+#, c-format
+msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
+msgstr ""
+
+#: src/bin/e_fm.c:9251
+#, 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:338
+msgid "File:"
+msgstr "Файл:"
+
+#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+msgid "Size:"
+msgstr "Розмір:"
+
+#: src/bin/e_fm_prop.c:352
+msgid "Last Modified:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:359
+msgid "File Type:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:366
+msgid "Permissions"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+msgid "Owner:"
+msgstr "Власник:"
+
+#: src/bin/e_fm_prop.c:373
+msgid "Others can read"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:375
+msgid "Others can write"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:377
+msgid "Owner can read"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:379
+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/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/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
+msgid "Thumbnail"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:438
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
+msgid "Custom"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:448
+msgid "Use this icon for all files of this type"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:456
+msgid "Link Information"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+msgid "Select an Image"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:189
+#, c-format
+msgid "%llu TiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:191
+#, c-format
+msgid "%llu GiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:193
+#, c-format
+msgid "%llu MiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:195
+#, c-format
+msgid "%llu KiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:197
+#, c-format
+msgid "%llu B"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:228
+#, c-format
+msgid "Unknown Volume"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:322
+msgid "Removable Device"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
+msgid "Plain"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
+msgid "Inset"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:701
+msgid "Appearance"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1291
+msgid "Automatically scroll contents"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1298
+msgid "Able to be resized"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
+msgid "Begin move/resize this gadget"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
+msgid "Remove this gadget"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1749
+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:564
+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:511
+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:522
+#: src/bin/e_int_shelf_config.c:612
+#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: 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:536 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
+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:523
+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
+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:529
+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:519
+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:72
+msgid "Edit Icon"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:77
+msgid "Add Application..."
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:88
+msgid "Create Icon"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:98
+msgid "Send to Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:110
+msgid "Pin to Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:121
+msgid "Unpin from Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:130
+msgid "More..."
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:164
+msgid "Iconify"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:361
+msgid "Maximize vertically"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:372
+msgid "Maximize horizontally"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:383
+msgid "Unmaximize"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:484
+msgid "Keyboard Shortcut"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:490
+msgid "To Favorites Menu"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:495
+msgid "To Launcher"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:517 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:526
+msgid "Skip"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:545 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:556
+msgid "Remember"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:572 src/bin/e_int_border_prop.c:75
+msgid "Window Properties"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:784
+msgid "Always On Top"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:795
+#: 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:806
+msgid "Always Below"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:898
+msgid "Select Border Style"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:910
+msgid "Use E17 Default Icon Preference"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:919
+msgid "Use Application Provided Icon "
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:927
+msgid "Use User Defined Icon"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:988 src/bin/e_int_border_prop.c:473
+msgid "Shaded"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1001 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1014 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:1039 src/modules/conf_winlist/e_mod_main.c:35
+msgid "Window List"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
+msgid "Pager"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1059
+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:480
+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:537
+msgid "Skip Taskbar"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+msgid "Skip Pager"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:476
+msgid "Hidden"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:75
+msgid "Window Remember"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:244
+msgid "Window properties are not a unique match"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:247
+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:333 src/bin/e_int_border_remember.c:363
+msgid "No match properties set"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:336
+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: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
+msgid "Nothing"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:445
+msgid "Size and Position"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+msgid "Locks"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:449
+msgid "Size, Position and Locks"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:451
+msgid "Everything"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:464
+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:490
+msgid "Window Role"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:499
+msgid "Window type"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:506
+msgid "Transience"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:510
+msgid "Properties to remember"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:521
+msgid "Icon Preference"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:525
+msgid "Virtual Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:531
+msgid "Current Screen"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:533
+msgid "Skip Window List"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:541
+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
+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:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
+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:181
+msgid "Available Modules"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:188
+msgid "Load Module"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:195
+msgid "Loaded Modules"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:202
+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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
+#: src/bin/e_int_gadcon_config.c:178
+msgid "Description: Unavailable"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:32
+msgid "Shelf Contents"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:38
+msgid "Toolbar Contents"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:93 src/modules/gadman/e_mod_config.c:106
+msgid "Available Gadgets"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:100 src/modules/gadman/e_mod_config.c:117
+msgid "Add Gadget"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:106
+msgid "Selected Gadgets"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:113
+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:506
+#: src/bin/e_int_shelf_config.c:572
+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:157
+#: src/modules/wizard/page_070.c:198
+msgid "Applications"
+msgstr "Програми"
+
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: 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:1148
+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:1100 src/bin/e_int_menus.c:1283
+msgid "(No Windows)"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+msgid "No name!!"
+msgstr "Нема назви!!"
+
+#: src/bin/e_int_menus.c:1375
+msgid "(No Shelves)"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/modules/conf_shelves/e_int_config_shelf.c:132
+msgid "Shelf #"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1441
+msgid "Add A Shelf"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1448
+msgid "Delete A Shelf"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
+#: src/modules/conf_shelves/e_int_config_shelf.c:43
+msgid "Shelf Settings"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:524
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
+msgid "Tiny"
+msgstr "Крихітний"
+
+#: src/bin/e_int_shelf_config.c:526
+#: 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:528 src/modules/dropshadow/e_mod_config.c:126
+msgid "Medium"
+msgstr "Середній"
+
+#: src/bin/e_int_shelf_config.c:530
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
+msgid "Large"
+msgstr "Великий"
+
+#: src/bin/e_int_shelf_config.c:532
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
+msgid "Huge"
+msgstr "Громадний"
+
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
+msgid "Set Contents..."
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:562
+msgid "Above Everything"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:564
+msgid "Below Windows"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:566
+msgid "Below Everything"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:568
+msgid "Allow windows to overlap the shelf"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:602
+msgid "Shrink to Content Size"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:613
+#, c-format
+msgid "%3.0f pixels"
+msgstr "%3.0f пікселів"
+
+#: src/bin/e_int_shelf_config.c:617
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Styles"
+msgstr "Стилі"
+
+#: src/bin/e_int_shelf_config.c:655
+msgid "Auto Hide"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:656
+msgid "Auto-hide the shelf"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:659
+msgid "Show on mouse in"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:663
+msgid "Show on mouse click"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:667
+msgid "Hide timeout"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
+#, c-format
+msgid "%.1f seconds"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:675
+msgid "Hide duration"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:689
+msgid "Show on all Desktops"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:691
+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:326
+#, 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:389
+msgid ""
+"Enlightenment cannot Initialize Ecore!\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:415
+msgid ""
+"Enlightenment cannot initialize the File system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:427
+msgid ""
+"Enlightenment cannot set up an exit signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:433
+msgid ""
+"Enlightenment cannot set up a HUP signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:445
+msgid ""
+"Enlightenment cannot initialize its X connection.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:453
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:476
+msgid ""
+"Enlightenment cannot initialize the connections system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:484
+msgid ""
+"Enlightenment cannot initialize the IPC system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:493
+msgid ""
+"Enlightenment cannot setup xinerama wrapping.\n"
+"This should not happen."
+msgstr ""
+
+#: src/bin/e_main.c:512
+msgid ""
+"Enlightenment cannot initialize the Evas system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:518
+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:525
+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:541 src/bin/e_main.c:548
+msgid ""
+"Enlightenment cannot initialize the FDO desktop system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:562
+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:572
+msgid "Enlightenment cannot set up its file registry system."
+msgstr ""
+
+#: src/bin/e_main.c:581
+msgid "Enlightenment cannot set up its config system."
+msgstr ""
+
+#: src/bin/e_main.c:595
+msgid "Enlightenment cannot set up its scale system."
+msgstr ""
+
+#: src/bin/e_main.c:603
+msgid "Enlightenment cannot set up the pointer system."
+msgstr ""
+
+#: src/bin/e_main.c:612
+msgid ""
+"Enlightenment cannot set up paths for finding files.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:630
+msgid "Enlightenment cannot set up its font system."
+msgstr ""
+
+#: src/bin/e_main.c:641
+msgid "Enlightenment cannot set up its theme system."
+msgstr ""
+
+#: src/bin/e_main.c:646
+msgid "Starting International Support"
+msgstr ""
+
+#: src/bin/e_main.c:651
+msgid "Enlightenment cannot set up its intl system."
+msgstr ""
+
+#: src/bin/e_main.c:662
+msgid ""
+"Enlightenment cannot set up init screen.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:674
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:685
+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:696
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:705
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:714
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:725
+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:735
+msgid "Setup Screens"
+msgstr ""
+
+#: src/bin/e_main.c:740
+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:746
+msgid "Setup Screensaver"
+msgstr ""
+
+#: src/bin/e_main.c:751
+msgid "Enlightenment cannot configure the X screensaver."
+msgstr ""
+
+#: src/bin/e_main.c:755
+msgid "Setup Desklock"
+msgstr ""
+
+#: src/bin/e_main.c:760
+msgid "Enlightenment cannot set up its desk locking system."
+msgstr ""
+
+#: src/bin/e_main.c:773
+msgid "Setting up Paths"
+msgstr ""
+
+#: src/bin/e_main.c:790
+msgid "Setup System Controls"
+msgstr ""
+
+#: src/bin/e_main.c:795
+msgid "Enlightenment cannot initialize the System Command system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:800
+msgid "Setup Actions"
+msgstr ""
+
+#: src/bin/e_main.c:805
+msgid "Enlightenment cannot set up its actions system."
+msgstr ""
+
+#: src/bin/e_main.c:809
+msgid "Setup Execution System"
+msgstr ""
+
+#: src/bin/e_main.c:814
+msgid "Enlightenment cannot set up its exec system."
+msgstr ""
+
+#: src/bin/e_main.c:818
+msgid "Setup Remembers"
+msgstr ""
+
+#: src/bin/e_main.c:823
+msgid "Enlightenment cannot setup remember settings."
+msgstr ""
+
+#: src/bin/e_main.c:831
+msgid "Setup FM"
+msgstr ""
+
+#: src/bin/e_main.c:836
+msgid "Enlightenment cannot initialize the File manager.\n"
+msgstr ""
+
+#: src/bin/e_main.c:849
+msgid "Setup Message System"
+msgstr ""
+
+#: src/bin/e_main.c:854
+msgid "Enlightenment cannot set up its msg system."
+msgstr ""
+
+#: src/bin/e_main.c:858
+msgid "Setup DND"
+msgstr ""
+
+#: src/bin/e_main.c:863
+msgid "Enlightenment cannot set up its dnd system."
+msgstr ""
+
+#: src/bin/e_main.c:867
+msgid "Setup Grab Input Handling"
+msgstr ""
+
+#: src/bin/e_main.c:872
+msgid "Enlightenment cannot set up its input grab handling system."
+msgstr ""
+
+#: src/bin/e_main.c:876
+msgid "Setup Modules"
+msgstr ""
+
+#: src/bin/e_main.c:881
+msgid "Enlightenment cannot set up its module system."
+msgstr ""
+
+#: src/bin/e_main.c:885
+msgid "Setup Color Classes"
+msgstr ""
+
+#: src/bin/e_main.c:890
+msgid "Enlightenment cannot set up its color class system."
+msgstr ""
+
+#: src/bin/e_main.c:894
+msgid "Setup Gadcon"
+msgstr ""
+
+#: src/bin/e_main.c:899
+msgid "Enlightenment cannot set up its gadget control system."
+msgstr ""
+
+#: src/bin/e_main.c:904
+msgid "Setup DPMS"
+msgstr ""
+
+#: src/bin/e_main.c:909
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr ""
+
+#: src/bin/e_main.c:913
+msgid "Set Up Powersave modes"
+msgstr ""
+
+#: src/bin/e_main.c:917
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr ""
+
+#: src/bin/e_main.c:922
+msgid "Setup Wallpaper"
+msgstr ""
+
+#: src/bin/e_main.c:927
+msgid "Enlightenment cannot set up its desktop background system."
+msgstr ""
+
+#: src/bin/e_main.c:932
+msgid "Setup Mouse"
+msgstr ""
+
+#: src/bin/e_main.c:937
+msgid "Enlightenment cannot configure the mouse settings."
+msgstr ""
+
+#: src/bin/e_main.c:942
+msgid "Setup Bindings"
+msgstr ""
+
+#: src/bin/e_main.c:947
+msgid "Enlightenment cannot set up its bindings system."
+msgstr ""
+
+#: src/bin/e_main.c:951
+msgid "Setup Popups"
+msgstr ""
+
+#: src/bin/e_main.c:956
+msgid "Enlightenment cannot set up its popup system."
+msgstr ""
+
+#: src/bin/e_main.c:961
+msgid "Setup Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:966
+msgid "Enlightenment cannot set up its shelf system."
+msgstr ""
+
+#: src/bin/e_main.c:971
+msgid "Setup Thumbnailer"
+msgstr ""
+
+#: src/bin/e_main.c:976
+msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:981
+msgid "Set Up File Ordering"
+msgstr ""
+
+#: src/bin/e_main.c:985
+msgid "Enlightenment cannot set up its order file system."
+msgstr ""
+
+#: src/bin/e_main.c:1020
+msgid "Load Modules"
+msgstr ""
+
+#: src/bin/e_main.c:1028
+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:1035
+msgid "Enlightenment crashed early on start and has been restarted"
+msgstr ""
+
+#: src/bin/e_main.c:1036
+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:1044
+msgid "Configure Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:1054
+msgid "Almost Done"
+msgstr ""
+
+#: src/bin/e_module.c:117
+#, 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
+msgid "Error loading Module"
+msgstr ""
+
+#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#, 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
+msgid "Module does not contain all needed functions"
+msgstr ""
+
+#: src/bin/e_module.c:164
+#, 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:169
+#, c-format
+msgid "Enlightenment %s Module"
+msgstr ""
+
+#: src/bin/e_module.c:497
+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:1272 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
+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
+msgid "Stop Moving/Resizing Items"
+msgstr ""
+
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+msgid "Begin Moving/Resizing Items"
+msgstr ""
+
+#: src/bin/e_shelf.c:1703
+msgid "Set Shelf Contents"
+msgstr ""
+
+#: src/bin/e_shelf.c:1708
+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:314
+msgid "Logout problems"
+msgstr ""
+
+#: src/bin/e_sys.c:317
+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
+msgid "Logout now"
+msgstr ""
+
+#: src/bin/e_sys.c:324
+msgid "Wait longer"
+msgstr ""
+
+#: src/bin/e_sys.c:325
+msgid "Cancel Logout"
+msgstr ""
+
+#: src/bin/e_sys.c:363
+msgid "Logout in progress"
+msgstr ""
+
+#: src/bin/e_sys.c:366
+msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+msgid "Enlightenment is busy with another request"
+msgstr ""
+
+#: src/bin/e_sys.c:401
+msgid ""
+"Logging out.<br>You cannot perform other system actions<br>once a logout has "
+"begun."
+msgstr ""
+
+#: src/bin/e_sys.c:409
+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
+msgid ""
+"Resetting.<br>You cannot do any other system actions<br>once a reboot has "
+"begun."
+msgstr ""
+
+#: src/bin/e_sys.c:423
+msgid ""
+"Suspending.<br>Until suspend is complete you cannot perform<br>any other "
+"system actions."
+msgstr ""
+
+#: src/bin/e_sys.c:430
+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
+msgid "EEK! This should not happen"
+msgstr ""
+
+#: src/bin/e_sys.c:463
+msgid "Power off failed."
+msgstr ""
+
+#: src/bin/e_sys.c:468
+msgid "Reset failed."
+msgstr ""
+
+#: src/bin/e_sys.c:473
+msgid "Suspend failed."
+msgstr ""
+
+#: src/bin/e_sys.c:478
+msgid "Hibernate failed."
+msgstr ""
+
+#: src/bin/e_sys.c:535
+msgid "Power off"
+msgstr ""
+
+#: src/bin/e_sys.c:538
+msgid "Power off.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:562
+msgid "Resetting"
+msgstr ""
+
+#: src/bin/e_sys.c:565
+msgid "Resetting.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:588
+msgid "Suspending"
+msgstr ""
+
+#: src/bin/e_sys.c:591
+msgid "Suspending.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:614
+msgid "Hibernating"
+msgstr ""
+
+#: src/bin/e_sys.c:617
+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:246
+msgid "Cannot exit - immortal windows."
+msgstr ""
+
+#: src/bin/e_utils.c:247
+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:806
+#, c-format
+msgid "%'.0f Bytes"
+msgstr ""
+
+#: src/bin/e_utils.c:810
+#, c-format
+msgid "%'.0f KB"
+msgstr ""
+
+#: src/bin/e_utils.c:814
+#, c-format
+msgid "%'.0f MB"
+msgstr ""
+
+#: src/bin/e_utils.c:818
+#, c-format
+msgid "%'.1f GB"
+msgstr ""
+
+#: src/bin/e_utils.c:838
+#, c-format
+msgid "In the Future"
+msgstr ""
+
+#: src/bin/e_utils.c:843
+#, c-format
+msgid "In the last Minute"
+msgstr ""
+
+#: src/bin/e_utils.c:845
+#, c-format
+msgid "%li Years ago"
+msgstr ""
+
+#: src/bin/e_utils.c:847
+#, c-format
+msgid "%li Months ago"
+msgstr ""
+
+#: src/bin/e_utils.c:849
+#, c-format
+msgid "%li Weeks ago"
+msgstr ""
+
+#: src/bin/e_utils.c:851
+#, c-format
+msgid "%li Days ago"
+msgstr ""
+
+#: src/bin/e_utils.c:853
+#, c-format
+msgid "%li Hours ago"
+msgstr ""
+
+#: src/bin/e_utils.c:855
+#, c-format
+msgid "%li Minutes ago"
+msgstr ""
+
+#: src/bin/e_utils.c:861
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: 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
+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_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:293
+msgid "Add to Favorites"
+msgstr "Долучити до улюблених"
+
+#: src/bin/e_widget_fsel.c:299
+#: 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_wallpaper/e_int_config_wallpaper.c:519
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/gadman/e_mod_config.c:193
+msgid "Go up a Directory"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:360
+msgid "Permissions:"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:376
+msgid "Modified:"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:615
+#, c-format
+msgid "You"
+msgstr "Ви"
+
+#: src/bin/e_widget_fsel.c:664
+#, 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
+#, c-format
+msgid "Read Only"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#, c-format
+msgid "Forbidden"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:691
+msgid "Read-Write"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:41
+msgid "Battery Monitor Settings"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:92
+msgid "Basic Settings"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:93
+msgid "Show alert when battery is low"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:136
+msgid "Check every:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:138
+#: 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:140
+msgid "Polling"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:143
+msgid "Show alert on low battery"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:145
+msgid "Alert when at:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:147
+#, c-format
+msgid "%1.0f min"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:149
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:151
+msgid "Auto dismiss in..."
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:153
+#, c-format
+msgid "%1.0f sec"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:155
+msgid "Alert"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:160
+msgid "Auto Detect"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:162
+#: 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:164
+#: src/modules/fileman/e_mod_config.c:280
+msgid "HAL"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:167
+msgid "Hardware"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:135
+msgid "Battery"
+msgstr "Батарея"
+
+#: src/modules/battery/e_mod_main.c:844
+msgid "Your battery is low!"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:846
+msgid "AC power is recommended."
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:921
+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
+msgid "ERROR"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:1093
+msgid "Battery Meter"
+msgstr ""
+
+#: src/modules/clock/e_mod_main.c:98
+msgid "Clock"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
+msgid "Settings Panel"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:234
+msgid "Presentation"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:241
+msgid "Offline"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:269
+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:1923
+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:79
+msgid "Menus"
+msgstr ""
+
+#: src/modules/conf_borders/e_int_config_borders.c:30
+#: src/modules/conf_borders/e_int_config_borders.c:197
+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:242
+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_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:656
+#: 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:353
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+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:391
+#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: 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:109
+#: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: 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:821
+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:36
+msgid "Dialog Settings"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: 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_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/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
+msgid "Disable Confirmation Dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+msgid "Normal Windows"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+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
+msgid "Basic Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+msgid "Advanced Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+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:405
+msgid "Resolution"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:412
+msgid "Restore on login"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:416
+msgid "Refresh"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:475
+msgid "Rotation"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:494
+msgid "Mirroring"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:641
+msgid "Missing Features"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:642
+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:654
+msgid "No Refresh Rates Found"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:655
+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:12
+#: 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>To change the delay of this action,<br>use the slider:"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+msgid "Edge Binding Settings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_mod_main.c:35
+msgid "Edge Bindings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+msgid "Add Edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+msgid "Delete Edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+msgid "Modify Edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: 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_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_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_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
+msgid "General Options"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+msgid "Allow binding activation with fullscreen windows"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+msgid "Edge Binding Sequence"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#, c-format
+msgid "%.2f seconds"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+msgid "Binding Edge Error"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#, 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_keybindings/e_int_config_keybindings.c:1276
+#: src/modules/gadman/e_mod_gadman.c:763
+msgid "CTRL"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
+#: src/modules/gadman/e_mod_gadman.c:768
+msgid "ALT"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
+#: src/modules/gadman/e_mod_gadman.c:774
+msgid "SHIFT"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
+#: src/modules/gadman/e_mod_gadman.c:780
+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:428
+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_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
+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:613
+msgid "Enable Font Class"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Hinting"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:648
+msgid "Bytecode"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: 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
+msgid "Font Fallbacks"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:662
+msgid "Fallback Name"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:674
+msgid "Enable Fallbacks"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:683
+msgid "Advanced Preview Text.. 我真的会写中文"
+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:35
+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:140
+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:160
+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:36
+#: src/modules/conf_mouse/e_mod_main.c:35
+msgid "Mouse Settings"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:97
+msgid "Mouse Hand"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:105
+msgid "Mouse Acceleration"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:107
+msgid "Acceleration"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
+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:1013
+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:56
+msgid "Profile Selector"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:107
+msgid "Available Profiles"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:116
+#: src/modules/wizard/page_020.c:118
+msgid "Select a profile"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:125
+msgid "Reset"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#, 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
+msgid "Delete OK?"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:350
+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:431
+msgid " Import..."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:435
+msgid " Online..."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:1004
+msgid "Theme Categories"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:1022
+msgid "Assign"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:1028
+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:674
+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
+msgid "Picture..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+msgid "Gradient..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+msgid "Where to place the Wallpaper"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+msgid "All Desktops"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+msgid "This Desktop"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+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:152
+#: src/modules/gadman/e_mod_gadman.c:685
+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:693
+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:274
+msgid "Select a Picture..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+msgid "Picture Import Error"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+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
+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
+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
+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:122
+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_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 ""
+
+#: 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:142
+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
+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:150
+msgid "Maximize Directions"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+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:163
+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:29
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: 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
+msgid "Delete Remember(s)"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+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
+msgid "<No Name>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+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
+msgid "<No Class>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+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
+msgid "<No Title>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+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
+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:729
+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:1462
+msgid "Go to Parent Directory"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1524
+msgid "Other application..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
+msgid "Open"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
+msgid "Open with..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1892
+msgid "Known Applications"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1902
+msgid "Specific Applications"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1944
+msgid "Custom Command"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:53
+#, c-format
+msgid "%d operations"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:55
+#, c-format
+msgid "idle"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:139
+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:677
+msgid "Free"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:709
+msgid "Always on desktop"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:719
+msgid "On top pressing"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:748
+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:101
+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:214
+msgid "IBar"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:796
+msgid "Change Icon Properties"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:801
+msgid "Remove Icon"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:811
+msgid "Add An Icon"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:818
+msgid "Create New Icon"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:834
+msgid "Add Application"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:52
+msgid "IBox Settings"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:105
+msgid "Display Name"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:110
+msgid "Display Title"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:115
+msgid "Display Class"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:120
+msgid "Display Icon Name"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:125
+msgid "Display Border Caption"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:155
+msgid "Show windows from all screens"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:160
+msgid "Show windows from current screen"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:169
+msgid "Show windows from all desktops"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:174
+msgid "Show windows from active desktop"
+msgstr ""
+
+#: src/modules/ibox/e_mod_main.c:226
+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:203
+msgid "Popup Settings"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+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:167
+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
+#, c-format
+msgid "Click to set"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:174
+msgid "Drag and Drop button"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:181
+msgid "Drag whole desktop"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:190
+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
+#, c-format
+msgid "%.0f px"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:196
+msgid "Resistance to dragging"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:207
+msgid "Popup pager height"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+msgid "Popup speed"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#, c-format
+msgid "%1.1f seconds"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:229
+msgid "Urgent Window Settings"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:230
+msgid "Show popup on urgent window"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:233
+msgid "Popup on urgent window sticks on the screen"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:286
+msgid "Pager Button Grab"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:288
+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
+msgid "Attetion"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:344
+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
+#, c-format
+msgid "Button %i"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2843
+msgid "Show Pager Popup"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
+msgid "Popup Desk Right"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
+msgid "Popup Desk Left"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
+msgid "Popup Desk Up"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
+msgid "Popup Desk Down"
+msgstr ""
+
+#: src/modules/start/e_mod_main.c:110
+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 "%1.0f ℉"
+
+#: 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 ℃"
+
+#: 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 "Ласкаво просимо до Enlightenment"
+
+#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+msgid "Select one"
+msgstr ""
+
+#: src/modules/wizard/page_020.c:55
+msgid "Profile"
+msgstr ""
+
+#: src/modules/wizard/page_030.c:89
+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:200
+msgid "Select Icons to Add"
+msgstr ""
+
+#: src/modules/wizard/page_080.c:62
+msgid "Quick Launch"
+msgstr ""
+
+#: src/modules/wizard/page_080.c:64
+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:1154
+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:213
+msgid "Connection Manager"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:730
+msgid "Network Connection Settings"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:736
+msgid "Network Device"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:741
+msgid "Wifi"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:744
+msgid "LAN"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:747
+msgid "Specific Device"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:768
+msgid "Networks"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+msgid "Systray"
+msgstr ""
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index e786af9..e6057a3 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 f033145..3bea25b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,41 +2,39 @@
 # This file is put in the public domain.
 # Emfox Zhou <emfox at zju.edu.cn>, 2005.
 # gao stone <gaoghy at gmail.com>, 2008.
-# Aron Xu <aronmalache at 163.com>, 2008.
-#
+# Aron Xu <aronmalache at 163.com>, 2008, 2009.
+# Luo Jie <lililjlj 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-04-22 22:52+1000\n"
-"PO-Revision-Date: 2009-01-22 17:35+0000\n"
-"Last-Translator: Aron Xu <aronmalache at 163.com>\n"
-"Language-Team: zh_CN <i18n at linux.net.cn>\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
+"PO-Revision-Date: 2009-04-29 12:53+1000\n"
+"Last-Translator: luojie <lililjlj 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-01-23 08:20+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
-msgstr "关于 Enlightenment"
+msgstr "关于Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -72,390 +70,392 @@ 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:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "是"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "否"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
-msgstr "您确定要退出吗?"
+msgstr "确定要退出吗?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
-msgstr "您要求退出 Enlightenment。<br><br>您是否确定要退出?"
+msgstr "您要求退出Enlightenment。<br><br>确定要退出吗?"
 
-#: src/bin/e_actions.c:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
-msgstr "您确定要注销吗?"
+msgstr "确定要注销吗?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
-msgstr "您正要退出 Enlightenment。<br><br>您是否确定要退出?"
+msgstr "您正要退出Enlightenment。<br><br>确定要注销吗?"
 
-#: src/bin/e_actions.c:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
-msgstr "确定要关闭?"
+msgstr "确定要关闭吗?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
-msgstr "您正要关闭计算机。<br><br>您是否确定要关闭?"
+msgstr "您正要关闭计算机。<br><br>确定要关闭计算机吗?"
 
-#: src/bin/e_actions.c:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "确定要重启吗?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
-msgstr "您正要重启电脑。<br><br>您确定吗?"
+msgstr "您正要重启计算机。<br><br>确定要重新启动计算机吗?"
 
-#: src/bin/e_actions.c:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
-msgstr "您正要挂起计算机。<br><br>您确定吗?"
+msgstr "您正要挂起计算机。<br><br>确定要挂起计算机吗?"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
-msgstr "您确定要休眠吗?"
+msgstr "确定要休眠吗?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
-msgstr "您正要休眠计算机。<br><br>您确定吗?"
+msgstr "您正要休眠计算机。<br><br>确定要休眠计算机吗?"
 
-#: src/bin/e_actions.c:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "窗口:动作"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "移动"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "改变大小"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "菜单"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "窗口菜单"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "升起"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
-msgstr "低"
+msgstr "降低"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "杀死"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "窗口:状态"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "粘着模式切换"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "图标模式切换"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "全屏状态切换"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "最大化"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "全屏最大化"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "最大化模式 \"智能\""
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
-msgstr "最大化模式  \"Expand\""
+msgstr "最大化模式 \"扩展\""
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
-msgstr "最大化填充"
+msgstr "最大化模式 \"填充\""
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "切换无边框状态"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
-msgstr "切换 pinned 状态"
-
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "桌面"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
-msgstr "左桌面"
+msgstr "向左翻转桌面"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "向右翻转桌面"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "向上翻转桌面"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "往下翻转桌面"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
-msgstr "翻转桌面按..."
+msgstr "翻转桌面 —— 依据"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "显示桌面"
 
-#: src/bin/e_actions.c:2581
-#, fuzzy
+#: src/bin/e_actions.c:2595
 msgid "Show The Shelf"
-msgstr "显示桌面"
+msgstr "显示书架"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "翻转桌面到..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
-msgstr ""
+msgstr "线性翻转桌面到..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "切换到桌面 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "切换到桌面 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "切换到桌面 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "切换到桌面 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "切换到桌面 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "切换到桌面 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "切换到桌面 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "切换到桌面 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "切换到桌面 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "切换到桌面 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "切换到桌面 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "切换到桌面 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "切换到桌面 ..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 msgid "Flip Desktop Left (All Screens)"
 msgstr "向左翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 msgid "Flip Desktop Right (All Screens)"
-msgstr ""
+msgstr "向右翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 msgid "Flip Desktop Up (All Screens)"
 msgstr "向上翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 msgid "Flip Desktop Down (All Screens)"
-msgstr ""
+msgstr "向下翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2654
-#, fuzzy
+#: src/bin/e_actions.c:2668
 msgid "Flip Desktop In Direction..."
-msgstr "翻转桌面到..."
+msgstr "翻转桌面指向..."
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "切换到桌面 0"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "切换到桌面 1"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "切换到桌面 2"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "切换到桌面 3"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "切换到桌面 4"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "切换到桌面 5"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "切换到桌面 6"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "切换到桌面 7"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "切换到桌面 8"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "切换到桌面 9"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "切换到桌面 10"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "切换到桌面 11"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 msgid "Switch To Desktop... (All Screens)"
 msgstr "切换到桌面 ..."
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -465,103 +465,117 @@ msgstr "切换到桌面 ..."
 msgid "Screen"
 msgstr "屏幕"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "发送鼠标到屏幕 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "发送鼠标到屏幕 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "发送鼠标到屏幕 ..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "发送鼠标到前1屏"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "发送鼠标到后1屏"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "窗口:移动"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "发送到下个桌面"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "到前一桌面"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "桌面号 #..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "到桌面..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "显示主窗口"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "显示“我的最爱”菜单"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "显示所有应用程序菜单"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "显示 客户端 菜单"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "显示菜单..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "命令"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "应用程序"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "重启"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "退出"
 
-#: src/bin/e_actions.c:2789
-#, fuzzy
+#: src/bin/e_actions.c:2803
 msgid "Exit Now"
-msgstr "退出"
+msgstr "现在退出"
+
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment %s 模块"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "全屏状态切换"
+
+#: src/bin/e_actions.c:2813
+#, fuzzy
+msgid "Offline Mode Toggle"
+msgstr "粘着模式切换"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -574,71 +588,70 @@ msgstr "退出"
 msgid "System"
 msgstr "系统"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "退出"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
-msgstr ""
+msgstr "现在关闭电源"
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
-msgstr ""
+msgstr "关闭电源"
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "重启"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "挂起"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "休眠"
 
-#: src/bin/e_actions.c:2821
-#, fuzzy
+#: src/bin/e_actions.c:2845
 msgid "Lock"
 msgstr "锁定"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "重新排列窗口"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Generic : Actions"
 msgstr "常规:动作"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 msgid "Delayed Action"
 msgstr "延迟动作"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "设为背景"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "已完成桌面文件扫描"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "桌面文件扫描"
 
 #: 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:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -653,7 +666,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -665,7 +678,7 @@ msgstr "确定"
 msgid "Cancel"
 msgstr "取消"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 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 +689,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 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 +698,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 msgid "Settings Upgraded"
-msgstr ""
+msgstr "设定已经升级"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -697,7 +710,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -707,7 +720,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -716,7 +729,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -725,7 +738,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -733,11 +746,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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
@@ -763,7 +776,7 @@ 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "扩展"
 
@@ -772,34 +785,34 @@ msgstr "扩展"
 msgid "Container %d"
 msgstr "容器 %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "错误 - 无 PAM 支持"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
-msgstr "没有 PAM 支持被构建在 Enlightenment 中,所以<br>桌面锁定已禁用。"
+msgstr "这个Enlightenment中没有构建PAM 支持,所以<br>桌面锁定已禁用。"
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "锁定失败"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "请输入您的解锁密码"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "认证系统错误"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -807,6 +820,25 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
+#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "窗口属性不全"
@@ -901,23 +933,23 @@ msgstr "选择一个图标"
 msgid "Select an Executable"
 msgstr "选择一个可执行文件"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "删除"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "剪切"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "复制"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "粘贴"
 
@@ -949,262 +981,313 @@ msgid ""
 "application failed to start."
 msgstr "Enlightenment 未能运行程序:<br><br>%s<br><br>该程序启动失败。"
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "应用程序执行出错"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s 意外终止。"
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
-msgstr ""
+msgstr "退出代码 %i 从 %s 反馈回来。"
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s 被中断信号中断。"
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s 被退出信号中断。"
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s 被终止信号中断。"
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
-msgstr "%s 被浮点书错误中断。"
+msgstr "%s 被浮点错误中断。"
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
-msgstr ""
+msgstr "%s 被不可干涉的'杀死信号'中断。"
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s 被错误信号中断。"
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s 被管道错误中断。"
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s 被终止信号中断。"
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s 被总线错误中断。"
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "错误日志"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "没有错误信息。"
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "保存此信息"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "此错误日志将被保存为 %s/%s.log"
 
-#: src/bin/e_exec.c:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "错误信息"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "错误信号信息"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "输出数据"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "没有输出。"
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 msgid "Nonexistent path"
 msgstr "不存在路径"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s 不存在。"
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "挂载错误"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "挂载错误"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "错误"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i 个文件"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
-#, fuzzy
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 msgid "Link"
-msgstr "线性"
+msgstr "连接"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 msgid "Abort"
 msgstr "关于"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
-#, fuzzy
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 msgid "Inherit parent settings"
-msgstr "交互设置"
+msgstr ""
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "显示模式"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "刷新视图"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "显示隐藏文件"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "记住顺序"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "现在排序"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "新目录"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "改名"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "静音"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "属性"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 msgid "Use default"
-msgstr ""
+msgstr "使用默认"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "网格图标"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "自定义图标"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "列表"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, c-format
 msgid "Icon Size (%d)"
-msgstr ""
+msgstr "图标大小  (%d)"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "设为背景"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "设定书架内容..."
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "清除"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "创建新目录"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "新目录名称:"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "改名%s 为::"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "改文件名"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 msgid "Retry"
 msgstr "重试"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 msgid "Error"
 msgstr "错误"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr "全部选否"
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr "全部选是"
 
-#: src/bin/e_fm.c:8524
-#, fuzzy
+#: src/bin/e_fm.c:9014
 msgid "Warning"
-msgstr "正在启动"
+msgstr "警告"
 
-#: src/bin/e_fm.c:8527
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9017
+#, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
-msgstr "您确定删除<br><hilight>%s</hilight>吗?"
+msgstr "文件已经存在,覆盖吗?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr "忽略"
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr "忽略所有"
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "执行操作时产生一个错误。<br>%s"
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "确认删除"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "您确定删除<br><hilight>%s</hilight>吗?"
 
-#: src/bin/e_fm.c:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1265,8 +1348,8 @@ msgid "Preview"
 msgstr "预览"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "默认"
 
@@ -1275,7 +1358,7 @@ msgid "Thumbnail"
 msgstr "缩略图"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "自定义"
 
@@ -1291,70 +1374,70 @@ msgstr "连接信息"
 msgid "Select an Image"
 msgstr "选择一个图像"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, c-format
 msgid "Unknown Volume"
-msgstr "未知卷"
+msgstr "未知盘区"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr "可移动设备"
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "简易"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "插入"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "外观"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "自动滚动"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "可以变换尺寸"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "开始移动/缩放此组件"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "删除该组件"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "停止移动/缩放此组件"
 
@@ -1403,8 +1486,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1412,7 +1495,7 @@ msgstr "大小"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
 #: src/bin/e_int_border_menu.c:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "堆叠"
 
@@ -1590,12 +1673,12 @@ msgstr "全屏"
 msgid "Window List"
 msgstr "窗口列表"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "分页器"
 
@@ -1625,7 +1708,7 @@ 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"
@@ -1863,11 +1946,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 msgid "Settings"
 msgstr "设置"
 
@@ -1901,8 +1984,8 @@ msgstr "已载入的模块"
 msgid "Unload Module"
 msgstr "卸载模块"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1932,12 +2015,12 @@ msgstr "选定到组件"
 msgid "Remove Gadget"
 msgstr "移除组件"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: 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:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "布局"
 
@@ -2008,9 +2091,8 @@ 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
 msgid "(No Windows)"
@@ -2018,124 +2100,123 @@ msgstr "(无窗口)"
 
 #: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
 msgid "No name!!"
-msgstr "无名!!"
+msgstr "无名称!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
-msgstr "(无架No Shelves)"
+msgstr "(无书架)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "书架 #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "添加一个架子"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "删除一个书架"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "书架设定"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "微小"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "中等"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "大"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "巨大"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 msgid "Set Contents..."
-msgstr "书架内容"
+msgstr "设定书架内容..."
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "在所有之上"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "窗口下"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "所有物体下"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "允许窗口遮盖书架"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "缩至内容尺寸"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f 像素"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "样式"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "自动隐藏"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "自动隐藏书架"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "鼠标移入时显示"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "鼠标点击时显示"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "隐藏超时"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f 秒"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "隐藏持续时间"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "在全部桌面显示"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "在指定桌面显示"
 
@@ -2476,7 +2557,7 @@ msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment 无法建立它的拖放系统。"
 
 #: src/bin/e_main.c:867
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:872
@@ -2655,30 +2736,36 @@ msgstr "Enlightenment %s 模块"
 msgid "Would you like to unload this module?<br>"
 msgstr "您是否要卸载这个模块?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "你要求删除此书架。你确定要删除吗?"
 
-#: src/bin/e_shelf.c:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "停止移动/缩放项目"
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "开始移动/缩放项目"
 
-#: src/bin/e_shelf.c:1692
-#, fuzzy
+#: src/bin/e_shelf.c:1703
 msgid "Set Shelf Contents"
-msgstr "书架内容"
+msgstr "设定书架内容"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "删除此书架"
 
@@ -2725,49 +2812,42 @@ msgid "Logout in progress"
 msgstr "正在注销"
 
 #: src/bin/e_sys.c:366
-#, fuzzy
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
-msgstr "正在注销<br><hilight>请等等。</hilight>"
+msgstr "正在注销。<br><hilight>请等等。</hilight>"
 
 #: src/bin/e_sys.c:395 src/bin/e_sys.c:456
 msgid "Enlightenment is busy with another request"
-msgstr "Enlightenment 在忙碌另外的请求"
+msgstr "Enlightenment 在忙着处理另一个请求"
 
 #: src/bin/e_sys.c:401
-#, fuzzy
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
-msgstr "Enlightenment 正在注销。<br>在注销开始后,您不能进行其他系统操作。"
+msgstr "Enlightenment正在注销。<br>开始后,您不能进行其他系统操作。"
 
 #: src/bin/e_sys.c:409
-#, fuzzy
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
-msgstr "Enlightenment 正在关闭系统。<br>在关机开始后,您不能进行其他系统操作。"
+msgstr "Enlightenment正在关闭系统。<br>在开始后,您不能进行其他系统操作。"
 
 #: src/bin/e_sys.c:416
-#, fuzzy
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
-msgstr ""
-"Enlightenment 正在重新起动系统。<br>在重启开始后,您不能进行其他系统操作。"
+msgstr "Enlightenment 正在重新起动系统。<br>开始后,您不能进行其他系统操作。"
 
 #: src/bin/e_sys.c:423
-#, fuzzy
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
-msgstr "Enlightenment 正在挂起系统。<br>在挂起开始后,您不能进行其他系统操作。"
+msgstr "Enlightenment 正在挂起系统。<br>结束前您不能进行其他系统操作。"
 
 #: src/bin/e_sys.c:430
-#, fuzzy
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
-msgstr "Enlightenment 正在休眠系统。<br>在休眠开始后,您不能进行其他系统操作。"
+msgstr "Enlightenment正在休眠系统。<br>结束前,您不能进行其他系统操作。"
 
 #: src/bin/e_sys.c:437 src/bin/e_sys.c:483
 msgid "EEK! This should not happen"
@@ -2775,26 +2855,23 @@ msgstr "哎呀!不会吧!"
 
 #: src/bin/e_sys.c:463
 msgid "Power off failed."
-msgstr ""
+msgstr "关闭计算机失败了。"
 
 #: src/bin/e_sys.c:468
-#, fuzzy
 msgid "Reset failed."
-msgstr "桌面文件"
+msgstr "重新启动失败了。"
 
 #: src/bin/e_sys.c:473
-#, fuzzy
 msgid "Suspend failed."
-msgstr "挂起时间"
+msgstr "挂起系统失败了。"
 
 #: src/bin/e_sys.c:478
-#, fuzzy
 msgid "Hibernate failed."
-msgstr "休眠系统失败。"
+msgstr "休眠系统失败了。"
 
 #: src/bin/e_sys.c:535
 msgid "Power off"
-msgstr ""
+msgstr "关闭计算机"
 
 #: src/bin/e_sys.c:538
 #, fuzzy
@@ -2802,9 +2879,8 @@ msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "正在重新起动计算机。<br><hilight>请稍候。</hilight>"
 
 #: src/bin/e_sys.c:562
-#, fuzzy
 msgid "Resetting"
-msgstr "桌面设置"
+msgstr "正在重新设置"
 
 #: src/bin/e_sys.c:565
 #, fuzzy
@@ -2837,10 +2913,9 @@ msgstr "关于主题"
 msgid "Set As Theme"
 msgstr "设置为主题"
 
-#: src/bin/e_toolbar.c:331
-#, fuzzy
+#: src/bin/e_toolbar.c:340
 msgid "Set Toolbar Contents"
-msgstr "工具条内容"
+msgstr "设置工具条内容"
 
 #: src/bin/e_utils.c:246
 msgid "Cannot exit - immortal windows."
@@ -2855,67 +2930,67 @@ msgstr ""
 "一些窗口仍然处在被生命周期锁定之中。<br>这意味着 Enlightenment 不允许它自己退"
 "出,除非这些窗口已经被关闭,<br>或者被去除生命周期锁。<br>"
 
-#: src/bin/e_utils.c:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f 字节"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "将来"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "在最后一分钟"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li 年前"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li 月前"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li 星期前"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li 天前"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li 小时前"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li 分钟前"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -2927,7 +3002,7 @@ msgstr "未知"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "添加"
 
@@ -2950,7 +3025,7 @@ msgid "Add to Favorites"
 msgstr "添加到收藏"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3006,9 +3081,8 @@ msgid "Show alert when battery is low"
 msgstr "当电池电量低是显示警告"
 
 #: src/modules/battery/e_mod_config.c:136
-#, fuzzy
 msgid "Check every:"
-msgstr "每隔以下时间检查电池:"
+msgstr "检查计划,间隔为:"
 
 #: src/modules/battery/e_mod_config.c:138
 #: src/modules/conf_performance/e_int_config_performance.c:149
@@ -3038,9 +3112,9 @@ msgid "%1.0f min"
 msgstr "%1.0f 分钟"
 
 #: src/modules/battery/e_mod_config.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f %%"
-msgstr "%3.0f%%"
+msgstr "%1.0f %%"
 
 #: src/modules/battery/e_mod_config.c:151
 msgid "Auto dismiss in..."
@@ -3052,14 +3126,12 @@ msgid "%1.0f sec"
 msgstr "%1.1f 秒"
 
 #: src/modules/battery/e_mod_config.c:155
-#, fuzzy
 msgid "Alert"
-msgstr "加速"
+msgstr "警告"
 
 #: src/modules/battery/e_mod_config.c:160
-#, fuzzy
 msgid "Auto Detect"
-msgstr "自动隐藏"
+msgstr "自动检测"
 
 #: src/modules/battery/e_mod_config.c:162
 #: src/modules/conf_applications/e_mod_main.c:39
@@ -3070,36 +3142,36 @@ msgid "Internal"
 msgstr "内部"
 
 #: src/modules/battery/e_mod_config.c:164
-#, fuzzy
+#: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
-msgstr "ALT"
+msgstr "HAL"
 
 #: src/modules/battery/e_mod_config.c:167
 msgid "Hardware"
-msgstr ""
+msgstr "硬件"
 
 #: src/modules/battery/e_mod_main.c:135
 msgid "Battery"
 msgstr "电池"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 msgid "Your battery is low!"
 msgstr "电池电量低!"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr "建议使用交流电源。"
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr "错误"
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 msgid "Battery Meter"
 msgstr "电池标尺"
 
@@ -3108,9 +3180,24 @@ msgid "Clock"
 msgstr "时钟"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 msgid "Settings Panel"
-msgstr ""
+msgstr "设定面板"
+
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "正在重新设置"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "关闭时间"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+msgid "Modes"
+msgstr "模块"
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
@@ -3134,7 +3221,7 @@ msgid "Restart Applications"
 msgstr "重启应用程序"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "所有应用程序"
 
@@ -3144,7 +3231,7 @@ 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"
@@ -3185,7 +3272,7 @@ 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"
@@ -3197,7 +3284,7 @@ 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
@@ -3296,9 +3383,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"
@@ -3414,7 +3500,7 @@ 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"
@@ -3483,49 +3569,61 @@ 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"
 msgstr "桌面"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "屏幕锁定设置"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "自动锁定"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: 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:176
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
-msgstr "当 X 屏幕保护程序运行时锁定"
+msgstr "当X 屏幕保护程序运行时锁定"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+msgid "Time after screensaver activated"
+msgstr "当X 屏幕保护程序运行时锁定"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:180
+#: 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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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:240
+#: 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
@@ -3536,27 +3634,27 @@ msgstr "%1.0f 分钟"
 msgid "Personal"
 msgstr "个人"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "登陆框设置"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: 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:337
+#: 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:341
+#: 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:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3565,29 +3663,49 @@ msgstr "显示屏幕区域 #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "壁纸模式"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "主题壁纸"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+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:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "使用自定义屏幕锁定"
 
@@ -3595,59 +3713,74 @@ msgstr "使用自定义屏幕锁定"
 msgid "Screen Lock"
 msgstr "屏幕锁定"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "虚拟桌面设置"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "桌面数目"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "动画翻转"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "桌面"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: 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:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "翻转动画"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "关"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "框"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "缩放"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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
+#, fuzzy
+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 "虚拟桌面"
@@ -3663,8 +3796,8 @@ msgstr "对话设置"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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 "常规设置"
@@ -3675,7 +3808,7 @@ msgstr "禁用确认对话"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:91
 msgid "Normal Windows"
-msgstr ""
+msgstr "正常窗口"
 
 #: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Default Settings Dialogs Mode"
@@ -3697,7 +3830,7 @@ 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
@@ -3737,11 +3870,11 @@ msgstr "分辨率改变"
 
 #: src/modules/conf_display/e_int_config_display.c:194
 msgid "Save"
-msgstr ""
+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"
@@ -3814,23 +3947,23 @@ msgstr ""
 msgid "Display Power Management Settings"
 msgstr "显示电源管理设置"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: 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:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
-msgstr ""
+msgstr "计时器"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "等待时间"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "挂起时间"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "关闭时间"
 
@@ -3853,30 +3986,25 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
-#, fuzzy
 msgid "Edge Binding Settings"
-msgstr "键绑定设置"
+msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
 #: 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
 msgid "Add Edge"
-msgstr "添加组件"
+msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
-#, fuzzy
 msgid "Delete Edge"
-msgstr "删除键"
+msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
-#, fuzzy
 msgid "Modify Edge"
-msgstr "更改键"
+msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
@@ -3902,19 +4030,16 @@ msgid "Action Params"
 msgstr "动作参数"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#, fuzzy
 msgid "General Options"
-msgstr "常规设置"
+msgstr "常规选项"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
-#, fuzzy
 msgid "Allow binding activation with fullscreen windows"
-msgstr "允许窗口位于全屏窗口之上"
+msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
-#, fuzzy
 msgid "Edge Binding Sequence"
-msgstr "按键绑定顺序"
+msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
 #, fuzzy, c-format
@@ -3922,9 +4047,8 @@ msgid "%.2f seconds"
 msgstr "%2.2f 秒"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
-#, fuzzy
 msgid "Binding Edge Error"
-msgstr "绑定按键错误"
+msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
 #, c-format
@@ -4005,7 +4129,7 @@ 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 "要列出到匹配命令的最大数目"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:123
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:176
@@ -4128,9 +4252,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"
@@ -4262,7 +4385,7 @@ msgstr "字体"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:452
 msgid "Basic preview text: 123: 我的天空!"
-msgstr ""
+msgstr "123: 我的天空!"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:604
 msgid "Font Classes"
@@ -4362,7 +4485,7 @@ 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
@@ -4408,7 +4531,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f 像素"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4625,7 +4748,7 @@ msgid "Select an Edj File"
 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "文件"
 
@@ -4810,9 +4933,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 "应用程序编辑器"
+msgstr "应用程序优先级"
 
 #: src/modules/conf_performance/e_int_config_performance.c:146
 msgid "Cache Settings"
@@ -4873,12 +4995,11 @@ msgstr "可用用户环境"
 #: src/modules/conf_profiles/e_int_config_profiles.c:116
 #: src/modules/wizard/page_020.c:118
 msgid "Select a profile"
-msgstr ""
+msgstr "选择一个档案"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:125
-#, fuzzy
 msgid "Reset"
-msgstr "改变大小"
+msgstr "重置"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:281
 #, fuzzy, c-format
@@ -4886,9 +5007,8 @@ msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr "你要求删除此书架。你确定要删除吗?"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:285
-#, fuzzy
 msgid "Delete OK?"
-msgstr "删除键"
+msgstr "删除吗?"
 
 #: src/modules/conf_profiles/e_int_config_profiles.c:350
 msgid "Add New Profile"
@@ -4970,55 +5090,50 @@ msgstr "最大"
 msgid "Scaling"
 msgstr "缩放"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "屏幕保护程序设置"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 屏幕保护程序"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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:168
+#: 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:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f 秒"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "空白"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "偏好的"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "不偏好"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr ""
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "允许"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "不允许"
 
@@ -5031,10 +5146,9 @@ msgid "Configured Shelves"
 msgstr "设定的书架"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
-#, fuzzy
+#: src/modules/ibar/e_mod_config.c:114
 msgid "Setup"
-msgstr "设置 FM"
+msgstr "设置"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:277
 #, c-format
@@ -5076,10 +5190,6 @@ msgstr "主题分类"
 msgid "Assign"
 msgstr "指派"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "清除"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "清除所有"
@@ -5101,11 +5211,11 @@ msgstr "Elightenment 无法导入该主题。<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 "Elightenment 无法导入该主题,复制错误。<br><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"
@@ -5217,9 +5327,8 @@ msgid "For some reason, Enlightenment was unable to create a gradient."
 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"
@@ -5292,9 +5401,8 @@ msgid ""
 msgstr "Enlightenment 无法导入该壁纸。<br><br>您确定那是一个有效的壁纸吗?"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:122
-#, fuzzy
 msgid "Exchange wallpapers"
-msgstr "主题壁纸"
+msgstr "转换主题壁纸"
 
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
@@ -5920,30 +6028,19 @@ msgstr "投影"
 msgid "Run Command Dialog"
 msgstr "运行命令对话框"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "运行时错误"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
-msgstr ""
+msgstr "Home 家目录"
 
-#: src/modules/fileman/e_mod_main.c:332
-#, fuzzy
+#: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
-msgstr "收藏夹菜单"
+msgstr "收藏夹"
 
-#: src/modules/fileman/e_mod_main.c:344
-#, fuzzy
+#: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
-msgstr "重启"
+msgstr "Root"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: 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 "
@@ -5954,7 +6051,7 @@ msgid ""
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -5968,112 +6065,116 @@ msgstr ""
 "生。这是不好的情况,以防万一,您的配置文件已经被恢复到默认状态。对任何的不便"
 "表示歉意。<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr "文件管理器设置"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "图标尺寸"
 
-#: src/modules/fileman/e_mod_config.c:224
-#, fuzzy
+#: src/modules/fileman/e_mod_config.c:233
 msgid "View"
 msgstr "显示模式"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "首先排序目录"
 
-#: src/modules/fileman/e_mod_config.c:234
-#, fuzzy
+#: src/modules/fileman/e_mod_config.c:243
 msgid "Case Sensitive"
-msgstr "基本尺寸"
+msgstr "完全匹配"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "启用单击"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr "显示图标扩展"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "显示完整路径"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr "显示桌面图标"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr "显示工具栏"
 
-#: src/modules/fileman/e_mod_config.c:257
-msgid "Show HAL icons on desktop"
-msgstr "在桌面上显示 HAL 图标"
-
-#: src/modules/fileman/e_mod_config.c:261
+#: src/modules/fileman/e_mod_config.c:267
 #: src/modules/gadman/e_mod_gadman.c:729
 msgid "Behavior"
 msgstr "行为"
 
-#: src/modules/fileman/e_fwin.c:1187
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr "在桌面上显示 HAL 图标"
+
+#: 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:1462
 msgid "Go to Parent Directory"
 msgstr "回到上级目录"
 
-#: src/modules/fileman/e_fwin.c:1249
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1524
 msgid "Other application..."
-msgstr "添加程序..."
+msgstr "其他应用程序..."
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "打开"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "打开方式..."
 
-#: src/modules/fileman/e_fwin.c:1628
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1892
 msgid "Known Applications"
-msgstr "应用程序"
+msgstr "已知应用程序"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "指定应用程序"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 msgid "Custom Command"
 msgstr "自定义命令"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:53
-#, fuzzy, c-format
+#, c-format
 msgid "%d operations"
-msgstr "隐藏持续时间"
+msgstr "%d 运行"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:55
-#, fuzzy, c-format
+#, c-format
 msgid "idle"
-msgstr "平铺"
+msgstr "闲置"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:139
 msgid "EFM Operation Info"
-msgstr ""
+msgstr "EFM运行信息"
 
 #: src/modules/gadman/e_mod_config.c:58
 msgid "Gadgets Manager"
@@ -6100,7 +6201,6 @@ msgid "Animations"
 msgstr "动画"
 
 #: src/modules/gadman/e_mod_config.c:168
-#, fuzzy
 msgid "Background"
 msgstr "背景"
 
@@ -6147,39 +6247,39 @@ msgstr "前一窗口"
 msgid "Select a window"
 msgstr "选择一个窗口"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
-msgstr ""
+msgstr "IBar设定"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
-msgstr "选择 Bar 源"
+msgstr "已选定的Bar源"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "图标标签"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "显示图标标签"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "显示应用程序名称"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "显示应用程序注释"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
-msgstr ""
+msgstr "显示应用程序常规设置"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
-msgstr "创建新 IBar 源"
+msgstr "创建新IBar源"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "为这个新源起个名字:"
 
@@ -6188,39 +6288,39 @@ msgstr "为这个新源起个名字:"
 msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
 "bar source?"
-msgstr "您正要删除 \"%s\"。<br><br>您确定吗?"
+msgstr "您正要删除\"%s\"。<br><br>确定删除这个bar源吗?"
 
 #: src/modules/ibar/e_mod_config.c:187
 msgid "Are you sure you want to delete this bar source?"
-msgstr ""
+msgstr "确定要删除这个bar源吗?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "改变图标属性"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "删除图标"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 msgid "Add An Icon"
 msgstr "添加一个图标"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 msgid "Create New Icon"
 msgstr "创建新图标"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "添加应用程序"
 
 #: src/modules/ibox/e_mod_config.c:52
 msgid "IBox Settings"
-msgstr ""
+msgstr "IBox设定"
 
 #: src/modules/ibox/e_mod_config.c:105
 msgid "Display Name"
@@ -6266,128 +6366,128 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: 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:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 msgid "Popup Settings"
 msgstr "弹出设置"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 msgid "Show popup on desktop change"
 msgstr "当桌面更改时显示弹出窗口"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "点击已设定"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 msgid "Drag and Drop button"
 msgstr "拖拽按钮"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 msgid "Drag whole desktop"
 msgstr "拖拽整个桌面"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr "键盘动作弹出高度"
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f 像素"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "拖拽阻力"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 msgid "Popup speed"
 msgstr "弹出速度"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f 秒"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 msgid "Urgent Window Settings"
 msgstr "紧急窗口设置"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 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:344
+#: src/modules/pager/e_mod_config.c:343
 msgid "Attetion"
 msgstr "注意"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 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:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "按钮 %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 msgid "Popup Desk Right"
 msgstr "弹出桌面向右"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 msgid "Popup Desk Left"
 msgstr "弹出桌面向左"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 msgid "Popup Desk Up"
 msgstr "弹出桌面向上"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 msgid "Popup Desk Down"
 msgstr "弹出桌面向下"
 
@@ -6397,15 +6497,15 @@ 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
@@ -6521,7 +6621,7 @@ msgstr "下一步"
 
 #: src/modules/wizard/e_wizard.c:281
 msgid "Welcome to Enlightenment"
-msgstr "欢迎光临 Enlightenment"
+msgstr "欢迎光临Enlightenment"
 
 #: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
 msgid "Select one"
@@ -6529,7 +6629,7 @@ msgstr "选择一个"
 
 #: src/modules/wizard/page_020.c:55
 msgid "Profile"
-msgstr ""
+msgstr "档案"
 
 #: src/modules/wizard/page_030.c:89
 msgid ""
@@ -6540,58 +6640,55 @@ msgstr ""
 
 #: 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 "桌面文件\t"
 
 #: 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
-#, fuzzy
 msgid "Select Icons to Add"
-msgstr "选择一个图标"
+msgstr "选择要添加的图标"
 
 #: src/modules/wizard/page_080.c:62
-#, fuzzy
 msgid "Quick Launch"
-msgstr "启动"
+msgstr "快速启动"
 
 #: src/modules/wizard/page_080.c:64
-#, fuzzy
 msgid "Select Applications"
-msgstr "已选择的应用程序"
+msgstr "选择应用程序"
 
 #: src/modules/mixer/app_mixer.c:165
 msgid "Capture"
@@ -6633,13 +6730,13 @@ msgstr "左:"
 msgid "Right:"
 msgstr "右:"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: 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 "锁定滚动"
+msgstr "锁定滚动条"
 
 #: src/modules/mixer/app_mixer.c:419
 msgid "Edit"
@@ -6647,7 +6744,7 @@ 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"
@@ -6655,11 +6752,11 @@ 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..."
@@ -6667,18 +6764,17 @@ 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:613
-#, fuzzy
+#: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
-msgstr "字体"
+msgstr "控制"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6698,11 +6794,11 @@ msgstr "网络设备"
 
 #: src/modules/connman/e_mod_main.c:741
 msgid "Wifi"
-msgstr "Wifi"
+msgstr "无线网络 Wifi"
 
 #: src/modules/connman/e_mod_main.c:744
 msgid "LAN"
-msgstr ""
+msgstr "局域网络 LAN"
 
 #: src/modules/connman/e_mod_main.c:747
 msgid "Specific Device"
@@ -6712,6 +6808,22 @@ msgstr "指定设备"
 msgid "Networks"
 msgstr "网络"
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "系统"
+
+#~ msgid "Mount of device failed"
+#~ msgstr "挂载设备失败"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "配置虚拟桌面"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 4ed40b6..003d032 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 fc92a16..e3c6c93 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-04-22 22:52+1000\n"
+"POT-Creation-Date: 2009-06-15 14:52+1000\n"
 "PO-Revision-Date: 2007-11-06 20:25+0800\n"
 "Last-Translator: Chia-I Wu <olv at openmoko.com>\n"
 "Language-Team: none\n"
@@ -20,20 +20,20 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "關於 Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2485 src/bin/e_config_dialog.c:259
-#: src/bin/e_fm.c:864 src/bin/e_int_border_menu.c:215
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:259
+#: src/bin/e_fm.c:932 src/bin/e_int_border_menu.c:215
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:178
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:125
-#: src/modules/fileman/e_fwin.c:1612 src/modules/illume/e_mod_win.c:177
+#: src/modules/fileman/e_fwin.c:1876 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:2781 src/bin/e_actions.c:2785
-#: src/bin/e_actions.c:2789 src/bin/e_int_menus.c:165 src/bin/e_main.c:666
+#: 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:666
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:182
 #: src/modules/wizard/page_000.c:27
 msgid "Enlightenment"
@@ -69,405 +69,407 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "您是否確定強制結束此視窗?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1778 src/bin/e_actions.c:1860
-#: src/bin/e_actions.c:1924 src/bin/e_actions.c:1988 src/bin/e_actions.c:2052
-#: src/bin/e_actions.c:2116 src/bin/e_confirm_dialog.c:47 src/bin/e_fm.c:8520
-#: src/bin/e_fm.c:8716 src/bin/e_module.c:502
+#: 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:9010 src/bin/e_fm.c:9237
+#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "是"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1780 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1926 src/bin/e_actions.c:1990 src/bin/e_actions.c:2054
-#: src/bin/e_actions.c:2118 src/bin/e_confirm_dialog.c:48 src/bin/e_fm.c:8518
-#: src/bin/e_fm.c:8717 src/bin/e_module.c:503
+#: 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:9008 src/bin/e_fm.c:9238
+#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "否"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1769
 msgid "Are you sure you want to exit?"
 msgstr "您是否確定退出?"
 
-#: src/bin/e_actions.c:1773
+#: src/bin/e_actions.c:1771
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "您要求退出 Enlightenment。<br><br>您是否確定退出?"
 
-#: src/bin/e_actions.c:1853
+#: src/bin/e_actions.c:1867
 msgid "Are you sure you want to log out?"
 msgstr "您是否確定登出?"
 
-#: src/bin/e_actions.c:1855
+#: src/bin/e_actions.c:1869
 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:1917 src/bin/e_actions.c:2045
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
 msgid "Are you sure you want to turn off?"
 msgstr "您是否確定關機?"
 
-#: src/bin/e_actions.c:1919
+#: src/bin/e_actions.c:1933
 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:1981
+#: src/bin/e_actions.c:1995
 msgid "Are you sure you want to reboot?"
 msgstr "您是否確定重新開機?"
 
-#: src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1997
 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:2047
+#: src/bin/e_actions.c:2061
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "您要求進入待機狀態。<br><br>您是否確定待機?"
 
-#: src/bin/e_actions.c:2109
+#: src/bin/e_actions.c:2123
 msgid "Are you sure you want to hibernate?"
 msgstr "您是否確定休眠?"
 
-#: src/bin/e_actions.c:2111
+#: src/bin/e_actions.c:2125
 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:2445 src/bin/e_actions.c:2456 src/bin/e_actions.c:2475
-#: src/bin/e_actions.c:2480 src/bin/e_actions.c:2485 src/bin/e_actions.c:2490
-#: src/bin/e_actions.c:2709 src/bin/e_actions.c:2713 src/bin/e_actions.c:2718
-#: src/bin/e_actions.c:2724 src/bin/e_actions.c:2730 src/bin/e_actions.c:2736
+#: 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
 msgid "Window : Actions"
 msgstr "視窗: 動作"
 
-#: src/bin/e_actions.c:2445 src/bin/e_fm.c:5920
+#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "移動"
 
-#: src/bin/e_actions.c:2456
+#: src/bin/e_actions.c:2470
 msgid "Resize"
 msgstr "改變大小"
 
-#: src/bin/e_actions.c:2467 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2761 src/bin/e_actions.c:2763 src/bin/e_actions.c:2765
+#: 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/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "選單"
 
-#: src/bin/e_actions.c:2467
+#: src/bin/e_actions.c:2481
 msgid "Window Menu"
 msgstr "視窗選單"
 
-#: src/bin/e_actions.c:2475 src/bin/e_int_border_menu.c:185
+#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:185
 msgid "Raise"
 msgstr "上移"
 
-#: src/bin/e_actions.c:2480 src/bin/e_int_border_menu.c:177
+#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:177
 msgid "Lower"
 msgstr "下移"
 
-#: src/bin/e_actions.c:2490 src/bin/e_int_border_menu.c:204
+#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:204
 msgid "Kill"
 msgstr "強制結束"
 
-#: src/bin/e_actions.c:2495 src/bin/e_actions.c:2502 src/bin/e_actions.c:2509
-#: src/bin/e_actions.c:2516 src/bin/e_actions.c:2518 src/bin/e_actions.c:2521
-#: src/bin/e_actions.c:2524 src/bin/e_actions.c:2526 src/bin/e_actions.c:2528
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2537 src/bin/e_actions.c:2539
-#: src/bin/e_actions.c:2541 src/bin/e_actions.c:2543 src/bin/e_actions.c:2545
-#: src/bin/e_actions.c:2552 src/bin/e_actions.c:2557
+#: 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
 msgid "Window : State"
 msgstr "視窗: 狀態"
 
-#: src/bin/e_actions.c:2495
+#: src/bin/e_actions.c:2509
 msgid "Sticky Mode Toggle"
 msgstr "切換相黏模式"
 
-#: src/bin/e_actions.c:2502
+#: src/bin/e_actions.c:2516
 msgid "Iconic Mode Toggle"
 msgstr "切換圖示化"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2523
 msgid "Fullscreen Mode Toggle"
 msgstr "切換全螢幕模式"
 
-#: src/bin/e_actions.c:2516 src/bin/e_int_border_menu.c:149
+#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:149
 #: src/bin/e_int_border_menu.c:350
 msgid "Maximize"
 msgstr "最大化"
 
-#: src/bin/e_actions.c:2518
+#: src/bin/e_actions.c:2532
 msgid "Maximize Vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_actions.c:2521
+#: src/bin/e_actions.c:2535
 msgid "Maximize Horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_actions.c:2524
+#: src/bin/e_actions.c:2538
 msgid "Maximize Fullscreen"
 msgstr "全螢幕最大化"
 
-#: src/bin/e_actions.c:2526
+#: src/bin/e_actions.c:2540
 msgid "Maximize Mode \"Smart\""
 msgstr "「智慧型」最大化模式"
 
-#: src/bin/e_actions.c:2528
+#: src/bin/e_actions.c:2542
 msgid "Maximize Mode \"Expand\""
 msgstr "「展開」最大化模式"
 
-#: src/bin/e_actions.c:2530
+#: src/bin/e_actions.c:2544
 msgid "Maximize Mode \"Fill\""
 msgstr "「填滿」最大化模式"
 
-#: src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2551
 msgid "Shade Up Mode Toggle"
 msgstr "切換上捲模式"
 
-#: src/bin/e_actions.c:2539
+#: src/bin/e_actions.c:2553
 msgid "Shade Down Mode Toggle"
 msgstr "切換下捲模式"
 
-#: src/bin/e_actions.c:2541
+#: src/bin/e_actions.c:2555
 msgid "Shade Left Mode Toggle"
 msgstr "切換左捲模式"
 
-#: src/bin/e_actions.c:2543
+#: src/bin/e_actions.c:2557
 msgid "Shade Right Mode Toggle"
 msgstr "切換右捲模式"
 
-#: src/bin/e_actions.c:2545
+#: src/bin/e_actions.c:2559
 msgid "Shade Mode Toggle"
 msgstr "切換捲起模式"
 
-#: src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2566
 msgid "Toggle Borderless State"
 msgstr "切換無邊框狀態"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2571
 msgid "Toggle Pinned State"
 msgstr "切換固定於桌面狀態"
 
-#: src/bin/e_actions.c:2562 src/bin/e_actions.c:2564 src/bin/e_actions.c:2566
-#: src/bin/e_actions.c:2568 src/bin/e_actions.c:2570 src/bin/e_actions.c:2576
-#: src/bin/e_actions.c:2581 src/bin/e_actions.c:2586 src/bin/e_actions.c:2592
-#: src/bin/e_actions.c:2598 src/bin/e_actions.c:2600 src/bin/e_actions.c:2602
-#: src/bin/e_actions.c:2604 src/bin/e_actions.c:2606 src/bin/e_actions.c:2608
-#: src/bin/e_actions.c:2610 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: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:2648 src/bin/e_actions.c:2654
-#: src/bin/e_actions.c:2659 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:2821 src/bin/e_actions.c:2826
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:686
+#: 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: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:687
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:326 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "桌面"
 
-#: src/bin/e_actions.c:2562
+#: src/bin/e_actions.c:2576
 msgid "Flip Desktop Left"
 msgstr "切換到左方桌面"
 
-#: src/bin/e_actions.c:2564
+#: src/bin/e_actions.c:2578
 msgid "Flip Desktop Right"
 msgstr "切換到右方桌面"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2580
 msgid "Flip Desktop Up"
 msgstr "切換到上方桌面"
 
-#: src/bin/e_actions.c:2568
+#: src/bin/e_actions.c:2582
 msgid "Flip Desktop Down"
 msgstr "切換到下方桌面"
 
-#: src/bin/e_actions.c:2570
+#: src/bin/e_actions.c:2584
 msgid "Flip Desktop By..."
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2590
 msgid "Show The Desktop"
 msgstr "顯示桌面"
 
-#: src/bin/e_actions.c:2581
+#: src/bin/e_actions.c:2595
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "顯示桌面"
 
-#: src/bin/e_actions.c:2586
+#: src/bin/e_actions.c:2600
 msgid "Flip Desktop To..."
 msgstr "二維切換桌面到..."
 
-#: src/bin/e_actions.c:2592
+#: src/bin/e_actions.c:2606
 msgid "Flip Desktop Linearly..."
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2598
+#: src/bin/e_actions.c:2612
 msgid "Switch To Desktop 0"
 msgstr "切換到桌面 0"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2614
 msgid "Switch To Desktop 1"
 msgstr "切換到桌面 1"
 
-#: src/bin/e_actions.c:2602
+#: src/bin/e_actions.c:2616
 msgid "Switch To Desktop 2"
 msgstr "切換到桌面 2"
 
-#: src/bin/e_actions.c:2604
+#: src/bin/e_actions.c:2618
 msgid "Switch To Desktop 3"
 msgstr "切換到桌面 3"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2620
 msgid "Switch To Desktop 4"
 msgstr "切換到桌面 4"
 
-#: src/bin/e_actions.c:2608
+#: src/bin/e_actions.c:2622
 msgid "Switch To Desktop 5"
 msgstr "切換到桌面 5"
 
-#: src/bin/e_actions.c:2610
+#: src/bin/e_actions.c:2624
 msgid "Switch To Desktop 6"
 msgstr "切換到桌面 6"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2626
 msgid "Switch To Desktop 7"
 msgstr "切換到桌面 7"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2628
 msgid "Switch To Desktop 8"
 msgstr "切換到桌面 8"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2630
 msgid "Switch To Desktop 9"
 msgstr "切換到桌面 9"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2632
 msgid "Switch To Desktop 10"
 msgstr "切換到桌面 10"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2634
 msgid "Switch To Desktop 11"
 msgstr "切換到桌面 11"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2636
 msgid "Switch To Desktop..."
 msgstr "切換桌面到..."
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2642
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "切換到左方桌面"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2644
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "切換到右方桌面"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2646
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "切換到上方桌面"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2648
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "切換到下方桌面"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2650
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2656
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "二維切換桌面到..."
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2662
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2654
+#: src/bin/e_actions.c:2668
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "二維切換桌面到..."
 
-#: src/bin/e_actions.c:2659
+#: src/bin/e_actions.c:2673
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "切換到桌面 0"
 
-#: src/bin/e_actions.c:2661
+#: src/bin/e_actions.c:2675
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "切換到桌面 1"
 
-#: src/bin/e_actions.c:2663
+#: src/bin/e_actions.c:2677
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "切換到桌面 2"
 
-#: src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2679
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "切換到桌面 3"
 
-#: src/bin/e_actions.c:2667
+#: src/bin/e_actions.c:2681
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "切換到桌面 4"
 
-#: src/bin/e_actions.c:2669
+#: src/bin/e_actions.c:2683
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "切換到桌面 5"
 
-#: src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2685
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "切換到桌面 6"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2687
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "切換到桌面 7"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2689
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "切換到桌面 8"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2691
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "切換到桌面 9"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2693
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "切換到桌面 10"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2695
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "切換到桌面 11"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2697
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "切換桌面到..."
 
-#: src/bin/e_actions.c:2690 src/bin/e_actions.c:2692 src/bin/e_actions.c:2694
-#: src/bin/e_actions.c:2699 src/bin/e_actions.c:2701 src/bin/e_actions.c:2703
+#: 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/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
@@ -477,103 +479,118 @@ msgstr "切換桌面到..."
 msgid "Screen"
 msgstr "螢幕"
 
-#: src/bin/e_actions.c:2690
+#: src/bin/e_actions.c:2704
 msgid "Send Mouse To Screen 0"
 msgstr "將滑鼠送到螢幕 0"
 
-#: src/bin/e_actions.c:2692
+#: src/bin/e_actions.c:2706
 msgid "Send Mouse To Screen 1"
 msgstr "將滑鼠送到螢幕 1"
 
-#: src/bin/e_actions.c:2694
+#: src/bin/e_actions.c:2708
 msgid "Send Mouse To Screen..."
 msgstr "將滑鼠送到其它螢幕..."
 
-#: src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2713
 msgid "Send Mouse Forward 1 Screen"
 msgstr "將滑鼠送到下一螢幕"
 
-#: src/bin/e_actions.c:2701
+#: src/bin/e_actions.c:2715
 msgid "Send Mouse Back 1 Screen"
 msgstr "將滑鼠送到上一螢幕"
 
-#: src/bin/e_actions.c:2703
+#: src/bin/e_actions.c:2717
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "將滑鼠送到目前螢幕之..."
 
-#: src/bin/e_actions.c:2741 src/bin/e_actions.c:2743 src/bin/e_actions.c:2745
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2765
 msgid "Window : Moving"
 msgstr "視窗: 移動"
 
-#: src/bin/e_actions.c:2741
+#: src/bin/e_actions.c:2755
 msgid "To Next Desktop"
 msgstr "送到下一桌面"
 
-#: src/bin/e_actions.c:2743
+#: src/bin/e_actions.c:2757
 msgid "To Previous Desktop"
 msgstr "送到上一桌面"
 
-#: src/bin/e_actions.c:2745
+#: src/bin/e_actions.c:2759
 msgid "By Desktop #..."
 msgstr "目前桌面之..."
 
-#: src/bin/e_actions.c:2751
+#: src/bin/e_actions.c:2765
 msgid "To Desktop..."
 msgstr "送到桌面..."
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2771
 msgid "Show Main Menu"
 msgstr "顯示主選單"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2773
 msgid "Show Favorites Menu"
 msgstr "顯示「我的最愛」選單"
 
-#: src/bin/e_actions.c:2761
+#: src/bin/e_actions.c:2775
 msgid "Show All Applications Menu"
 msgstr "顯示「應用程式」選單"
 
-#: src/bin/e_actions.c:2763
+#: src/bin/e_actions.c:2777
 msgid "Show Clients Menu"
 msgstr "顯示「視窗列表」選單"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2779
 msgid "Show Menu..."
 msgstr "顯示選單..."
 
-#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:163
 #: 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:2772 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "命令"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2791
 msgid "Application"
 msgstr "應用程式"
 
-#: src/bin/e_actions.c:2781 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "重新啟動"
 
-#: src/bin/e_actions.c:2785 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "退出"
 
-#: src/bin/e_actions.c:2789
+#: src/bin/e_actions.c:2803
 #, fuzzy
 msgid "Exit Now"
 msgstr "退出"
 
-#: src/bin/e_actions.c:2793 src/bin/e_actions.c:2797 src/bin/e_actions.c:2801
-#: src/bin/e_actions.c:2805 src/bin/e_actions.c:2809 src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#, fuzzy
+msgid "Enlightenment : Mode"
+msgstr "Enlightenment %s 模組"
+
+#: src/bin/e_actions.c:2808
+#, fuzzy
+msgid "Presentation Mode Toggle"
+msgstr "切換全螢幕模式"
+
+#: src/bin/e_actions.c:2813
+#, 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_configure.c:145 src/bin/e_int_config_modules.c:45
-#: src/modules/conf_desklock/e_int_config_desklock.c:243
+#: 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
@@ -586,58 +603,58 @@ msgstr "退出"
 msgid "System"
 msgstr "系統"
 
-#: src/bin/e_actions.c:2793
+#: src/bin/e_actions.c:2817
 msgid "Log Out"
 msgstr "登入"
 
-#: src/bin/e_actions.c:2797
+#: src/bin/e_actions.c:2821
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2801
+#: src/bin/e_actions.c:2825
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2805
+#: src/bin/e_actions.c:2829
 msgid "Reboot"
 msgstr "重新開機"
 
-#: src/bin/e_actions.c:2809
+#: src/bin/e_actions.c:2833
 msgid "Suspend"
 msgstr "待機"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2837
 msgid "Hibernate"
 msgstr "休眠"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2845
 #, fuzzy
 msgid "Lock"
 msgstr "鎖定值"
 
-#: src/bin/e_actions.c:2826 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
 msgid "Cleanup Windows"
 msgstr "排列視窗"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "視窗: 動作"
 
-#: src/bin/e_actions.c:2831
+#: src/bin/e_actions.c:2855
 #, fuzzy
 msgid "Delayed Action"
 msgstr "特定應用程式"
 
-#: src/bin/e_bg.c:21 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "設定為桌布"
 
-#: src/bin/e_border.c:4881
+#: src/bin/e_border.c:5080
 msgid "Desktop files scan done"
 msgstr "完成 desktop 檔案掃描"
 
-#: src/bin/e_border.c:4893
+#: src/bin/e_border.c:5092
 msgid "Desktop file scan"
 msgstr "掃描 desktop 檔案"
 
@@ -646,13 +663,14 @@ msgstr "掃描 desktop 檔案"
 msgid "Color Selector"
 msgstr "Profile 選擇器"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1728
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1788
 #: src/bin/e_config_dialog.c:249 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:323
-#: 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:642 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_fm.c:8529 src/bin/e_fm.c:9164 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:642
+#: 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
@@ -667,7 +685,7 @@ 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_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8531
 #: src/bin/e_fm_prop.c:514 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
@@ -679,7 +697,7 @@ msgstr "確定"
 msgid "Cancel"
 msgstr "取消"
 
-#: src/bin/e_config.c:729 src/bin/e_config.c:762
+#: src/bin/e_config.c:743 src/bin/e_config.c:776
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -695,7 +713,7 @@ msgstr ""
 "資料未能提供的功能。<br>新的組態會加入這些功能。您現在可以重新配置您的桌面設"
 "定。<br>抱歉打斷您的配置。<br>"
 
-#: src/bin/e_config.c:746
+#: src/bin/e_config.c:760
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -708,12 +726,12 @@ msgstr ""
 "Enlightenment 或是從其它地方複製了新版的組態檔<br>否則這不應該發生。這是不好"
 "的,所以為防萬一,您的組態檔已被<br>恢復成預設值。很抱歉為您帶來不便。<br>"
 
-#: src/bin/e_config.c:1629
+#: src/bin/e_config.c:1689
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "桌面設定"
 
-#: src/bin/e_config.c:1652
+#: src/bin/e_config.c:1712
 #, fuzzy, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -723,7 +741,7 @@ msgstr ""
 "當儲存 Enlightment 設定檔時有錯誤發生。<br>錯誤原因無法確定。<br><br>發生錯誤"
 "的檔案為:<br>%s<br><br>此檔案已刪除以防止損壞設定。<br>"
 
-#: src/bin/e_config.c:1663
+#: src/bin/e_config.c:1723
 #, fuzzy, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -736,7 +754,7 @@ msgstr ""
 "設定檔應該非常小。<br>請檢查您家目錄的設定。<br><br>發生錯誤的檔案為:<br>%"
 "s<br><br>此檔案已刪除以防止損壞設定。<br>"
 
-#: src/bin/e_config.c:1676
+#: src/bin/e_config.c:1736
 #, fuzzy, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -747,7 +765,7 @@ msgstr ""
 "當寫入 Enlightment 設定檔時有錯誤發生。<br>您的磁碟有問題而且可能需要替換。"
 "<br><br>發生錯誤的檔案為:<br>%s<br><br>此檔案已刪除以防止損壞設定。<br>"
 
-#: src/bin/e_config.c:1687
+#: src/bin/e_config.c:1747
 #, fuzzy, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -759,7 +777,7 @@ msgstr ""
 "了磁碟配額。<br><br>發生錯誤的檔案為:<br>%s<br><br>此檔案已刪除以防止損壞設"
 "定。<br>"
 
-#: src/bin/e_config.c:1699
+#: src/bin/e_config.c:1759
 #, fuzzy, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -769,12 +787,12 @@ msgstr ""
 "Enlightment 要寫入的設定檔未預期的被關閉了。<br>這很不尋常。<br><br>發生錯誤"
 "的檔案為:<br>%s<br><br>此檔案已刪除以防止損壞設定。<br>"
 
-#: src/bin/e_config.c:1724
+#: src/bin/e_config.c:1784
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment 組態寫入發生問題"
 
-#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1092
+#: src/bin/e_config_dialog.c:199 src/modules/battery/e_mod_main.c:1091
 #: 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,7 +818,7 @@ 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:1082
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1076
 msgid "Extensions"
 msgstr "擴充套件"
 
@@ -809,35 +827,35 @@ msgstr "擴充套件"
 msgid "Container %d"
 msgstr "容器 %d"
 
-#: src/bin/e_desklock.c:144
+#: src/bin/e_desklock.c:174
 msgid "Error - no PAM support"
 msgstr "錯誤 - 沒有 PAM 支援"
 
-#: src/bin/e_desklock.c:145
+#: src/bin/e_desklock.c:175
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr "PAM 支援並沒有被編譯進 Enlightment,<br>所以桌面鎖定功能被停用了。"
 
-#: src/bin/e_desklock.c:211
+#: src/bin/e_desklock.c:241
 msgid "Lock Failed"
 msgstr "無法鎖定"
 
-#: src/bin/e_desklock.c:212
+#: src/bin/e_desklock.c:242
 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:298
+#: src/bin/e_desklock.c:333
 msgid "Please enter your unlock password"
 msgstr "請輸入您的解鎖密碼"
 
-#: src/bin/e_desklock.c:656
+#: src/bin/e_desklock.c:709
 msgid "Authentication System Error"
 msgstr "認證系統錯誤"
 
-#: src/bin/e_desklock.c:657
+#: src/bin/e_desklock.c:710
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -847,6 +865,25 @@ msgstr ""
 "PAM 認證階段設定失敗。<br>錯誤代碼為 <hilight>%i</hilight>。<br>這很糟糕而且"
 "不應該發生,請回報這個錯誤。"
 
+#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1040
+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
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
 msgstr "不完整的視窗屬性"
@@ -946,23 +983,23 @@ msgstr "選擇圖示"
 msgid "Select an Executable"
 msgstr "選擇一個執行檔"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:7850
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8031
 #: src/modules/conf_applications/e_int_config_apps.c:269
 #: src/modules/conf_profiles/e_int_config_profiles.c:123
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:111
+#: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "刪除"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7758
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7938
 msgid "Cut"
 msgstr "剪下"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:5915 src/bin/e_fm.c:7772
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7952
 msgid "Copy"
 msgstr "複製"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7598 src/bin/e_fm.c:7785
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7777 src/bin/e_fm.c:7965
 msgid "Paste"
 msgstr "貼上"
 
@@ -994,267 +1031,321 @@ msgid ""
 "application failed to start."
 msgstr "Enlightment 無法執行應用程式:<br><br>%s<br><br>此程式無法啟動。"
 
-#: src/bin/e_exec.c:417
+#: src/bin/e_exec.c:418
 msgid "Application Execution Error"
 msgstr "應用程式執行錯誤"
 
-#: src/bin/e_exec.c:429
+#: src/bin/e_exec.c:430
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s 無預警地停止執行。"
 
-#: src/bin/e_exec.c:435
+#: src/bin/e_exec.c:436
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "錯誤代碼 %i 被 %s 傳回。"
 
-#: src/bin/e_exec.c:442
+#: src/bin/e_exec.c:443
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s 被 Interrupt Signal 中斷。"
 
-#: src/bin/e_exec.c:444
+#: src/bin/e_exec.c:445
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s 被 Quit Signal 中斷。"
 
-#: src/bin/e_exec.c:448
+#: src/bin/e_exec.c:449
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s 被 Abort Signal 中斷。"
 
-#: src/bin/e_exec.c:451
+#: src/bin/e_exec.c:452
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s 被 FPE Signal 中斷。"
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:455
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s 被 Kill Signal 中斷。"
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:458
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s 被 Segmentation Fault 中斷。"
 
-#: src/bin/e_exec.c:460
+#: src/bin/e_exec.c:461
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s 被 Broken Pipe 中斷。"
 
-#: src/bin/e_exec.c:463
+#: src/bin/e_exec.c:464
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s 被 Terminal Signal 中斷。"
 
-#: src/bin/e_exec.c:466
+#: src/bin/e_exec.c:467
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s 被 Bus Error 中斷。"
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:470
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s 被 Signal %i 中斷。"
 
-#: src/bin/e_exec.c:525
+#: src/bin/e_exec.c:528
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "*** 剩下的輸出被刪節了。儲存輸出以供檢視。***\n"
 
-#: src/bin/e_exec.c:589 src/bin/e_exec.c:663 src/bin/e_exec.c:669
+#: src/bin/e_exec.c:592 src/bin/e_exec.c:666 src/bin/e_exec.c:672
 msgid "Error Logs"
 msgstr "錯誤紀錄檔"
 
-#: src/bin/e_exec.c:594 src/bin/e_exec.c:670
+#: src/bin/e_exec.c:597 src/bin/e_exec.c:673
 msgid "There was no error message."
 msgstr "沒有錯誤訊息。"
 
-#: src/bin/e_exec.c:598 src/bin/e_exec.c:677
+#: src/bin/e_exec.c:601 src/bin/e_exec.c:680
 msgid "Save This Message"
 msgstr "儲存訊息"
 
-#: src/bin/e_exec.c:602 src/bin/e_exec.c:680
+#: src/bin/e_exec.c:605 src/bin/e_exec.c:683
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "錯誤紀錄檔已被儲存到 %s/%s.log"
 
-#: src/bin/e_exec.c:628
+#: src/bin/e_exec.c:631
 msgid "Error Information"
 msgstr "錯誤資訊"
 
-#: src/bin/e_exec.c:636
+#: src/bin/e_exec.c:639
 msgid "Error Signal Information"
 msgstr "錯誤 Signal 資訊"
 
-#: src/bin/e_exec.c:647 src/bin/e_exec.c:653
+#: src/bin/e_exec.c:650 src/bin/e_exec.c:656
 msgid "Output Data"
 msgstr "輸出資料"
 
-#: src/bin/e_exec.c:654
+#: src/bin/e_exec.c:657
 msgid "There was no output."
 msgstr "沒有輸入。"
 
-#: src/bin/e_fm.c:866
+#: src/bin/e_fm.c:934
 #, fuzzy
 msgid "Nonexistent path"
 msgstr "不存在的路徑"
 
-#: src/bin/e_fm.c:869
+#: src/bin/e_fm.c:937
 #, fuzzy, c-format
 msgid "%s doesn't exist."
 msgstr "不存在 %s"
 
-#: src/bin/e_fm.c:3529
+#: src/bin/e_fm.c:3031
+#, fuzzy
+msgid "Mount Error"
+msgstr "執行錯誤"
+
+#: src/bin/e_fm.c:3031
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3047
+#, fuzzy
+msgid "Unmount Error"
+msgstr "執行錯誤"
+
+#: src/bin/e_fm.c:3047
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3062
+#, fuzzy
+msgid "Eject Error"
+msgstr "執行時錯誤"
+
+#: src/bin/e_fm.c:3062
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3682
 #, c-format
 msgid "%i Files"
 msgstr "%i 筆檔案"
 
-#: src/bin/e_fm.c:5928 src/bin/e_fm.c:7606 src/bin/e_fm.c:7793
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7785 src/bin/e_fm.c:7973
 #, fuzzy
 msgid "Link"
 msgstr "線性"
 
-#: src/bin/e_fm.c:5936 src/bin/e_fm.c:8461 src/bin/e_fm.c:8598
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8951 src/bin/e_fm.c:9088
 #, fuzzy
 msgid "Abort"
 msgstr "關於"
 
-#: src/bin/e_fm.c:7525 src/bin/e_fm.c:7685
+#: src/bin/e_fm.c:7704 src/bin/e_fm.c:7864
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "選取設定"
 
-#: src/bin/e_fm.c:7534 src/bin/e_fm.c:7694
-#: src/modules/fileman/e_mod_config.c:199
+#: src/bin/e_fm.c:7713 src/bin/e_fm.c:7873
+#: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "顯式模式"
 
-#: src/bin/e_fm.c:7541 src/bin/e_fm.c:7701
+#: src/bin/e_fm.c:7720 src/bin/e_fm.c:7880
 msgid "Refresh View"
 msgstr "重新整理"
 
-#: src/bin/e_fm.c:7549 src/bin/e_fm.c:7709
+#: src/bin/e_fm.c:7728 src/bin/e_fm.c:7888
 msgid "Show Hidden Files"
 msgstr "顯示隱藏的檔案"
 
-#: src/bin/e_fm.c:7561 src/bin/e_fm.c:7721
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Remember Ordering"
 msgstr "記住順序"
 
-#: src/bin/e_fm.c:7570 src/bin/e_fm.c:7730
+#: src/bin/e_fm.c:7749 src/bin/e_fm.c:7909
 msgid "Sort Now"
 msgstr "排列檔案"
 
-#: src/bin/e_fm.c:7582 src/bin/e_fm.c:7745
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7924
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "新目錄"
 
-#: src/bin/e_fm.c:7858
+#: src/bin/e_fm.c:8039
 msgid "Rename"
 msgstr "重新命名"
 
-#: src/bin/e_fm.c:7865
+#: src/bin/e_fm.c:8058
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8063
+#, fuzzy
+msgid "Mount"
+msgstr "選單項目"
+
+#: src/bin/e_fm.c:8068
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8078
 msgid "Properties"
 msgstr "屬性"
 
-#: src/bin/e_fm.c:8100 src/bin/e_fm.c:8162
+#: src/bin/e_fm.c:8313 src/bin/e_fm.c:8366
 #, fuzzy
 msgid "Use default"
 msgstr "使用預設值"
 
-#: src/bin/e_fm.c:8135 src/modules/fileman/e_mod_config.c:204
+#: src/bin/e_fm.c:8339 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "對齊圖示"
 
-#: src/bin/e_fm.c:8143 src/modules/fileman/e_mod_config.c:206
+#: src/bin/e_fm.c:8347 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "自訂圖示"
 
-#: src/bin/e_fm.c:8151 src/modules/fileman/e_mod_config.c:214
+#: src/bin/e_fm.c:8355 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "列表"
 
-#: src/bin/e_fm.c:8176
+#: src/bin/e_fm.c:8380
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "圖示大小"
 
-#: src/bin/e_fm.c:8326
+#: src/bin/e_fm.c:8426 src/bin/e_fm.c:8632
+#, fuzzy
+msgid "Set background..."
+msgstr "設定為桌布"
+
+#: src/bin/e_fm.c:8431 src/bin/e_fm.c:8675
+#, fuzzy
+msgid "Set overlay..."
+msgstr "置物架內容物"
+
+#: src/bin/e_fm.c:8530 src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear"
+msgstr "清除"
+
+#: src/bin/e_fm.c:8754
 msgid "Create a new Directory"
 msgstr "建立新目錄"
 
-#: src/bin/e_fm.c:8327
+#: src/bin/e_fm.c:8755
 msgid "New Directory Name:"
 msgstr "新目錄名稱"
 
-#: src/bin/e_fm.c:8386
+#: src/bin/e_fm.c:8809
 #, c-format
 msgid "Rename %s to:"
 msgstr "重新命名 %s 成:"
 
-#: src/bin/e_fm.c:8388
+#: src/bin/e_fm.c:8811
 msgid "Rename File"
 msgstr "重新命名檔案"
 
-#: src/bin/e_fm.c:8460 src/bin/e_fm.c:8597
+#: src/bin/e_fm.c:8950 src/bin/e_fm.c:9087
 #, fuzzy
 msgid "Retry"
 msgstr "重新啟動"
 
-#: src/bin/e_fm.c:8464 src/bin/e_fm.c:8603 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8954 src/bin/e_fm.c:9093 src/modules/wizard/page_030.c:83
 #, fuzzy
 msgid "Error"
 msgstr "執行時錯誤"
 
-#: src/bin/e_fm.c:8467
+#: src/bin/e_fm.c:8957
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8519
+#: src/bin/e_fm.c:9009
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8521
+#: src/bin/e_fm.c:9011
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:8524
+#: src/bin/e_fm.c:9014
 #, fuzzy
 msgid "Warning"
 msgstr "正在啟動"
 
-#: src/bin/e_fm.c:8527
+#: src/bin/e_fm.c:9017
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "您是否確定刪除<br><hilight>%s</hilight>?"
 
-#: src/bin/e_fm.c:8599
+#: src/bin/e_fm.c:9089
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:8600
+#: src/bin/e_fm.c:9090
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:8605
+#: src/bin/e_fm.c:9095
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:8719
+#: src/bin/e_fm.c:9240
 msgid "Confirm Delete"
 msgstr "確定刪除"
 
-#: src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:9245
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "您是否確定刪除<br><hilight>%s</hilight>?"
 
-#: src/bin/e_fm.c:8730
+#: src/bin/e_fm.c:9251
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1314,8 +1405,8 @@ msgid "Preview"
 msgstr "預覽"
 
 #: src/bin/e_fm_prop.c:432
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:179
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "預設值"
 
@@ -1324,7 +1415,7 @@ msgid "Thumbnail"
 msgstr "縮圖"
 
 #: src/bin/e_fm_prop.c:438
-#: src/modules/conf_desklock/e_int_config_desklock.c:361
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "自訂"
 
@@ -1340,70 +1431,70 @@ msgstr "Link 資訊"
 msgid "Select an Image"
 msgstr "選擇一張圖片"
 
-#: src/bin/e_fm_hal.c:186
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:188
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:190
+#: src/bin/e_fm_hal.c:193
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:192
+#: src/bin/e_fm_hal.c:195
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:194
+#: src/bin/e_fm_hal.c:197
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:225
+#: src/bin/e_fm_hal.c:228
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "末知"
 
-#: src/bin/e_fm_hal.c:310
+#: src/bin/e_fm_hal.c:322
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1259 src/modules/gadman/e_mod_gadman.c:657
+#: src/bin/e_gadcon.c:1265 src/modules/gadman/e_mod_gadman.c:657
 msgid "Plain"
 msgstr "一般"
 
-#: src/bin/e_gadcon.c:1268 src/modules/gadman/e_mod_gadman.c:665
+#: src/bin/e_gadcon.c:1274 src/modules/gadman/e_mod_gadman.c:665
 msgid "Inset"
 msgstr "嵌入"
 
-#: src/bin/e_gadcon.c:1277 src/bin/e_int_config_modules.c:41
+#: src/bin/e_gadcon.c:1283 src/bin/e_int_config_modules.c:41
 #: src/modules/gadman/e_mod_gadman.c:701
 msgid "Appearance"
 msgstr "外觀"
 
-#: src/bin/e_gadcon.c:1285
+#: src/bin/e_gadcon.c:1291
 msgid "Automatically scroll contents"
 msgstr "自動捲動內容"
 
-#: src/bin/e_gadcon.c:1292
+#: src/bin/e_gadcon.c:1298
 msgid "Able to be resized"
 msgstr "可改變大小"
 
-#: src/bin/e_gadcon.c:1304 src/modules/gadman/e_mod_gadman.c:736
+#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:736
 msgid "Begin move/resize this gadget"
 msgstr "開始移動或改變這個小工具大小"
 
-#: src/bin/e_gadcon.c:1310 src/modules/gadman/e_mod_gadman.c:742
+#: src/bin/e_gadcon.c:1316 src/modules/gadman/e_mod_gadman.c:742
 msgid "Remove this gadget"
 msgstr "移除這個小工具"
 
-#: src/bin/e_gadcon.c:1743
+#: src/bin/e_gadcon.c:1749
 msgid "Stop move/resize this gadget"
 msgstr "停止移動或改變這個小工具大小"
 
@@ -1452,8 +1543,8 @@ 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:521
-#: src/bin/e_int_shelf_config.c:611
+#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:522
+#: src/bin/e_int_shelf_config.c:612
 #: src/modules/conf_fonts/e_int_config_fonts.c:443
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
@@ -1461,7 +1552,7 @@ msgstr "大小"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
 #: src/bin/e_int_border_menu.c:536 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:559
+#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:560
 msgid "Stacking"
 msgstr "堆疊"
 
@@ -1644,12 +1735,12 @@ msgstr "全螢幕"
 msgid "Window List"
 msgstr "視窗列表"
 
-#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:263
-#: src/modules/pager/e_mod_main.c:2801 src/modules/pager/e_mod_main.c:2808
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2815
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2817
-#: src/modules/pager/e_mod_main.c:2848 src/modules/pager/e_mod_main.c:2849
-#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2851
+#: src/bin/e_int_border_menu.c:1049 src/modules/pager/e_mod_main.c:260
+#: src/modules/pager/e_mod_main.c:2836 src/modules/pager/e_mod_main.c:2843
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2852
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2856
+#: src/modules/pager/e_mod_main.c:2889 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2891 src/modules/pager/e_mod_main.c:2892
 msgid "Pager"
 msgstr "桌面切換器"
 
@@ -1917,11 +2008,11 @@ 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:326
-#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:318
-#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:804
-#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:668
-#: src/modules/connman/e_mod_main.c:1090
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:313
+#: src/modules/ibar/e_mod_main.c:827 src/modules/ibox/e_mod_main.c:318
+#: src/modules/ibox/e_mod_main.c:715 src/modules/pager/e_mod_main.c:814
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1076
 #, fuzzy
 msgid "Settings"
 msgstr "桌面設定"
@@ -1957,8 +2048,8 @@ msgstr "已載入模組"
 msgid "Unload Module"
 msgstr "卸除模組"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:625
-#: src/bin/e_int_config_modules.c:642 src/bin/e_int_config_modules.c:667
+#: 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_gadcon_config.c:121 src/bin/e_int_gadcon_config.c:156
 #: src/bin/e_int_gadcon_config.c:178
 msgid "Description: Unavailable"
@@ -1989,13 +2080,13 @@ msgstr "選取的小工具"
 msgid "Remove Gadget"
 msgstr "移除小工具"
 
-#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:326
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 #, fuzzy
 msgid "Toolbar Settings"
 msgstr "限制設定"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:505
-#: src/bin/e_int_shelf_config.c:571
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:506
+#: src/bin/e_int_shelf_config.c:572
 msgid "Layout"
 msgstr "版面配置"
 
@@ -2080,122 +2171,122 @@ msgstr "(無任何視窗)"
 msgid "No name!!"
 msgstr "無名稱!!"
 
-#: src/bin/e_int_menus.c:1376
+#: src/bin/e_int_menus.c:1375
 msgid "(No Shelves)"
 msgstr "(無任何置物架)"
 
-#: src/bin/e_int_menus.c:1389 src/bin/e_shelf.c:1128
+#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "置物架 #"
 
-#: src/bin/e_int_menus.c:1442
+#: src/bin/e_int_menus.c:1441
 msgid "Add A Shelf"
 msgstr "新增置物架"
 
-#: src/bin/e_int_menus.c:1449
+#: src/bin/e_int_menus.c:1448
 msgid "Delete A Shelf"
 msgstr "移除置物架"
 
-#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1687
+#: src/bin/e_int_shelf_config.c:74 src/bin/e_shelf.c:1698
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "置物架設定"
 
-#: src/bin/e_int_shelf_config.c:523
+#: src/bin/e_int_shelf_config.c:524
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "微小"
 
-#: src/bin/e_int_shelf_config.c:525
+#: src/bin/e_int_shelf_config.c:526
 #: 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:527 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:528 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "中"
 
-#: src/bin/e_int_shelf_config.c:529
+#: src/bin/e_int_shelf_config.c:530
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "大"
 
-#: src/bin/e_int_shelf_config.c:531
+#: src/bin/e_int_shelf_config.c:532
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "巨大"
 
-#: src/bin/e_int_shelf_config.c:537 src/bin/e_int_shelf_config.c:647
+#: src/bin/e_int_shelf_config.c:538 src/bin/e_int_shelf_config.c:648
 #, fuzzy
 msgid "Set Contents..."
 msgstr "置物架內容物"
 
-#: src/bin/e_int_shelf_config.c:561
+#: src/bin/e_int_shelf_config.c:562
 msgid "Above Everything"
 msgstr "最上層顯示"
 
-#: src/bin/e_int_shelf_config.c:563
+#: src/bin/e_int_shelf_config.c:564
 msgid "Below Windows"
 msgstr "視窗下層顯示"
 
-#: src/bin/e_int_shelf_config.c:565
+#: src/bin/e_int_shelf_config.c:566
 msgid "Below Everything"
 msgstr "最下層顯示"
 
-#: src/bin/e_int_shelf_config.c:567
+#: src/bin/e_int_shelf_config.c:568
 msgid "Allow windows to overlap the shelf"
 msgstr "允許視窗覆蓋置物架"
 
-#: src/bin/e_int_shelf_config.c:601
+#: src/bin/e_int_shelf_config.c:602
 msgid "Shrink to Content Size"
 msgstr "縮小到內容物大小"
 
-#: src/bin/e_int_shelf_config.c:612
+#: src/bin/e_int_shelf_config.c:613
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f 像素"
 
-#: src/bin/e_int_shelf_config.c:616
+#: src/bin/e_int_shelf_config.c:617
 #: src/modules/conf_fonts/e_int_config_fonts.c:628
 msgid "Styles"
 msgstr "樣式"
 
-#: src/bin/e_int_shelf_config.c:654
+#: src/bin/e_int_shelf_config.c:655
 msgid "Auto Hide"
 msgstr "自動隱藏"
 
-#: src/bin/e_int_shelf_config.c:655
+#: src/bin/e_int_shelf_config.c:656
 msgid "Auto-hide the shelf"
 msgstr "自動隱藏置物架"
 
-#: src/bin/e_int_shelf_config.c:658
+#: src/bin/e_int_shelf_config.c:659
 msgid "Show on mouse in"
 msgstr "滑鼠移過時顯示"
 
-#: src/bin/e_int_shelf_config.c:662
+#: src/bin/e_int_shelf_config.c:663
 msgid "Show on mouse click"
 msgstr "滑鼠點擊時顯示"
 
-#: src/bin/e_int_shelf_config.c:666
+#: src/bin/e_int_shelf_config.c:667
 msgid "Hide timeout"
 msgstr "隱藏逾時"
 
-#: src/bin/e_int_shelf_config.c:670 src/bin/e_int_shelf_config.c:678
+#: src/bin/e_int_shelf_config.c:671 src/bin/e_int_shelf_config.c:679
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f 秒"
 
-#: src/bin/e_int_shelf_config.c:674
+#: src/bin/e_int_shelf_config.c:675
 msgid "Hide duration"
 msgstr "隱藏持續時間"
 
-#: src/bin/e_int_shelf_config.c:688
+#: src/bin/e_int_shelf_config.c:689
 msgid "Show on all Desktops"
 msgstr "顯示於全部桌面"
 
-#: src/bin/e_int_shelf_config.c:690
+#: src/bin/e_int_shelf_config.c:691
 msgid "Show on specified Desktops"
 msgstr "顯示於指定桌面"
 
@@ -2555,7 +2646,7 @@ msgstr "Enlightenment 無法建立他的拖放系統。"
 
 #: src/bin/e_main.c:867
 #, fuzzy
-msgid "Setup Grab Input Handing"
+msgid "Setup Grab Input Handling"
 msgstr "設定輸入攫取處理系統"
 
 #: src/bin/e_main.c:872
@@ -2743,30 +2834,37 @@ msgstr "Enlightenment %s 模組"
 msgid "Would you like to unload this module?<br>"
 msgstr "您是否要卸除這個模組?<br>"
 
-#: src/bin/e_shelf.c:1258 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: 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:1272 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:1259
+#: src/bin/e_shelf.c:1273
 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:1677 src/bin/e_toolbar.c:316
+#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "停止移動或改變項目大小"
 
-#: src/bin/e_shelf.c:1679 src/bin/e_toolbar.c:318
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "開始移動或改變項目大小"
 
-#: src/bin/e_shelf.c:1692
+#: src/bin/e_shelf.c:1703
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "置物架內容物"
 
-#: src/bin/e_shelf.c:1697
+#: src/bin/e_shelf.c:1708
 msgid "Delete this Shelf"
 msgstr "移除這個置物架"
 
@@ -2931,7 +3029,7 @@ msgstr "關於此佈景主題"
 msgid "Set As Theme"
 msgstr "設定為佈景主題"
 
-#: src/bin/e_toolbar.c:331
+#: src/bin/e_toolbar.c:340
 #, fuzzy
 msgid "Set Toolbar Contents"
 msgstr "設定置物架內容物"
@@ -2949,67 +3047,67 @@ msgstr ""
 "部份視窗仍處於生命周期鎖定中。這意味著 Enlightenment 不允許自己退出,<br>除非"
 "這些視窗被關閉,或者移除生命周期鎖定。<br>"
 
-#: src/bin/e_utils.c:805
+#: src/bin/e_utils.c:806
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f 位元組"
 
-#: src/bin/e_utils.c:809
+#: src/bin/e_utils.c:810
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:813
+#: src/bin/e_utils.c:814
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:817
+#: src/bin/e_utils.c:818
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:837
+#: src/bin/e_utils.c:838
 #, c-format
 msgid "In the Future"
 msgstr "末來"
 
-#: src/bin/e_utils.c:842
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "In the last Minute"
 msgstr "一分鐘內"
 
-#: src/bin/e_utils.c:844
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Years ago"
 msgstr "%li 年前"
 
-#: src/bin/e_utils.c:846
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Months ago"
 msgstr "%li 個月前"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li 星期前"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Days ago"
 msgstr "%li 天前"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li 小時前"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:855
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li 分鐘前"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:861
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
 #: src/modules/conf_profiles/e_int_config_profiles.c:251
@@ -3021,7 +3119,7 @@ msgstr "末知"
 #: src/modules/conf_applications/e_int_config_apps.c:243
 #: src/modules/conf_profiles/e_int_config_profiles.c:121
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
-#: src/modules/ibar/e_mod_config.c:109
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr "新增"
 
@@ -3044,7 +3142,7 @@ msgid "Add to Favorites"
 msgstr "加入「我的最愛」選單"
 
 #: src/bin/e_widget_fsel.c:299
-#: src/modules/conf_desklock/e_int_config_desklock.c:247
+#: 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
@@ -3165,6 +3263,7 @@ msgid "Internal"
 msgstr "內部"
 
 #: src/modules/battery/e_mod_config.c:164
+#: src/modules/fileman/e_mod_config.c:280
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
@@ -3177,25 +3276,25 @@ msgstr ""
 msgid "Battery"
 msgstr "電池"
 
-#: src/modules/battery/e_mod_main.c:845
+#: src/modules/battery/e_mod_main.c:844
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "電量不足時發出警告"
 
-#: src/modules/battery/e_mod_main.c:847
+#: src/modules/battery/e_mod_main.c:846
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:922
+#: src/modules/battery/e_mod_main.c:921
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:993 src/modules/battery/e_mod_main.c:995
-#: src/modules/battery/e_mod_main.c:1002 src/modules/battery/e_mod_main.c:1004
+#: 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
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1094
+#: src/modules/battery/e_mod_main.c:1093
 #, fuzzy
 msgid "Battery Meter"
 msgstr "電池"
@@ -3205,11 +3304,26 @@ msgid "Clock"
 msgstr "時鐘"
 
 #: src/modules/conf/e_mod_main.c:139 src/modules/conf/e_mod_main.c:143
-#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:215
+#: src/modules/conf/e_mod_main.c:163 src/modules/conf/e_mod_main.c:264
 #, fuzzy
 msgid "Settings Panel"
 msgstr "桌面設定"
 
+#: src/modules/conf/e_mod_main.c:234
+#, fuzzy
+msgid "Presentation"
+msgstr "桌面設定"
+
+#: src/modules/conf/e_mod_main.c:241
+#, fuzzy
+msgid "Offline"
+msgstr "關機時間"
+
+#: src/modules/conf/e_mod_main.c:269
+#, fuzzy
+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"
@@ -3232,7 +3346,7 @@ msgid "Restart Applications"
 msgstr "自動重新啟動之應用程式"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1659
+#: src/modules/fileman/e_fwin.c:1923
 msgid "All Applications"
 msgstr "全部應用程式"
 
@@ -3593,42 +3707,55 @@ msgstr "選取"
 msgid "Desk"
 msgstr "桌面"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:85
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
 msgstr "螢幕鎖定設定"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:170
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
 msgstr "自動鎖定"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:172
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
 #, fuzzy
 msgid "Lock when Enlightenment starts"
 msgstr "使用 Enlightenment 游標"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:176
+#: 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:180
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+#, fuzzy
+msgid "Time after screensaver activated"
+msgstr "在此時間後變換 X 螢幕保護程式"
+
+#: 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:184
+#: 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:187
-#: src/modules/conf_dpms/e_int_config_dpms.c:209
-#: src/modules/conf_dpms/e_int_config_dpms.c:221
-#: src/modules/conf_dpms/e_int_config_dpms.c:233
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:125
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:162
+#: 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:240
+#: 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
@@ -3639,27 +3766,27 @@ msgstr "%1.0f 分鐘"
 msgid "Personal"
 msgstr "個人"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:330
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
 msgstr "登入方塊設定"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:333
+#: 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:337
+#: 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:341
+#: 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:345
-#: src/modules/conf_desks/e_int_config_desks.c:232
-#: src/modules/conf_desks/e_int_config_desks.c:236
-#: src/modules/conf_desks/e_int_config_desks.c:269
-#: src/modules/conf_desks/e_int_config_desks.c:273
+#: 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
@@ -3668,29 +3795,49 @@ msgstr "顯示於螢幕區域 #:"
 #: 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/fileman/e_mod_config.c:220
+#: 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:353
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
 msgstr "桌布模式"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:355
+#: 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:358
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "佈景主題桌布"
 
-#: src/modules/conf_desklock/e_int_config_desklock.c:371
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+#, fuzzy
+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:372
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr "使用自訂螢幕鎖定"
 
@@ -3698,59 +3845,74 @@ msgstr "使用自訂螢幕鎖定"
 msgid "Screen Lock"
 msgstr "螢幕鎖定"
 
-#: src/modules/conf_desks/e_int_config_desks.c:57
-#: src/modules/pager/e_mod_main.c:811
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:821
 msgid "Virtual Desktops Settings"
 msgstr "虛擬桌面設定"
 
-#: src/modules/conf_desks/e_int_config_desks.c:224
+#: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
 msgstr "桌面數目"
 
-#: src/modules/conf_desks/e_int_config_desks.c:243
-#: src/modules/conf_desks/e_int_config_desks.c:280
+#: 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:244
+#: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr "切換時以動畫方式進行"
 
-#: src/modules/conf_desks/e_int_config_desks.c:262
+#: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
 msgstr "桌面"
 
-#: src/modules/conf_desks/e_int_config_desks.c:281
+#: 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:283
+#: 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:287
+#: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
 msgstr "切換動畫"
 
-#: src/modules/conf_desks/e_int_config_desks.c:289
+#: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr "關閉"
 
-#: src/modules/conf_desks/e_int_config_desks.c:291
+#: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
 msgstr "窗格"
 
-#: src/modules/conf_desks/e_int_config_desks.c:293
+#: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
 msgstr "縮放"
 
-#: src/modules/conf_desks/e_int_config_desks.c:295
+#: 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
+#, fuzzy
+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 "虛擬桌面"
@@ -3766,8 +3928,8 @@ msgstr "對話框設定"
 #: 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:120
-#: src/modules/pager/e_mod_config.c:160 src/modules/mixer/conf_gadget.c:193
+#: src/modules/ibox/e_mod_config.c:100 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 "一般設定"
@@ -3940,24 +4102,24 @@ msgstr "目前的顯示伺服器<br>沒有 DPMS extension。"
 msgid "Display Power Management Settings"
 msgstr "顯示器電源管理設定"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:199
+#: 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:203
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
 #, fuzzy
 msgid "Timers"
 msgstr "計時器"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:205
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr "待命時間"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:217
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
 msgstr "待機時間"
 
-#: src/modules/conf_dpms/e_int_config_dpms.c:229
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr "關機時間"
 
@@ -4543,7 +4705,7 @@ msgid "%1.0f pixels"
 msgstr "%1.0f 像素"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-msgid "Threshold for for applying drag momentum"
+msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
@@ -4763,7 +4925,7 @@ msgid "Select an Edj File"
 msgstr "選擇 Edj 檔"
 
 #: 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:387
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
 msgstr "檔案"
 
@@ -5123,55 +5285,50 @@ msgstr "最大大小"
 msgid "Scaling"
 msgstr "堆疊"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:53
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
 msgstr "螢幕保護程式設定"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:118
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:155
+#: 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 螢幕保護程式"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:121
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:158
+#: 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:123
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:160
+#: 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 螢幕保護程式"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:168
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
 msgstr "在此時間後變換 X 螢幕保護程式"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:170
-#, c-format
-msgid "%1.0f seconds"
-msgstr "%1.0f 秒"
-
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:177
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
 msgstr "空白"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:183
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
 msgstr "偏好的"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:187
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
 msgstr "非偏好的"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:193
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
 msgstr "Exposure 事件"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:199
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
 msgstr "允許"
 
-#: src/modules/conf_screensaver/e_int_config_screensaver.c:203
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr "不允許"
 
@@ -5184,7 +5341,7 @@ msgid "Configured Shelves"
 msgstr "已配置的置物器"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
-#: src/modules/ibar/e_mod_config.c:113
+#: src/modules/ibar/e_mod_config.c:114
 #, fuzzy
 msgid "Setup"
 msgstr "設定 FM"
@@ -5230,10 +5387,6 @@ msgstr "佈景主題分類"
 msgid "Assign"
 msgstr "指定"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1025
-msgid "Clear"
-msgstr "清除"
-
 #: src/modules/conf_theme/e_int_config_theme.c:1028
 msgid "Clear All"
 msgstr "全部清除"
@@ -6103,30 +6256,21 @@ msgstr "視窗陰影"
 msgid "Run Command Dialog"
 msgstr "執行命令對話框"
 
-#: src/modules/fileman/e_mod_main.c:230
-#, fuzzy
-msgid "Mount error"
-msgstr "執行錯誤"
-
-#: src/modules/fileman/e_mod_main.c:230
-msgid "Mount of device failed"
-msgstr ""
-
-#: src/modules/fileman/e_mod_main.c:320 src/modules/illume/e_mod_win.c:180
+#: 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:332
+#: src/modules/fileman/e_mod_main.c:322
 #, fuzzy
 msgid "Favorites"
 msgstr "「我的最愛」選單"
 
-#: src/modules/fileman/e_mod_main.c:344
+#: src/modules/fileman/e_mod_main.c:334
 #, fuzzy
 msgid "Root"
 msgstr "重新開機"
 
-#: src/modules/fileman/e_mod_main.c:441
+#: src/modules/fileman/e_mod_main.c:431
 #, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
@@ -6142,7 +6286,7 @@ msgstr ""
 "需要部份舊組態資料未能提供的功能。<br>新的組態會加入這些功能。您現在可以重新"
 "配置您設定。<br>抱歉打斷您的配置。<br>"
 
-#: src/modules/fileman/e_mod_main.c:454
+#: 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 "
@@ -6156,99 +6300,107 @@ msgstr ""
 "這是不好的,所以為防萬一,您的組態檔已被<br>恢復成預設值。很抱歉為您帶來不"
 "便。<br>"
 
-#: src/modules/fileman/e_mod_main.c:523
+#: src/modules/fileman/e_mod_main.c:513
 #, fuzzy
 msgid "Fileman Settings Updated"
 msgstr "檔案管理員設定"
 
-#: src/modules/fileman/e_mod_config.c:93
+#: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
 msgstr "檔案管理員設定"
 
-#: src/modules/fileman/e_mod_config.c:218
+#: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
 msgstr "圖示大小"
 
-#: src/modules/fileman/e_mod_config.c:224
+#: src/modules/fileman/e_mod_config.c:233
 #, fuzzy
 msgid "View"
 msgstr "顯式模式"
 
-#: src/modules/fileman/e_mod_config.c:227
+#: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
 msgstr "使用同一視窗開啟目錄"
 
-#: src/modules/fileman/e_mod_config.c:231
+#: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "優先排序目錄"
 
-#: src/modules/fileman/e_mod_config.c:234
+#: src/modules/fileman/e_mod_config.c:243
 #, fuzzy
 msgid "Case Sensitive"
 msgstr "基本大小"
 
-#: src/modules/fileman/e_mod_config.c:238
+#: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
 msgstr "使用單擊"
 
-#: src/modules/fileman/e_mod_config.c:241
+#: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
-#: src/modules/fileman/e_mod_config.c:245
+#: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
 msgstr "顯示圖示副檔名"
 
-#: src/modules/fileman/e_mod_config.c:248
+#: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr "顯示完整路徑"
 
-#: src/modules/fileman/e_mod_config.c:251
+#: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
 msgstr "顯示桌面圖示"
 
-#: src/modules/fileman/e_mod_config.c:254
+#: src/modules/fileman/e_mod_config.c:263
 #, fuzzy
 msgid "Show Toolbar"
 msgstr "陰影顏色"
 
-#: src/modules/fileman/e_mod_config.c:257
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:729
+msgid "Behavior"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:270
 #, fuzzy
 msgid "Show HAL icons on desktop"
 msgstr "顯示於全部桌面"
 
-#: src/modules/fileman/e_mod_config.c:261
-#: src/modules/gadman/e_mod_gadman.c:729
-msgid "Behavior"
+#: 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:1187
+#: src/modules/fileman/e_fwin.c:1462
 msgid "Go to Parent Directory"
 msgstr "到上一層目錄"
 
-#: src/modules/fileman/e_fwin.c:1249
+#: src/modules/fileman/e_fwin.c:1524
 #, fuzzy
 msgid "Other application..."
 msgstr "應用程式"
 
-#: src/modules/fileman/e_fwin.c:1268 src/modules/fileman/e_fwin.c:1610
+#: src/modules/fileman/e_fwin.c:1543 src/modules/fileman/e_fwin.c:1874
 msgid "Open"
 msgstr "開啟"
 
-#: src/modules/fileman/e_fwin.c:1273 src/modules/fileman/e_fwin.c:1608
+#: src/modules/fileman/e_fwin.c:1548 src/modules/fileman/e_fwin.c:1872
 msgid "Open with..."
 msgstr "以特定程式開啟..."
 
-#: src/modules/fileman/e_fwin.c:1628
+#: src/modules/fileman/e_fwin.c:1892
 #, fuzzy
 msgid "Known Applications"
 msgstr "應用程式"
 
-#: src/modules/fileman/e_fwin.c:1638
+#: src/modules/fileman/e_fwin.c:1902
 msgid "Specific Applications"
 msgstr "特定應用程式"
 
-#: src/modules/fileman/e_fwin.c:1680
+#: src/modules/fileman/e_fwin.c:1944
 #, fuzzy
 msgid "Custom Command"
 msgstr "執行指令"
@@ -6349,40 +6501,40 @@ msgstr "上一個視窗"
 msgid "Select a window"
 msgstr "選擇一個視窗"
 
-#: src/modules/ibar/e_mod_config.c:55
+#: src/modules/ibar/e_mod_config.c:56
 #, fuzzy
 msgid "IBar Settings"
 msgstr "限制設定"
 
-#: src/modules/ibar/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr "選取的 Bar source"
 
-#: src/modules/ibar/e_mod_config.c:122
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
 msgstr "圖示標籤"
 
-#: src/modules/ibar/e_mod_config.c:123 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
 msgstr "顯示圖示標籤"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
 msgstr "顯示程式名稱"
 
-#: src/modules/ibar/e_mod_config.c:133
+#: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
 msgstr "顯示程式註解"
 
-#: src/modules/ibar/e_mod_config.c:137
+#: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
 msgstr "顯示程式通用名稱"
 
-#: src/modules/ibar/e_mod_config.c:167
+#: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
 msgstr "新增 IBar source"
 
-#: src/modules/ibar/e_mod_config.c:168
+#: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
 msgstr "幫這個新 source 命名:"
 
@@ -6397,29 +6549,29 @@ msgstr "您要求刪除「%s」。<br><br>您是否確定刪除此 bar source?
 msgid "Are you sure you want to delete this bar source?"
 msgstr "您是否確定刪除此 bar source?"
 
-#: src/modules/ibar/e_mod_main.c:220
+#: src/modules/ibar/e_mod_main.c:214
 msgid "IBar"
 msgstr "IBar"
 
-#: src/modules/ibar/e_mod_main.c:794
+#: src/modules/ibar/e_mod_main.c:796
 msgid "Change Icon Properties"
 msgstr "改變圖示屬性"
 
-#: src/modules/ibar/e_mod_main.c:799
+#: src/modules/ibar/e_mod_main.c:801
 msgid "Remove Icon"
 msgstr "移除圖示"
 
-#: src/modules/ibar/e_mod_main.c:809
+#: src/modules/ibar/e_mod_main.c:811
 #, fuzzy
 msgid "Add An Icon"
 msgstr "新增應用程式"
 
-#: src/modules/ibar/e_mod_main.c:816
+#: src/modules/ibar/e_mod_main.c:818
 #, fuzzy
 msgid "Create New Icon"
 msgstr "建立圖示"
 
-#: src/modules/ibar/e_mod_main.c:832
+#: src/modules/ibar/e_mod_main.c:834
 msgid "Add Application"
 msgstr "新增應用程式"
 
@@ -6473,99 +6625,99 @@ msgstr "IBox"
 msgid "Pager Settings"
 msgstr "桌面切換器設定"
 
-#: src/modules/pager/e_mod_config.c:121 src/modules/pager/e_mod_config.c:161
+#: 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:124 src/modules/pager/e_mod_config.c:164
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 #, fuzzy
 msgid "Show desktop names"
 msgstr "顯示桌面圖示"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
 #, fuzzy
 msgid "Popup Settings"
 msgstr "桌面切換器彈出訊息設定"
 
-#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:205
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
 #, fuzzy
 msgid "Show popup on desktop change"
 msgstr "切換桌面時顯示彈出訊息"
 
-#: src/modules/pager/e_mod_config.c:133
+#: src/modules/pager/e_mod_config.c:132
 #, fuzzy
 msgid "Show popup for urgent windows"
 msgstr "在緊急視窗上顯示彈出訊息"
 
-#: src/modules/pager/e_mod_config.c:168
+#: src/modules/pager/e_mod_config.c:167
 msgid "Select and Slide button"
 msgstr "選取與滑動按鍵"
 
-#: src/modules/pager/e_mod_config.c:170 src/modules/pager/e_mod_config.c:177
-#: src/modules/pager/e_mod_config.c:184 src/modules/pager/e_mod_config.c:402
-#: src/modules/pager/e_mod_config.c:407 src/modules/pager/e_mod_config.c:412
+#: 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
 #, c-format
 msgid "Click to set"
 msgstr "點擊以設定"
 
-#: src/modules/pager/e_mod_config.c:175
+#: src/modules/pager/e_mod_config.c:174
 #, fuzzy
 msgid "Drag and Drop button"
 msgstr "拖放按鍵 (保持相對位置)"
 
-#: src/modules/pager/e_mod_config.c:182
+#: src/modules/pager/e_mod_config.c:181
 #, fuzzy
 msgid "Drag whole desktop"
 msgstr "虛擬桌面"
 
-#: src/modules/pager/e_mod_config.c:191
+#: src/modules/pager/e_mod_config.c:190
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:193 src/modules/pager/e_mod_config.c:199
-#: src/modules/pager/e_mod_config.c:212
+#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
+#: src/modules/pager/e_mod_config.c:211
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f 像素"
 
-#: src/modules/pager/e_mod_config.c:197
+#: src/modules/pager/e_mod_config.c:196
 msgid "Resistance to dragging"
 msgstr "拖曳阻力"
 
-#: src/modules/pager/e_mod_config.c:208
+#: src/modules/pager/e_mod_config.c:207
 #, fuzzy
 msgid "Popup pager height"
 msgstr "彈出訊息速度"
 
-#: src/modules/pager/e_mod_config.c:217 src/modules/pager/e_mod_config.c:237
+#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
 #, fuzzy
 msgid "Popup speed"
 msgstr "彈出訊息速度"
 
-#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:239
+#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f 秒"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:229
 #, fuzzy
 msgid "Urgent Window Settings"
 msgstr "視窗列表設定"
 
-#: src/modules/pager/e_mod_config.c:231
+#: src/modules/pager/e_mod_config.c:230
 #, fuzzy
 msgid "Show popup on urgent window"
 msgstr "在緊急視窗上顯示彈出訊息"
 
-#: src/modules/pager/e_mod_config.c:234
+#: src/modules/pager/e_mod_config.c:233
 msgid "Popup on urgent window sticks on the screen"
 msgstr "將緊急視窗上的彈出訊息相黏於螢幕上"
 
-#: src/modules/pager/e_mod_config.c:287
+#: src/modules/pager/e_mod_config.c:286
 msgid "Pager Button Grab"
 msgstr "桌面切換器按鍵擷取"
 
-#: src/modules/pager/e_mod_config.c:289
+#: src/modules/pager/e_mod_config.c:288
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6573,12 +6725,12 @@ msgstr ""
 "請按下任一滑鼠鍵。<br>按下 <hilight>Escape</hilight> 以放棄。<br>或按下 "
 "<hilight>Del</hilight> 以重設此按鍵。"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:343
 #, fuzzy
 msgid "Attetion"
 msgstr "動作"
 
-#: src/modules/pager/e_mod_config.c:345
+#: src/modules/pager/e_mod_config.c:344
 #, fuzzy
 msgid ""
 "You cannot use the right mouse button in the<br>shelf for this as it is "
@@ -6586,33 +6738,33 @@ msgid ""
 "works in the Popup"
 msgstr "您不能使用滑鼠右鍵。<br>本程式內部已將滑鼠右鍵用於彈出式選單。"
 
-#: src/modules/pager/e_mod_config.c:404 src/modules/pager/e_mod_config.c:409
-#: src/modules/pager/e_mod_config.c:414
+#: 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 "Button %i"
 msgstr "按鈕 %i"
 
-#: src/modules/pager/e_mod_main.c:2808
+#: src/modules/pager/e_mod_main.c:2843
 #, fuzzy
 msgid "Show Pager Popup"
 msgstr "桌面切換器彈出訊息設定"
 
-#: src/modules/pager/e_mod_main.c:2814 src/modules/pager/e_mod_main.c:2848
+#: src/modules/pager/e_mod_main.c:2850 src/modules/pager/e_mod_main.c:2889
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "切換到右方桌面"
 
-#: src/modules/pager/e_mod_main.c:2815 src/modules/pager/e_mod_main.c:2849
+#: src/modules/pager/e_mod_main.c:2852 src/modules/pager/e_mod_main.c:2890
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "切換到左方桌面"
 
-#: src/modules/pager/e_mod_main.c:2816 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2854 src/modules/pager/e_mod_main.c:2891
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "切換到上方桌面"
 
-#: src/modules/pager/e_mod_main.c:2817 src/modules/pager/e_mod_main.c:2851
+#: src/modules/pager/e_mod_main.c:2856 src/modules/pager/e_mod_main.c:2892
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "切換到下方桌面"
@@ -6882,7 +7034,7 @@ msgstr ""
 msgid "Right:"
 msgstr "亮"
 
-#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:603
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 #, fuzzy
 msgid "Mute"
 msgstr "選單項目"
@@ -6929,12 +7081,12 @@ msgstr "設定模組"
 msgid "Mixer Settings Updated"
 msgstr "檔案管理員組態已經更新"
 
-#: src/modules/mixer/e_mod_main.c:613
+#: src/modules/mixer/e_mod_main.c:602
 #, fuzzy
 msgid "Controls"
 msgstr "設定系統控制"
 
-#: src/modules/mixer/e_mod_main.c:1160
+#: src/modules/mixer/e_mod_main.c:1154
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
@@ -6972,6 +7124,19 @@ msgstr "特定應用程式"
 msgid "Networks"
 msgstr ""
 
+#: src/modules/systray/e_mod_main.c:871
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:872
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1070
+#, fuzzy
+msgid "Systray"
+msgstr "系統"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "設定虛擬桌面"
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 4f53ef0..86f70d7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -232,6 +232,7 @@ 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@
@@ -244,6 +245,7 @@ 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@
diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in
index 95c7324..caa4c88 100644
--- a/src/bin/Makefile.in
+++ b/src/bin/Makefile.in
@@ -375,6 +375,7 @@ 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@
@@ -387,6 +388,7 @@ 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@
diff --git a/src/bin/e.h b/src/bin/e.h
index 7e67299..c5c97d0 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -45,6 +45,10 @@
 #include <errno.h>
 #include <signal.h>
 
+#ifndef _POSIX_HOST_NAME_MAX
+#define _POSIX_HOST_NAME_MAX 255
+#endif
+
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index d150c03..0378bbf 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -841,11 +841,9 @@ ACT_FN_GO(window_move_to_center)
      }
 
    E_Border *bd;
-   bd = (E_Border *)obj;
-
    int x, y;
-   x = (bd->zone->w - bd->w) / 2;
-   y = (bd->zone->h - bd->h) / 2;
+   bd = (E_Border *)obj;
+   e_border_center_pos_get(bd, &x, &y);
 
    if ((x != bd->x) || (y != bd->y))
      {
@@ -853,8 +851,8 @@ ACT_FN_GO(window_move_to_center)
 
        if (e_config->focus_policy != E_FOCUS_CLICK)
          ecore_x_pointer_warp(bd->zone->container->win,
-			    bd->x + (bd->w / 2),
-			    bd->y + (bd->h / 2));
+			    x + (bd->w / 2),
+			    y + (bd->h / 2));
      }
 }
 
@@ -1803,6 +1801,22 @@ ACT_FN_GO(halt_now)
 }
 
 /***************************************************************************/
+ACT_FN_GO(mode_presentation_toggle)
+{
+   e_config->mode.presentation = !e_config->mode.presentation;
+   e_config_mode_changed();
+   e_config_save_queue();
+}
+
+/***************************************************************************/
+ACT_FN_GO(mode_offline_toggle)
+{
+   e_config->mode.offline = !e_config->mode.offline;
+   e_config_mode_changed();
+   e_config_save_queue();
+}
+
+/***************************************************************************/
 static E_Dialog *logout_dialog = NULL;
 
 static void
@@ -2789,6 +2803,16 @@ e_actions_init(void)
    e_action_predef_name_set(_("Enlightenment"), _("Exit Now"), 
 			    "exit_now", NULL, NULL, 0);
 
+   ACT_GO(mode_presentation_toggle);
+   e_action_predef_name_set(_("Enlightenment : Mode"),
+			    _("Presentation Mode Toggle"),
+			    "mode_presentation_toggle", NULL, NULL, 0);
+
+   ACT_GO(mode_offline_toggle);
+   e_action_predef_name_set(_("Enlightenment : Mode"),
+			    _("Offline Mode Toggle"),
+			    "mode_offline_toggle", NULL, NULL, 0);
+
    ACT_GO(logout);
    e_action_predef_name_set(_("System"), _("Log Out"), "logout", 
 			    NULL, NULL, 0);
diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index b196e61..ab05368 100644
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -6,11 +6,27 @@
 /* local subsystem functions */
 static void _e_bg_signal(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _e_bg_event_bg_update_free(void *data, void *event);
+static int  _e_bg_slide_animator(void *data);
 
 /* local subsystem globals */
 EAPI int E_EVENT_BG_UPDATE = 0;
 static E_Fm2_Mime_Handler *bg_hdl = NULL;
 
+typedef struct _E_Bg_Anim_Params E_Bg_Anim_Params;
+struct _E_Bg_Anim_Params 
+{
+   E_Zone *zone;
+   double start_time;
+   int start_x;
+   int start_y;
+   int end_x;
+   int end_y;
+
+   struct {
+	Eina_Bool x, y;
+   } freedom;
+};
+
 /* externally accessible functions */
 EAPI int 
 e_bg_init(void)
@@ -203,6 +219,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
    else if (transition == E_BG_TRANSITION_DESK) trans = e_config->transition_desk;
    else if (transition == E_BG_TRANSITION_CHANGE) trans = e_config->transition_change;
    if ((!trans) || (!trans[0])) transition = E_BG_TRANSITION_NONE;
+   if (e_config->desk_flip_pan_bg) transition = E_BG_TRANSITION_NONE;
 
    desk = e_desk_current_get(zone);
    if (desk)
@@ -265,6 +282,30 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
      }
    evas_object_clip_set(o, zone->bg_clip_object);
    evas_object_show(o);
+   if (e_config->desk_flip_pan_bg)
+     {
+	int x = 0, y = 0;
+
+	o = zone->bg_scrollframe;
+	if (!o)
+	  {
+	     o = e_scrollframe_add(zone->container->bg_evas);
+	     zone->bg_scrollframe = o;
+	     e_scrollframe_custom_theme_set(o, "base/theme/background",
+					    "e/desktop/background/scrollframe");
+	     e_scrollframe_policy_set(o, E_SCROLLFRAME_POLICY_OFF, E_SCROLLFRAME_POLICY_OFF);
+	     e_scrollframe_child_pos_set(o, 0, 0);
+	     evas_object_show(o);
+	  }
+	e_scrollframe_child_set(o, zone->bg_object);
+	if (desk)
+	  {
+	     x = desk->x;
+	     y = desk->y;
+	  }
+	e_bg_zone_slide(zone, x, y);
+	return;
+     }
    
    if (transition != E_BG_TRANSITION_NONE)
      {
@@ -281,6 +322,71 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
 }
 
 EAPI void
+e_bg_zone_slide(E_Zone *zone, int prev_x, int prev_y)
+{
+   Evas_Object *o;
+   E_Desk *desk;
+   Evas_Coord w, h, maxw, maxh, step_w, step_h;
+   Ecore_Animator *anim;
+   E_Bg_Anim_Params *params;
+   Evas_Coord vw, vh, px, py;
+   int fx, fy;
+   const void *data;
+   
+   desk = e_desk_current_get(zone);
+   edje_object_size_max_get(zone->bg_object, &w, &h);
+   maxw = zone->w * zone->desk_x_count;
+   maxh = zone->h * zone->desk_y_count;
+   if (!w) w = maxw;
+   if (!h) h = maxh;
+   evas_object_resize(zone->bg_object, w, h);
+   if (zone->desk_x_count > 1)
+     step_w = ((double) (w - zone->w)) / (zone->desk_x_count - 1);
+   else step_w = 0;
+   if (zone->desk_y_count > 1)
+     step_h = ((double) (h - zone->h)) / (zone->desk_y_count - 1);
+   else step_h = 0;
+
+   o = zone->bg_scrollframe;
+   evas_object_move(o, zone->x, zone->y);
+   evas_object_resize(o, zone->w, zone->h);
+   evas_object_layer_set(o, -1);
+   evas_object_clip_set(o, zone->bg_clip_object);
+
+   data = edje_object_data_get(zone->bg_object, "directional_freedom");
+   e_scrollframe_child_viewport_size_get(o, &vw, &vh);
+   e_scrollframe_child_pos_get(o, &px, &py);
+   params = evas_object_data_get(zone->bg_object, "switch_animator_params");
+   if (!params)
+     params = E_NEW(E_Bg_Anim_Params, 1);
+   params->zone = zone;
+   params->start_x = px;
+   params->start_y = py;
+   params->end_x = desk->x * step_w * e_config->desk_flip_pan_x_axis_factor;
+   params->end_y = desk->y * step_h * e_config->desk_flip_pan_y_axis_factor;
+   params->start_time = 0.0;
+   if ((data) && (sscanf(data, "%d %d", &fx, &fy) == 2))
+     {
+	if (fx)
+	  {
+	     params->freedom.x = EINA_TRUE;
+	     params->start_x = prev_x * step_w * e_config->desk_flip_pan_x_axis_factor;
+	  }
+	if (fy)
+	  {
+	     params->freedom.y = EINA_TRUE;
+	     params->start_y = prev_y * step_h * e_config->desk_flip_pan_y_axis_factor;
+	  }
+     }
+
+   anim = evas_object_data_get(zone->bg_object, "switch_animator");
+   if (anim) ecore_animator_del(anim);
+   anim = ecore_animator_add(_e_bg_slide_animator, params);
+   evas_object_data_set(zone->bg_object, "switch_animator", anim);
+   evas_object_data_set(zone->bg_object, "switch_animator_params", params);
+}
+
+EAPI void
 e_bg_default_set(char *file)
 {
    E_Event_Bg_Update *ev;
@@ -440,3 +546,74 @@ _e_bg_event_bg_update_free(void *data, void *event)
 {
    free(event);
 }
+
+static int
+_e_bg_slide_animator(void *data)
+{
+   E_Bg_Anim_Params *params;
+   E_Zone *zone;
+   Evas_Object *o;
+   E_Desk *desk;
+   double st;
+   double t, dt, spd;
+   Evas_Coord px, py, rx, ry, bw, bh, panw, panh;
+   Edje_Message_Int_Set *msg;
+
+   params = data;
+   zone = params->zone;
+   desk = e_desk_current_get(zone);
+   t = ecore_loop_time_get();
+   dt = -1.0;
+   spd = e_config->desk_flip_animate_time;
+
+   o = zone->bg_scrollframe;
+   if (!params->start_time)
+     st = params->start_time = t;
+   else
+     st = params->start_time;
+
+   dt = (t - st) / spd;
+   if (dt > 1.0) dt = 1.0;
+   dt = 1.0 - dt;
+   dt *= dt; /* decelerate - could be a better hack */
+
+   if (params->end_x > params->start_x)
+     rx = params->start_x + (params->end_x - params->start_x) * (1.0 - dt);
+   else
+     rx = params->end_x + (params->start_x - params->end_x) * dt;
+   if (params->freedom.x) px = zone->x;
+   else px = rx;
+
+   if (params->end_y > params->start_y)
+     ry = params->start_y + (params->end_y - params->start_y) * (1.0 - dt);
+   else
+     ry = params->end_y + (params->start_y - params->end_y) * dt;
+   if (params->freedom.y) py = zone->y;
+   else py = ry;
+
+   e_scrollframe_child_pos_set(o, px, py);
+
+   evas_object_geometry_get(zone->bg_object, NULL, NULL, &bw, &bh);
+   panw = bw - zone->w;
+   if (panw < 0) panw = 0;
+   panh = bh - zone->h;
+   if (panh < 0) panh = 0;
+   msg = alloca(sizeof(Edje_Message_Int_Set) + (5 * sizeof(int)));
+   msg->count = 6;
+   msg->val[0] = rx;
+   msg->val[1] = ry;
+   msg->val[2] = panw;
+   msg->val[3] = panh;
+   msg->val[4] = bw;
+   msg->val[5] = bh;
+   edje_object_message_send(zone->bg_object, EDJE_MESSAGE_INT_SET, 0, msg);
+
+   if (dt <= 0.0)
+     {
+	evas_object_data_del(zone->bg_object, "switch_animator");
+	evas_object_data_del(zone->bg_object, "switch_animator_params");
+	E_FREE(params);
+	return 0;
+     }
+   return 1;
+}
diff --git a/src/bin/e_bg.h b/src/bin/e_bg.h
index f30823b..9323c70 100644
--- a/src/bin/e_bg.h
+++ b/src/bin/e_bg.h
@@ -32,6 +32,7 @@ EAPI int e_bg_shutdown(void);
 EAPI const E_Config_Desktop_Background *e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y);
 EAPI const char *e_bg_file_get(int container_num, int zone_num,  int desk_x, int desk_y);
 EAPI void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition);
+EAPI void e_bg_zone_slide(E_Zone *zone, int prev_x, int prev_y);
 EAPI void e_bg_add(int container, int zone, int desk_x, int desk_y, char *file);
 EAPI void e_bg_del(int container, int zone, int desk_x, int desk_y);
 EAPI void e_bg_default_set(char *file);
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 108a3f9..2f2dfa7 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -572,35 +572,37 @@ e_border_res_change_geometry_restore(E_Border *bd)
      }
    else
      {
-	int x, y, w, h;
+	int x, y, w, h, zx, zy, zw, zh;
 	
 	bd->saved.x = bd->pre_res_change.saved.x;
 	bd->saved.y = bd->pre_res_change.saved.y;
 	bd->saved.w = bd->pre_res_change.saved.w;
 	bd->saved.h = bd->pre_res_change.saved.h;
+
+	e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
+
+	if (bd->saved.w > zw)
+	  bd->saved.w = zw;
+	if ((bd->saved.x + bd->saved.w) > (zx + zw))
+	  bd->saved.x = zx + zw - bd->saved.w;
 	
-	if (bd->saved.w > bd->zone->w)
-	  bd->saved.w = bd->zone->w;
-	if ((bd->saved.x + bd->saved.w) > (bd->zone->x + bd->zone->w))
-	  bd->saved.x = bd->zone->x + bd->zone->w - bd->saved.w;
-	
-	if (bd->saved.h > bd->zone->h)
-	  bd->saved.h = bd->zone->h;
-	if ((bd->saved.y + bd->saved.h) > (bd->zone->y + bd->zone->h))
-	  bd->saved.y = bd->zone->y + bd->zone->h - bd->saved.h;
+	if (bd->saved.h > zh)
+	  bd->saved.h = zh;
+	if ((bd->saved.y + bd->saved.h) > (zy + zh))
+	  bd->saved.y = zy + zh - bd->saved.h;
 	
 	x = bd->pre_res_change.x;
 	y = bd->pre_res_change.y;
 	w = bd->pre_res_change.w;
 	h = bd->pre_res_change.h;
-	if (w > bd->zone->w)
-	  w = bd->zone->w;
-	if (h > bd->zone->h)
-	  h = bd->zone->h;
-	if ((x + w) > (bd->zone->x + bd->zone->w))
-	  x = bd->zone->x + bd->zone->w - w;
-	if ((y + h) > (bd->zone->y + bd->zone->h))
-	  y = bd->zone->y + bd->zone->h - h;
+	if (w > zw)
+	  w = zw;
+	if (h > zh)
+	  h = zh;
+	if ((x + w) > (zx + zw))
+	  x = zx + zw - w;
+	if ((y + h) > (zy + zh))
+	  y = zy + zh - h;
 	e_border_move_resize(bd, x, y, w, h);
      }
    memcpy(&bd->pre_res_change, &pre_res_change, sizeof(pre_res_change));
@@ -799,10 +801,11 @@ e_border_hide(E_Border *bd, int manage)
    bd->post_show = 0;
 }
 
-EAPI void
-e_border_move(E_Border *bd, int x, int y)
+static void
+_e_border_move_internal(E_Border *bd, int x, int y, Eina_Bool without_border)
 {
    E_Event_Border_Move *ev;
+   int bx, by;
 
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
@@ -820,6 +823,7 @@ e_border_move(E_Border *bd, int x, int y)
 	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);
 	return;
      }
@@ -836,13 +840,24 @@ e_border_move(E_Border *bd, int x, int y)
 	ecore_x_netwm_sync_request_send(bd->client.win, bd->client.netwm.sync.serial++);
      }
 #endif
+   if (!without_border)
+     {
+	bx = bd->client_inset.l;
+	by = bd->client_inset.t;
+     }
+   else
+     {
+	bx = 0;
+	by = 0;
+     }
+
    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);
+			     bd->x + bd->fx.x + bx,
+			     bd->y + bd->fx.y + by);
    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->x + bd->fx.x + bx,
+				  bd->y + bd->fx.y + by,
 				  bd->client.w,
 				  bd->client.h);
    _e_border_move_update(bd);
@@ -854,6 +869,70 @@ e_border_move(E_Border *bd, int x, int y)
    _e_border_zone_update(bd);
 }
 
+/**
+ * Move window to coordinates that already account border decorations.
+ *
+ * This call will consider given position 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.
+ *
+ * @see e_border_move_without_border()
+ */
+EAPI void
+e_border_move(E_Border *bd, int x, int y)
+{
+   _e_border_move_internal(bd, x, y, 0);
+}
+
+/**
+ * Move window to coordinates that do not account border decorations yet.
+ *
+ * This call will consider given position 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.
+ *
+ * @see e_border_move()
+ */
+EAPI void
+e_border_move_without_border(E_Border *bd, int x, int y)
+{
+   _e_border_move_internal(bd, x, y, 1);
+}
+
+EAPI void
+e_border_center(E_Border *bd)
+{
+   int x, y, w, h;
+   E_OBJECT_CHECK(bd);
+   E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
+
+   e_zone_useful_geometry_get(bd->zone, &x, &y, &w, &h);
+   e_border_move(bd, x + (w - bd->w) / 2, y + (h - bd->h) / 2);
+}
+
+EAPI void
+e_border_center_pos_get(E_Border *bd, int *x, int *y)
+{
+   int zx, zy, zw, zh;
+   E_OBJECT_CHECK(bd);
+   E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
+
+   e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
+   if (x) *x = zx + (zw - bd->w) / 2;
+   if (y) *y = zy + (zh - bd->h) / 2;
+}
+
 EAPI void
 e_border_fx_offset(E_Border *bd, int x, int y)
 {
@@ -877,11 +956,12 @@ e_border_fx_offset(E_Border *bd, int x, int y)
    if (bd->moving) _e_border_move_update(bd);
 }
 
-EAPI void
-e_border_resize(E_Border *bd, int w, int h)
+static void
+_e_border_resize_internal(E_Border *bd, int w, int h, Eina_Bool without_border)
 {
    E_Event_Border_Resize *ev;
-   
+   int bx, by, bw, bh;
+
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
 
@@ -889,6 +969,22 @@ e_border_resize(E_Border *bd, int w, int h)
        (((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip)))
      return;
    ecore_x_window_shadow_tree_flush();
+
+   if (!without_border)
+     {
+	bx = bd->client_inset.l;
+	by = bd->client_inset.t;
+	bw = (bd->client_inset.l + bd->client_inset.r);
+	bh = (bd->client_inset.t + bd->client_inset.b);
+     }
+   else
+     {
+	bx = 0;
+	by = 0;
+	bw = 0;
+	bh = 0;
+     }
+
    if (bd->new_client)
      {
 	E_Border_Pending_Move_Resize  *pnd;
@@ -896,8 +992,9 @@ e_border_resize(E_Border *bd, int w, int h)
 	pnd = E_NEW(E_Border_Pending_Move_Resize, 1);
 	if (!pnd) return;
 	pnd->resize = 1;
-	pnd->w = w - (bd->client_inset.l + bd->client_inset.r);
-	pnd->h = h - (bd->client_inset.t + bd->client_inset.b);
+	pnd->without_border = without_border;
+	pnd->w = w - bw;
+	pnd->h = h - bh;
 	bd->pending_move_resize = eina_list_append(bd->pending_move_resize, pnd);
 	return;
      }
@@ -905,8 +1002,8 @@ e_border_resize(E_Border *bd, int w, int h)
    bd->pre_res_change.valid = 0;
    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->client.w = bd->w - bw;
+   bd->client.h = bd->h - bh;
    bd->changed = 1;
    bd->changes.size = 1;
    if ((bd->shaped) || (bd->client.shaped))
@@ -921,11 +1018,11 @@ e_border_resize(E_Border *bd, int w, int 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);
+			     bd->x + bd->fx.x + bx,
+			     bd->y + bd->fx.y + by);
    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->x + bd->fx.x + bx,
+				  bd->y + bd->fx.y + by,
 				  bd->client.w,
 				  bd->client.h);
    _e_border_resize_update(bd);
@@ -937,19 +1034,77 @@ e_border_resize(E_Border *bd, int w, int h)
    _e_border_zone_update(bd);
 }
 
+/**
+ * Resize window to values that already account border decorations.
+ *
+ * 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 w horizontal window size.
+ * @parm h vertical window size.
+ *
+ * @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_resize_internal(bd, w, h, 0);
+}
+
+/**
+ * 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.
+ *
+ * @parm w horizontal window size.
+ * @parm h vertical window size.
+ *
+ * @see e_border_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_Event_Border_Move		*mev;
    E_Event_Border_Resize	*rev;
+   int bx, by, bw, bh;
 
    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;
+     return;
    ecore_x_window_shadow_tree_flush();
+
+   if (!without_border)
+     {
+	bx = bd->client_inset.l;
+	by = bd->client_inset.t;
+	bw = (bd->client_inset.l + bd->client_inset.r);
+	bh = (bd->client_inset.t + bd->client_inset.b);
+     }
+   else
+     {
+	bx = 0;
+	by = 0;
+	bw = 0;
+	bh = 0;
+     }
+
    if (bd->new_client)
      {
 	E_Border_Pending_Move_Resize  *pnd;
@@ -958,10 +1113,11 @@ e_border_move_resize(E_Border *bd, int x, int y, int w, int h)
 	if (!pnd) return;
 	pnd->move = 1;
 	pnd->resize = 1;
+	pnd->without_border = without_border;
 	pnd->x = x;
 	pnd->y = y;
-	pnd->w = w - (bd->client_inset.l + bd->client_inset.r);
-	pnd->h = h - (bd->client_inset.t + bd->client_inset.b);
+	pnd->w = w - bw;
+	pnd->h = h - bh;
 	bd->pending_move_resize = eina_list_append(bd->pending_move_resize, pnd);
 	return;
      }
@@ -971,8 +1127,8 @@ e_border_move_resize(E_Border *bd, int x, int y, int w, int h)
    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->client.w = bd->w - bw;
+   bd->client.h = bd->h - bh;
    bd->changed = 1;
    bd->changes.pos = 1;
    bd->changes.size = 1;
@@ -988,11 +1144,11 @@ e_border_move_resize(E_Border *bd, int x, int y, int w, int 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);
+			     bd->x + bd->fx.x + bx,
+			     bd->y + bd->fx.y + by);
    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->x + bd->fx.x + bx,
+				  bd->y + bd->fx.y + by,
 				  bd->client.w,
 				  bd->client.h);
    _e_border_resize_update(bd);
@@ -1010,6 +1166,48 @@ e_border_move_resize(E_Border *bd, int x, int y, int w, int h)
    _e_border_zone_update(bd);
 }
 
+/**
+ * Move and resize window to values that already account border decorations.
+ *
+ * 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_move_resize_without_border()
+ */
+EAPI void
+e_border_move_resize(E_Border *bd, int x, int y, int w, int h)
+{
+   _e_border_move_resize_internal(bd, x, y, w, h, 0);
+}
+
+/**
+ * Move and 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).
+ *
+ * @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()
+ */
+EAPI void
+e_border_move_resize_without_border(E_Border *bd, int x, int y, int w, int h)
+{
+   _e_border_move_resize_internal(bd, x, y, w, h, 1);
+}
+
 EAPI void
 e_border_layer_set(E_Border *bd, int layer)
 {
@@ -2572,6 +2770,7 @@ e_border_idler_before(void)
 	     bl = e_container_border_list_first(con);
 	     while ((bd = e_container_border_list_next(bl)))
 	       {
+		  if (e_object_is_del(E_OBJECT(bd))) continue;
 		  if ((bd->changes.visible) && (!bd->visible))
 		    {
 		       ecore_x_window_hide(bd->win);
@@ -5489,8 +5688,17 @@ _e_border_eval(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);
+	return;
+     }
    
    _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)
      {
@@ -6054,6 +6262,7 @@ _e_border_eval(E_Border *bd)
 		  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)
 	       {
@@ -6535,8 +6744,8 @@ _e_border_eval(E_Border *bd)
 #endif
 		  else if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
 		    {
-		       bd->x = bd->zone->x + ((bd->zone->w - bd->w) / 2);
-		       bd->y = bd->zone->y + ((bd->zone->h - bd->h) / 2);
+		       bd->x = zx + ((zw - bd->w) / 2);
+		       bd->y = zy + ((zh - bd->h) / 2);
 		       bd->changes.pos = 1;
 		       bd->placed = 1;
 		    }
@@ -6545,14 +6754,14 @@ _e_border_eval(E_Border *bd)
 		       Eina_List *skiplist = NULL;
 		       int new_x, new_y;
 
-		       if (bd->zone->w > bd->w)
-			 new_x = bd->zone->x + (rand() % (bd->zone->w - bd->w));
+		       if (zw > bd->w)
+			 new_x = zx + (rand() % (zw - bd->w));
 		       else
-			 new_x = bd->zone->x;
-		       if (bd->zone->h > bd->h)
-			 new_y = bd->zone->y + (rand() % (bd->zone->h - bd->h));
+			 new_x = zx;
+		       if (zh > bd->h)
+			 new_y = zy + (rand() % (zh - bd->h));
 		       else
-			 new_y = bd->zone->y;
+			 new_y = zy;
 
 		       if ((e_config->window_placement_policy == E_WINDOW_PLACEMENT_SMART)||(e_config->window_placement_policy == E_WINDOW_PLACEMENT_ANTIGADGET))
 			 {
@@ -6589,6 +6798,11 @@ _e_border_eval(E_Border *bd)
 		  bd->y = pnd->y;
 		  bd->changes.pos = 1;
 		  bd->placed = 1;
+		  if (pnd->without_border)
+		    {
+		       bd->x -= bd->client_inset.l;
+		       bd->y -= bd->client_inset.t;
+		    }
 	       }
 	     if ((!bd->lock_client_size) && (pnd->resize))
 	       {
@@ -6611,8 +6825,8 @@ _e_border_eval(E_Border *bd)
 	     ((bd->remember) && 
 	      (!(bd->remember->apply & E_REMEMBER_APPLY_POS)))))
 	  {
-	     bd->x = bd->zone->x + (bd->zone->w - bd->w) / 2;
-	     bd->y = bd->zone->y + (bd->zone->h - bd->h) / 2;
+	     bd->x = zx + (zw - bd->w) / 2;
+	     bd->y = zy + (zh - bd->h) / 2;
 	     bd->changes.pos = 1;
 	     bd->placed = 1;
 	  }
@@ -6668,7 +6882,10 @@ _e_border_eval(E_Border *bd)
 						    bd->x,
 						    bd->y + bd->h - 1);
 	     if ((zone) && (zone != bd->zone))
-	       e_border_zone_set(bd, zone);
+	       {
+		  e_border_zone_set(bd, zone);
+		  e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh);
+	       }
 	  }
      }
    
diff --git a/src/bin/e_border.h b/src/bin/e_border.h
index 6d899a2..486aac4 100644
--- a/src/bin/e_border.h
+++ b/src/bin/e_border.h
@@ -515,6 +515,7 @@ struct _E_Border_Pending_Move_Resize
    int x, y, w, h;
    unsigned char move : 1;
    unsigned char resize : 1;
+   unsigned char without_border : 1;
 };
 
 struct _E_Border_Hook
@@ -563,9 +564,14 @@ EAPI void      e_border_desk_set(E_Border *bd, E_Desk *desk);
 EAPI void      e_border_show(E_Border *bd);
 EAPI void      e_border_hide(E_Border *bd, int manage);
 EAPI void      e_border_move(E_Border *bd, int x, int y);
+EAPI void      e_border_move_without_border(E_Border *bd, int x, int y);
+EAPI void      e_border_center(E_Border *bd);
+EAPI void      e_border_center_pos_get(E_Border *bd, int *x, int *y);
 EAPI void      e_border_fx_offset(E_Border *bd, int x, int y);
 EAPI void      e_border_resize(E_Border *bd, int w, int h);
+EAPI void      e_border_resize_without_border(E_Border *bd, int w, int h);
 EAPI void      e_border_move_resize(E_Border *bd, int x, int y, int w, int h);
+EAPI void      e_border_move_resize_without_border(E_Border *bd, int x, int y, int w, int h);
 EAPI void      e_border_layer_set(E_Border *bd, int layer);
 EAPI void      e_border_raise(E_Border *bd);
 EAPI void      e_border_lower(E_Border *bd);
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 9817c3d..fe5a48e 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -45,12 +45,14 @@ static E_Config_DD *_e_config_mime_icon_edd = NULL;
 static E_Config_DD *_e_config_syscon_action_edd = NULL;
 
 EAPI int E_EVENT_CONFIG_ICON_THEME = 0;
+EAPI int E_EVENT_CONFIG_MODE_CHANGED = 0;
 
 /* externally accessible functions */
 EAPI int
 e_config_init(void)
 {
    E_EVENT_CONFIG_ICON_THEME = ecore_event_type_new();
+   E_EVENT_CONFIG_MODE_CHANGED = ecore_event_type_new();
 
    _e_config_profile = getenv("E_CONF_PROFILE");
    if (_e_config_profile)
@@ -565,10 +567,14 @@ e_config_init(void)
    E_CONFIG_VAL(D, T, desklock_login_box_zone, INT);
    E_CONFIG_VAL(D, T, desklock_start_locked, INT);
    E_CONFIG_VAL(D, T, desklock_autolock_screensaver, INT);
+   E_CONFIG_VAL(D, T, desklock_post_screensaver_time, DOUBLE);
    E_CONFIG_VAL(D, T, desklock_autolock_idle, INT);
    E_CONFIG_VAL(D, T, desklock_autolock_idle_timeout, DOUBLE);
    E_CONFIG_VAL(D, T, desklock_use_custom_desklock, INT);
    E_CONFIG_VAL(D, T, desklock_custom_desklock_cmd, STR);
+   E_CONFIG_VAL(D, T, desklock_ask_presentation, UCHAR);
+   E_CONFIG_VAL(D, T, desklock_ask_presentation_timeout, DOUBLE);
+
    E_CONFIG_VAL(D, T, display_res_restore, INT);
    E_CONFIG_VAL(D, T, display_res_width, INT);
    E_CONFIG_VAL(D, T, display_res_height, INT);
@@ -580,7 +586,9 @@ e_config_init(void)
    E_CONFIG_VAL(D, T, screensaver_interval, INT);
    E_CONFIG_VAL(D, T, screensaver_blanking, INT);
    E_CONFIG_VAL(D, T, screensaver_expose, INT);
-   
+   E_CONFIG_VAL(D, T, screensaver_ask_presentation, UCHAR);
+   E_CONFIG_VAL(D, T, screensaver_ask_presentation_timeout, DOUBLE);
+
    E_CONFIG_VAL(D, T, dpms_enable, INT);
    E_CONFIG_VAL(D, T, dpms_standby_enable, INT);
    E_CONFIG_VAL(D, T, dpms_suspend_enable, INT);
@@ -614,6 +622,9 @@ e_config_init(void)
    E_CONFIG_VAL(D, T, desk_flip_animate_mode, INT);
    E_CONFIG_VAL(D, T, desk_flip_animate_interpolation, INT);
    E_CONFIG_VAL(D, T, desk_flip_animate_time, DOUBLE);
+   E_CONFIG_VAL(D, T, desk_flip_pan_bg, UCHAR);
+   E_CONFIG_VAL(D, T, desk_flip_pan_x_axis_factor, DOUBLE);
+   E_CONFIG_VAL(D, T, desk_flip_pan_y_axis_factor, DOUBLE);
    
    E_CONFIG_VAL(D, T, wallpaper_import_last_dev, STR);
    E_CONFIG_VAL(D, T, wallpaper_import_last_path, STR);
@@ -645,6 +656,8 @@ e_config_init(void)
    E_CONFIG_VAL(D, T, thumbscroll_friction, DOUBLE);
    
    E_CONFIG_VAL(D, T, hal_desktop, INT);
+   E_CONFIG_VAL(D, T, hal_auto_mount, INT);
+   E_CONFIG_VAL(D, T, hal_auto_open, INT);
 
    E_CONFIG_VAL(D, T, border_keyboard.timeout, DOUBLE);
    E_CONFIG_VAL(D, T, border_keyboard.move.dx, UCHAR);
@@ -652,8 +665,6 @@ e_config_init(void)
    E_CONFIG_VAL(D, T, border_keyboard.resize.dx, UCHAR);
    E_CONFIG_VAL(D, T, border_keyboard.resize.dy, UCHAR);
 
-   E_CONFIG_VAL(D, T, hal_desktop, INT);
-
    E_CONFIG_VAL(D, T, scale.min, DOUBLE);
    E_CONFIG_VAL(D, T, scale.max, DOUBLE);
    E_CONFIG_VAL(D, T, scale.factor, DOUBLE);
@@ -674,7 +685,10 @@ e_config_init(void)
    E_CONFIG_VAL(D, T, syscon.timeout, DOUBLE);
    E_CONFIG_VAL(D, T, syscon.do_input, UCHAR);
    E_CONFIG_LIST(D, T, syscon.actions, _e_config_syscon_action_edd);
-   
+
+   E_CONFIG_VAL(D, T, mode.presentation, UCHAR);
+   E_CONFIG_VAL(D, T, mode.offline, UCHAR);
+
    e_config_load();
    
    e_config_save_queue();
@@ -809,6 +823,7 @@ e_config_load(void)
           }
      }
 #define IFCFG(v) if ((e_config->config_version & 0xffff) < (v)) {
+#define IFCFGELSE } else {
 #define IFCFGEND }
 #define COPYVAL(x) do {e_config->x = tcfg->x;} while (0)
 #define COPYPTR(x) do {e_config->x = tcfg->x; tcfg->x = NULL;} while (0)
@@ -881,6 +896,34 @@ e_config_load(void)
         IFCFG(0x012f);
         COPYVAL(icon_theme_overrides);
         IFCFGEND;
+
+	IFCFG(0x0130);
+	COPYVAL(mode.presentation);
+	COPYVAL(mode.offline);
+	IFCFGEND;
+
+	IFCFG(0x0131);
+	COPYVAL(desklock_post_screensaver_time);
+	IFCFGEND;
+
+	IFCFG(0x0132);
+	COPYVAL(desklock_ask_presentation);
+	COPYVAL(desklock_ask_presentation_timeout);
+	COPYVAL(screensaver_ask_presentation);
+	COPYVAL(screensaver_ask_presentation_timeout);
+	IFCFGELSE;
+	e_config->desklock_ask_presentation = 1;
+	e_config->desklock_ask_presentation_timeout = 30.0;
+	e_config->screensaver_ask_presentation = 1;
+	e_config->screensaver_ask_presentation_timeout = 30.0;
+	IFCFGEND;
+
+        IFCFG(0x0133);
+        COPYVAL(desk_flip_pan_bg);
+        COPYVAL(desk_flip_pan_x_axis_factor);
+        COPYVAL(desk_flip_pan_y_axis_factor);
+        IFCFGEND;
+
         e_config->config_version = E_CONFIG_FILE_VERSION;   
         _e_config_free(tcfg);
      }
@@ -967,9 +1010,12 @@ e_config_load(void)
    E_CONFIG_LIMIT(e_config->font_hinting, 0, 2);
    E_CONFIG_LIMIT(e_config->desklock_login_box_zone, -2, 1000);
    E_CONFIG_LIMIT(e_config->desklock_autolock_screensaver, 0, 1);
+   E_CONFIG_LIMIT(e_config->desklock_post_screensaver_time, 0.0, 300.0);
    E_CONFIG_LIMIT(e_config->desklock_autolock_idle, 0, 1);
    E_CONFIG_LIMIT(e_config->desklock_autolock_idle_timeout, 1.0, 5400.0);
    E_CONFIG_LIMIT(e_config->desklock_use_custom_desklock, 0, 1);
+   E_CONFIG_LIMIT(e_config->desklock_ask_presentation, 0, 1);
+   E_CONFIG_LIMIT(e_config->desklock_ask_presentation_timeout, 1.0, 300.0);
    E_CONFIG_LIMIT(e_config->display_res_restore, 0, 1);
    E_CONFIG_LIMIT(e_config->display_res_width, 1, 8192);
    E_CONFIG_LIMIT(e_config->display_res_height, 1, 8192);
@@ -980,6 +1026,9 @@ e_config_load(void)
    E_CONFIG_LIMIT(e_config->desk_flip_wrap, 0, 1);
    E_CONFIG_LIMIT(e_config->fullscreen_flip, 0, 1);
    E_CONFIG_LIMIT(e_config->icon_theme_overrides, 0, 1);
+   E_CONFIG_LIMIT(e_config->desk_flip_pan_bg, 0, 1);
+   E_CONFIG_LIMIT(e_config->desk_flip_pan_x_axis_factor, 0.0, 1.0);
+   E_CONFIG_LIMIT(e_config->desk_flip_pan_y_axis_factor, 0.0, 1.0);
    E_CONFIG_LIMIT(e_config->remember_internal_windows, 0, 1);
    E_CONFIG_LIMIT(e_config->desk_auto_switch, 0, 1);
 
@@ -995,7 +1044,9 @@ e_config_load(void)
    E_CONFIG_LIMIT(e_config->screensaver_interval, 0, 5400);
    E_CONFIG_LIMIT(e_config->screensaver_blanking, 0, 2);
    E_CONFIG_LIMIT(e_config->screensaver_expose, 0, 2);
-   
+   E_CONFIG_LIMIT(e_config->screensaver_ask_presentation, 0, 1);
+   E_CONFIG_LIMIT(e_config->screensaver_ask_presentation_timeout, 1.0, 300.0);
+
    E_CONFIG_LIMIT(e_config->clientlist_group_by, 0, 2);
    E_CONFIG_LIMIT(e_config->clientlist_include_all_zones, 0, 1);
    E_CONFIG_LIMIT(e_config->clientlist_separate_with, 0, 2);
@@ -1014,7 +1065,10 @@ e_config_load(void)
    E_CONFIG_LIMIT(e_config->menu_apps_show, 0, 1);
 
    E_CONFIG_LIMIT(e_config->ping_clients_interval, 16, 1024);
-   
+
+   E_CONFIG_LIMIT(e_config->mode.presentation, 0, 1);
+   E_CONFIG_LIMIT(e_config->mode.offline, 0, 1);
+
    /* FIXME: disabled auto apply because it causes problems */
    e_config->cfgdlg_auto_apply = 0;
    /* FIXME: desklock personalized password id disabled for security reasons */
@@ -1452,6 +1506,12 @@ e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in)
    return NULL;
 }
 
+EAPI void
+e_config_mode_changed(void)
+{
+   ecore_event_add(E_EVENT_CONFIG_MODE_CHANGED, NULL, NULL, NULL);
+}
+
 /* local subsystem functions */
 static void
 _e_config_save_cb(void *data)
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index 24897f8..53d7f31 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -35,7 +35,7 @@ typedef struct _E_Event_Config_Icon_Theme   E_Event_Config_Icon_Theme;
 /* increment this whenever a new set of config values are added but the users
  * config doesn't need to be wiped - simply new values need to be put in
  */
-#define E_CONFIG_FILE_GENERATION 0x012f
+#define E_CONFIG_FILE_GENERATION 0x0133
 #define E_CONFIG_FILE_VERSION    ((E_CONFIG_FILE_EPOCH << 16) | E_CONFIG_FILE_GENERATION)
 
 #define E_EVAS_ENGINE_DEFAULT         0
@@ -218,16 +218,21 @@ struct _E_Config
    int         desklock_login_box_zone; // GUI
    int         desklock_start_locked; // GUI
    int         desklock_autolock_screensaver; // GUI
+   double      desklock_post_screensaver_time; // GUI
    int         desklock_autolock_idle; // GUI
    double      desklock_autolock_idle_timeout; // GUI
    int         desklock_use_custom_desklock; // GUI
    const char *desklock_custom_desklock_cmd; // GUI
-   
+   Eina_Bool   desklock_ask_presentation; // GUI
+   double      desklock_ask_presentation_timeout; // GUI
+
    int         screensaver_enable; // GUI
    int         screensaver_timeout; // GUI
    int         screensaver_interval; // GUI
    int         screensaver_blanking; // GUI
    int         screensaver_expose; // GUI
+   Eina_Bool   screensaver_ask_presentation; // GUI
+   double      screensaver_ask_presentation_timeout; // GUI
   
    int         dpms_enable; // GUI
    int         dpms_standby_enable; // GUI
@@ -267,6 +272,9 @@ struct _E_Config
    int         desk_flip_animate_mode; // GUI
    int         desk_flip_animate_interpolation; // GUI
    double      desk_flip_animate_time; // GUI
+   Eina_Bool   desk_flip_pan_bg;
+   double      desk_flip_pan_x_axis_factor;
+   double      desk_flip_pan_y_axis_factor;
    
    const char *wallpaper_import_last_dev; // INTERNAL
    const char *wallpaper_import_last_path; // INTERNAL
@@ -294,6 +302,8 @@ struct _E_Config
    double thumbscroll_friction; // GUI
 
    int hal_desktop;
+   int hal_auto_mount;
+   int hal_auto_open;
 
    struct {
       double timeout;
@@ -331,6 +341,11 @@ struct _E_Config
       unsigned char do_input;
       Eina_List *actions;
    } syscon;
+
+   struct {
+      Eina_Bool presentation;
+      Eina_Bool offline;
+   } mode;
 };
 
 struct _E_Config_Syscon_Action
@@ -519,10 +534,12 @@ EAPI E_Config_Binding_Key    *e_config_binding_key_match(E_Config_Binding_Key *e
 EAPI E_Config_Binding_Edge   *e_config_binding_edge_match(E_Config_Binding_Edge *eb_in);
 EAPI E_Config_Binding_Signal *e_config_binding_signal_match(E_Config_Binding_Signal *eb_in);
 EAPI E_Config_Binding_Wheel  *e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in);
-    
+EAPI void                     e_config_mode_changed(void);
+
 extern EAPI E_Config *e_config;
 
 extern EAPI int E_EVENT_CONFIG_ICON_THEME;
+extern EAPI int E_EVENT_CONFIG_MODE_CHANGED;
 
 #endif
 #endif
diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c
index 577dc68..cc18623 100644
--- a/src/bin/e_config_dialog.c
+++ b/src/bin/e_config_dialog.c
@@ -271,14 +271,14 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
 
 	e_dialog_show(cfd->dia);
 	if (cfd->icon) e_dialog_border_icon_set(cfd->dia, cfd->icon);
-	x = pdia->win->border->x + ((pdia->win->w - cfd->dia->win->w) / 2);
-	y = pdia->win->border->y + ((pdia->win->h - cfd->dia->win->h) / 2);
+	x = pdia->win->x;
+	y = pdia->win->y;
 	if (x < 0) x = 0;
 	if (y < 0) y = 0;
 	if ((x + cfd->dia->win->w) > (pdia->win->container->w))
 	  x = pdia->win->container->w - cfd->dia->win->w;
 	if ((y + cfd->dia->win->h) > (pdia->win->container->h))
-	  x = pdia->win->container->h - cfd->dia->win->h;
+	  y = pdia->win->container->h - cfd->dia->win->h;
 	e_win_move(cfd->dia->win, x, y);
 	e_win_placed_set(cfd->dia->win, 1);
      }
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index aea9554..286a5b1 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -209,7 +209,7 @@ e_desk_show(E_Desk *desk)
    E_Event_Desk_Before_Show *eev;
    E_Event_Desk_After_Show *eeev;
    Eina_List *l;
-   int was_zone = 0, x, y, dx = 0, dy = 0;
+   int was_zone = 0, x, y, dx = 0, dy = 0, prev_x = 0, prev_y = 0;
 
    E_OBJECT_CHECK(desk);
    E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
@@ -232,6 +232,8 @@ e_desk_show(E_Desk *desk)
 	     if (desk2->visible)
 	       {
 		  desk2->visible = 0;
+		  prev_x = desk2->x;
+		  prev_y = desk2->y;
 		  dx = desk->x - desk2->x;
 		  dy = desk->y - desk2->y;
 		  if (e_config->desk_flip_animate_mode > 0)
@@ -272,7 +274,12 @@ e_desk_show(E_Desk *desk)
      e_desk_last_focused_focus(desk);
 
    if (was_zone)
-     e_bg_zone_update(desk->zone, E_BG_TRANSITION_DESK);
+     {
+	if (e_config->desk_flip_pan_bg)
+	  e_bg_zone_slide(desk->zone, prev_x, prev_y);
+	else
+	  e_bg_zone_update(desk->zone, E_BG_TRANSITION_DESK);
+     }
    else
      e_bg_zone_update(desk->zone, E_BG_TRANSITION_START);
 
diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index 544195a..a3fcc85 100644
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -61,6 +61,9 @@ static Ecore_Exe *_e_custom_desklock_exe = NULL;
 static Ecore_Event_Handler *_e_custom_desklock_exe_handler = NULL;
 static Ecore_Poller *_e_desklock_idle_poller = NULL;
 static int _e_desklock_user_idle = 0;
+static double _e_desklock_autolock_time = 0.0;
+static E_Dialog *_e_desklock_ask_presentation_dia = NULL;
+static int _e_desklock_ask_presentation_count = 0;
 
 /***********************************************************************/
 
@@ -89,6 +92,8 @@ static char *_desklock_auth_get_current_user(void);
 static char *_desklock_auth_get_current_host(void);
 #endif
 
+static void _e_desklock_ask_presentation_mode(void);
+
 EAPI int E_EVENT_DESKLOCK = 0;
 
 EAPI int
@@ -116,6 +121,31 @@ e_desklock_shutdown(void)
    return 1;
 }
 
+static const char *
+_user_wallpaper_get(void)
+{
+   const E_Config_Desktop_Background *cdbg;
+   const Eina_List *l;
+
+   if (e_config->desktop_default_background)
+     return e_config->desktop_default_background;
+
+   EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cdbg)
+     if (cdbg->file)
+       return cdbg->file;
+
+   return e_theme_edje_file_get("base/theme/desklock",
+				"e/desklock/background");
+}
+
+EAPI int
+e_desklock_show_autolocked(void)
+{
+   if (_e_desklock_autolock_time < 1.0)
+     _e_desklock_autolock_time = ecore_loop_time_get();
+   return e_desklock_show();
+}
+
 EAPI int
 e_desklock_show(void)
 {
@@ -267,17 +297,22 @@ e_desklock_show(void)
 			 }
 		       else
 			 {
-			   if (e_util_edje_collection_exists(e_config->desklock_background,
-							     "e/desklock/background"))
+			   const char *f;
+
+			   if (!strcmp(e_config->desklock_background, "user_background"))
+			     f = _user_wallpaper_get();
+			   else
+			     f = e_config->desklock_background;
+
+			   if (e_util_edje_collection_exists(f, "e/desklock/background"))
 			     {
-			       edje_object_file_set(edp->bg_object, e_config->desklock_background,
+			       edje_object_file_set(edp->bg_object, f,
 						    "e/desklock/background");
 			     }
 			   else
 			     {
 			       if (!edje_object_file_set(edp->bg_object,
-							 e_config->desklock_background,
-							 "e/desktop/background"))
+							 f, "e/desktop/background"))
 				 {
 				   edje_object_file_set(edp->bg_object,
 							e_theme_edje_file_get("base/theme/desklock",
@@ -412,6 +447,24 @@ e_desklock_hide(void)
    ev = E_NEW(E_Event_Desklock, 1);
    ev->on = 0;
    ecore_event_add(E_EVENT_DESKLOCK, ev, NULL, NULL);
+
+   if (_e_desklock_autolock_time > 0.0)
+     {
+	if ((e_config->desklock_ask_presentation) &&
+	    (e_config->desklock_ask_presentation_timeout > 0.0))
+	  {
+	     double max, now;
+
+	     now = ecore_loop_time_get();
+	     max = _e_desklock_autolock_time + e_config->desklock_ask_presentation_timeout;
+	     if (now <= max)
+	       _e_desklock_ask_presentation_mode();
+	  }
+	else
+	  _e_desklock_ask_presentation_count = 0;
+
+	_e_desklock_autolock_time = 0.0;
+     }
 }
 
 static int
@@ -865,13 +918,20 @@ _e_desklock_cb_custom_desklock_exit(void *data, int type, void *event)
 static int 
 _e_desklock_cb_idle_poller(void *data)
 {
-   if (e_config->desklock_autolock_idle)
+   if ((e_config->desklock_autolock_idle) && (!e_config->mode.presentation))
      {
+	double idle, max;
+
 	/* If a desklock is already up, bail */
         if ((_e_custom_desklock_exe) || (edd)) return 1;
 
+	idle = ecore_x_screensaver_idle_time_get();
+	max = e_config->desklock_autolock_idle_timeout;
+	if (_e_desklock_ask_presentation_count > 0)
+	  max *= (1 + _e_desklock_ask_presentation_count);
+
 	/* If we have exceeded our idle time... */
-        if (ecore_x_screensaver_idle_time_get() >= e_config->desklock_autolock_idle_timeout)
+        if (idle >= max)
 	  {
 	     /*
 	      * Unfortunately, not all "desklocks" stay up for as long as
@@ -885,7 +945,7 @@ _e_desklock_cb_idle_poller(void *data)
 	     if (!_e_desklock_user_idle)
 	       {
 	          _e_desklock_user_idle = 1;
-                  e_desklock_show();
+                  e_desklock_show_autolocked();
 	       }
 	  }
 	else
@@ -895,3 +955,115 @@ _e_desklock_cb_idle_poller(void *data)
    /* Make sure our poller persists. */
    return 1;
 }
+
+static void
+_e_desklock_ask_presentation_del(void *data)
+{
+   if (_e_desklock_ask_presentation_dia == data)
+     _e_desklock_ask_presentation_dia = NULL;
+}
+
+static void
+_e_desklock_ask_presentation_yes(void *data __UNUSED__, E_Dialog *dia)
+{
+   e_config->mode.presentation = 1;
+   e_config_mode_changed();
+   e_config_save_queue();
+   e_object_del(E_OBJECT(dia));
+   _e_desklock_ask_presentation_count = 0;
+}
+
+static void
+_e_desklock_ask_presentation_no(void *data __UNUSED__, E_Dialog *dia)
+{
+   e_object_del(E_OBJECT(dia));
+   _e_desklock_ask_presentation_count = 0;
+}
+
+static void
+_e_desklock_ask_presentation_no_increase(void *data __UNUSED__, E_Dialog *dia)
+{
+   int timeout, interval, blanking, expose;
+
+   _e_desklock_ask_presentation_count++;
+   timeout = e_config->screensaver_timeout * _e_desklock_ask_presentation_count;
+   interval = e_config->screensaver_interval;
+   blanking = e_config->screensaver_blanking;
+   expose = e_config->screensaver_expose;
+
+   ecore_x_screensaver_set(timeout, interval, blanking, expose);
+   e_object_del(E_OBJECT(dia));
+}
+
+static void
+_e_desklock_ask_presentation_no_forever(void *data __UNUSED__, E_Dialog *dia)
+{
+   e_config->desklock_ask_presentation = 0;
+   e_config_save_queue();
+   e_object_del(E_OBJECT(dia));
+   _e_desklock_ask_presentation_count = 0;
+}
+
+static void
+_e_desklock_ask_presentation_key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event)
+{
+   Evas_Event_Key_Down *ev = event;
+   E_Dialog *dia = data;
+
+   if (strcmp(ev->keyname, "Return") == 0)
+     _e_desklock_ask_presentation_yes(NULL, dia);
+   else if (strcmp(ev->keyname, "Escape") == 0)
+     _e_desklock_ask_presentation_no(NULL, dia);
+}
+
+static void
+_e_desklock_ask_presentation_mode(void)
+{
+   E_Manager *man;
+   E_Container *con;
+   E_Dialog *dia;
+
+   if (_e_desklock_ask_presentation_dia)
+     return;
+
+   man = e_manager_current_get();
+   if (!man) return;
+   con = e_container_current_get(man);
+   if (!con) return;
+   dia = e_dialog_new(con, "E", "_desklock_ask_presentation");
+   if (!dia) return;
+
+   e_dialog_title_set(dia, _("Activate Presentation Mode?"));
+   e_dialog_icon_set(dia, "dialog-ask", 64);
+   e_dialog_text_set
+     (dia,
+      _("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?"));
+
+   e_object_del_attach_func_set
+     (E_OBJECT(dia), _e_desklock_ask_presentation_del);
+   e_dialog_button_add
+     (dia, _("Yes"), NULL, _e_desklock_ask_presentation_yes, NULL);
+   e_dialog_button_add
+     (dia, _("No"), NULL, _e_desklock_ask_presentation_no, NULL);
+   e_dialog_button_add
+     (dia, _("No, but increase timeout"), NULL,
+      _e_desklock_ask_presentation_no_increase, NULL);
+   e_dialog_button_add
+     (dia, _("No, and stop asking"), NULL,
+      _e_desklock_ask_presentation_no_forever, NULL);
+
+   e_dialog_button_focus_num(dia, 0);
+   e_dialog_resizable_set(dia, 1);
+   e_widget_list_homogeneous_set(dia->box_object, 0);
+   e_util_win_auto_resize_fill(dia->win);
+   e_win_centered_set(dia->win, 1);
+   e_dialog_show(dia);
+
+   evas_object_event_callback_add
+     (dia->bg_object, EVAS_CALLBACK_KEY_DOWN,
+      _e_desklock_ask_presentation_key_down, dia);
+
+   _e_desklock_ask_presentation_dia = dia;
+}
diff --git a/src/bin/e_desklock.h b/src/bin/e_desklock.h
index d5bc327..11ee6a0 100644
--- a/src/bin/e_desklock.h
+++ b/src/bin/e_desklock.h
@@ -15,6 +15,7 @@ EAPI int e_desklock_init(void);
 EAPI int e_desklock_shutdown(void);
 
 EAPI int e_desklock_show(void);
+EAPI int e_desklock_show_autolocked(void);
 EAPI void e_desklock_hide(void);
 
 extern EAPI int E_EVENT_DESKLOCK;
diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 3b9c451..520f979 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -547,7 +547,7 @@ e_drop_handler_action_set(Ecore_X_Atom action)
 }
 
 EAPI Ecore_X_Atom
-e_drop_handler_action_get()
+e_drop_handler_action_get(void)
 {
    return _action;
 }
@@ -790,6 +790,7 @@ _e_drag_update(Ecore_X_Window root, int x, int y, Ecore_X_Atom action)
    if (_drag_current)
      {
 	E_Drop_Handler *h;
+
 	EINA_LIST_FOREACH(_drop_handlers, l, h)
 	  {
 	     if (!h->active) continue;
@@ -843,6 +844,7 @@ _e_drag_update(Ecore_X_Window root, int x, int y, Ecore_X_Atom action)
    else if (_xdnd)
      {
 	E_Drop_Handler *h;
+
 	EINA_LIST_FOREACH(_drop_handlers, l, h)
 	  {
 	     if (!h->active) continue;
@@ -944,8 +946,7 @@ _e_drag_end(Ecore_X_Window root, int x, int y)
 	     ev.x = x - dx;
 	     ev.y = y - dy;
 	     if ((_e_drag_win_matches(h, win, 0)) &&
-		 ((h->cb.drop) &&
-		  (E_INSIDE(x, y, dx, dy, dw, dh))))
+		 ((h->cb.drop) && (E_INSIDE(x, y, dx, dy, dw, dh))))
 	       {
 		  if (_drag_current->cb.convert)
 		    {
@@ -977,8 +978,7 @@ _e_drag_end(Ecore_X_Window root, int x, int y)
 
 	EINA_LIST_FOREACH(_drop_handlers, l, h)
 	  {
-	     if (!h->active)
-	       continue;
+	     if (!h->active) continue;
 
 	     if (h->entered)
 	       {
@@ -1032,8 +1032,7 @@ _e_drag_xdnd_end(Ecore_X_Window win, int x, int y)
 
 	EINA_LIST_FOREACH(_drop_handlers, l, h)
 	  {
-	     if (!h->active)
-	       continue;
+	     if (!h->active) continue;
 
 	     if (h->entered)
 	       {
@@ -1163,7 +1162,9 @@ _e_dnd_cb_mouse_move(void *data, int type, void *event)
    ev = event;
    if (ev->window != _drag_win) return 1;
 
-   if (!_xdnd) _e_drag_update(_drag_win_root, ev->x, ev->y, ECORE_X_ATOM_XDND_ACTION_PRIVATE);
+   if (!_xdnd) 
+     _e_drag_update(_drag_win_root, ev->x, ev->y, 
+                    ECORE_X_ATOM_XDND_ACTION_PRIVATE);
    
    return 1;
 }
@@ -1252,10 +1253,10 @@ _e_dnd_cb_event_dnd_leave(void *data, int type, void *event)
    if (_xdnd)
      {
 	E_Drop_Handler *h;
+
 	EINA_LIST_FOREACH(_drop_handlers, l, h)
 	  {
-	     if (!h->active)
-	       continue;
+	     if (!h->active) continue;
 
 	     if (h->entered)
 	       {
@@ -1266,8 +1267,7 @@ _e_dnd_cb_event_dnd_leave(void *data, int type, void *event)
 	  }
 
 	eina_stringshare_del(_xdnd->type);
-	free(_xdnd);
-	_xdnd = NULL;
+        E_FREE(_xdnd);
      }
    return 1;
 }
@@ -1312,20 +1312,14 @@ _e_dnd_cb_event_dnd_position(void *data, int type, void *event)
 	  }
      }
    if (!active)
-     {
-	ecore_x_dnd_send_status(0, 0, rect, ECORE_X_DND_ACTION_PRIVATE);
-     }
+     ecore_x_dnd_send_status(0, 0, rect, ECORE_X_DND_ACTION_PRIVATE);
    else
      {
 	responsive = _e_drag_update(ev->win, ev->position.x, ev->position.y, ev->action);
 	if (responsive)
-	  {
-	     ecore_x_dnd_send_status(1, 0, rect, _action);
-	  }
+          ecore_x_dnd_send_status(1, 0, rect, _action);
 	else
-	  {
-	     ecore_x_dnd_send_status(1, 0, rect, ECORE_X_ATOM_XDND_ACTION_PRIVATE);
-	  }
+          ecore_x_dnd_send_status(1, 0, rect, ECORE_X_ATOM_XDND_ACTION_PRIVATE);
      }
 //   double t2 = ecore_time_get() - t1; ////
 //   printf("DND POS EV 2 %3.7f\n", t2); ////
@@ -1339,7 +1333,6 @@ _e_dnd_cb_event_dnd_status(void *data, int type, void *event)
 
    ev = event;
    if (ev->win != _drag_win) return 1;
-
    return 1;
 }
 
@@ -1350,8 +1343,7 @@ _e_dnd_cb_event_dnd_finished(void *data, int type, void *event)
 
    ev = event;
 
-   if (!ev->completed)
-     return 1;
+   if (!ev->completed) return 1;
 
    if (_drag_current)
      {
@@ -1401,7 +1393,7 @@ _e_dnd_cb_event_dnd_selection(void *data, int type, void *event)
 
    if (_type_text_uri_list == _xdnd->type)
      {
-	Ecore_X_Selection_Data_Files   *files;
+	Ecore_X_Selection_Data_Files *files;
 	Eina_List *l = NULL;
 
 	files = ev->data;
@@ -1418,7 +1410,7 @@ _e_dnd_cb_event_dnd_selection(void *data, int type, void *event)
 	Eina_List *l = NULL;
 	char file[PATH_MAX];
 	char *text;
-	int i, size;
+	int size;
 
 	data = ev->data;
 	text = (char *)data->data;
@@ -1451,14 +1443,11 @@ _e_dnd_cb_event_dnd_selection(void *data, int type, void *event)
 	eina_list_free(l);
      }
    else
-     {
-	_e_drag_xdnd_end(ev->win, _xdnd->x, _xdnd->y);
-     }
+     _e_drag_xdnd_end(ev->win, _xdnd->x, _xdnd->y);
    /* FIXME: When to execute this? It could be executed in ecore_x after getting
     * the drop property... */
    ecore_x_dnd_send_finished();
    eina_stringshare_del(_xdnd->type);
-   free(_xdnd);
-   _xdnd = NULL;
+   E_FREE(_xdnd);
    return 1;
 }
diff --git a/src/bin/e_dnd.h b/src/bin/e_dnd.h
index 684784d..dc142ef 100644
--- a/src/bin/e_dnd.h
+++ b/src/bin/e_dnd.h
@@ -26,26 +26,27 @@ typedef struct _E_Event_Dnd_Drop   E_Event_Dnd_Drop;
 
 struct _E_Drag
 {
-   E_Object             e_obj_inherit;
+   E_Object e_obj_inherit;
 
-   void          *data;
-   int            data_size;
+   void *data;
+   int data_size;
 
-   E_Drag_Type    type;
+   E_Drag_Type type;
 
-   struct {
+   struct 
+     {
 	void *(*convert)(E_Drag *drag, const char *type);
 	void  (*finished)(E_Drag *drag, int dropped);
 	void  (*key_down)(E_Drag *drag, Ecore_Event_Key *e);
 	void  (*key_up)(E_Drag *drag, Ecore_Event_Key *e);
-   } cb;
+     } cb;
 
-   E_Container       *container;
-   Ecore_Evas        *ecore_evas;
-   Evas              *evas;
-   Ecore_X_Window     evas_win;
+   E_Container *container;
+   Ecore_Evas *ecore_evas;
+   Evas *evas;
+   Ecore_X_Window evas_win;
    E_Container_Shape *shape;
-   Evas_Object       *object;
+   Evas_Object *object;
 
    int x, y, w, h;
    int dx, dy;
@@ -53,33 +54,34 @@ struct _E_Drag
    int shape_rects_num;
    Ecore_X_Rectangle *shape_rects;
    
-   unsigned int   layer;
-   unsigned char  visible : 1;
-   unsigned char  need_shape_export : 1;
-   unsigned char  xy_update : 1;
+   unsigned int layer;
+   unsigned char visible : 1;
+   unsigned char need_shape_export : 1;
+   unsigned char xy_update : 1;
 
-   unsigned int   num_types;
-   const char    *types[];
+   unsigned int num_types;
+   const char *types[];
 };
 
 struct _E_Drop_Handler
 {
-   struct {
+   struct 
+     {
 	void (*enter)(void *data, const char *type, void *event);
 	void (*move)(void *data, const char *type, void *event);
 	void (*leave)(void *data, const char *type, void *event);
 	void (*drop)(void *data, const char *type, void *event);
 	void *data;
-   } cb;
+     } cb;
 
-   E_Object      *obj;
+   E_Object *obj;
    int x, y, w, h;
 
-   unsigned char  active : 1;
-   unsigned char  entered : 1;
-   const char    *active_type;
-   unsigned int   num_types;
-   const char    *types[];
+   unsigned char active : 1;
+   unsigned char entered : 1;
+   const char *active_type;
+   unsigned int num_types;
+   const char *types[];
 };
 
 struct _E_Event_Dnd_Enter
@@ -144,12 +146,12 @@ EAPI int  e_drop_xdnd_register_set(Ecore_X_Window win, int reg);
 EAPI void e_drop_handler_responsive_set(E_Drop_Handler *handler);
 EAPI int  e_drop_handler_responsive_get(const E_Drop_Handler *handler);
 EAPI void e_drop_handler_action_set(Ecore_X_Atom action);
-EAPI Ecore_X_Atom e_drop_handler_action_get();
+EAPI Ecore_X_Atom e_drop_handler_action_get(void);
 
 #endif
 #endif
 
 #ifndef MIN
-#define MIN(x, y) (((x) > (y)) ? (y) : (x))
+# define MIN(x, y) (((x) > (y)) ? (y) : (x))
 #endif
 
diff --git a/src/bin/e_dpms.c b/src/bin/e_dpms.c
index d8c8e01..5450b0d 100644
--- a/src/bin/e_dpms.c
+++ b/src/bin/e_dpms.c
@@ -2,13 +2,29 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 #include "e.h"
- 
+
+static Ecore_Event_Handler *_e_dpms_handler_config_mode = NULL;
+
+static int
+_e_dpms_handler_config_mode_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+{
+   e_dpms_init();
+   return 1;
+}
+
 EAPI int
 e_dpms_init(void)
 {
    int standby=0, suspend=0, off=0;
-    
-   ecore_x_dpms_enabled_set(e_config->dpms_enable);
+   int enabled = ((e_config->dpms_enable) && (!e_config->mode.presentation));
+
+   if (!_e_dpms_handler_config_mode)
+     _e_dpms_handler_config_mode = ecore_event_handler_add
+       (E_EVENT_CONFIG_MODE_CHANGED, _e_dpms_handler_config_mode_cb, NULL);
+
+   ecore_x_dpms_enabled_set(enabled);
+   if (!enabled)
+     return 1;
 
    if (e_config->dpms_standby_enable)
      standby = e_config->dpms_standby_timeout;
diff --git a/src/bin/e_editable.c b/src/bin/e_editable.c
index c2e49dc..c220481 100644
--- a/src/bin/e_editable.c
+++ b/src/bin/e_editable.c
@@ -24,12 +24,12 @@ struct _E_Editable_Smart_Data
    int selection_pos;
    int selection_visible;
    int password_mode;
-   
+
    char *text;
    int char_length;
    int unicode_length;
    int allocated_length;
-   
+
    int cursor_width;
    int selection_on_fg;
    int average_char_w;
@@ -59,7 +59,6 @@ static void _e_editable_clip_unset(Evas_Object *object);
 static Evas_Smart *_e_editable_smart = NULL;
 static int _e_editable_smart_use = 0;
 
-
 /* externally accessible functions */
 
 /**
@@ -95,7 +94,7 @@ e_editable_add(Evas *evas)
 	_e_editable_smart = evas_smart_class_new(&sc);
         _e_editable_smart_use = 0;
      }
-   
+
    return evas_object_smart_add(evas, _e_editable_smart);
 }
 
@@ -114,33 +113,29 @@ e_editable_theme_set(Evas_Object *editable, const char *category, const char *gr
    E_Editable_Smart_Data *sd;
    char *obj_group;
    const char *data;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
-   if ((!category) || (!group))
-     return;
+   if ((!category) || (!group)) return;
    obj_group = alloca(strlen(group) + strlen("/selection") + 1);
-   
+
    /* Gets the theme for the text object */
    sprintf(obj_group, "%s/text", group);
    e_theme_edje_object_set(sd->text_object, category, obj_group);
    sd->average_char_w = -1;
    sd->average_char_h = -1;
-   
-   
+
    /* Gets the theme for the cursor */
    sprintf(obj_group, "%s/cursor", group);
    e_theme_edje_object_set(sd->cursor_object, category, obj_group);
-   
+
    edje_object_size_min_get(sd->cursor_object, &sd->cursor_width, NULL);
-   if (sd->cursor_width < 1)
-     sd->cursor_width = 1;
-   
-   
+   if (sd->cursor_width < 1) sd->cursor_width = 1;
+
    /* Gets the theme for the selection */
    sprintf(obj_group, "%s/selection", group);
    e_theme_edje_object_set(sd->selection_object, category, obj_group);
-   
+
    data = edje_object_data_get(sd->selection_object, "on_foreground");
    if ((data) && (strcmp(data, "1") == 0))
      {
@@ -152,7 +147,7 @@ e_editable_theme_set(Evas_Object *editable, const char *category, const char *gr
         sd->selection_on_fg = 0;
         evas_object_stack_below(sd->selection_object, sd->text_object);
      }
-   
+
    _e_editable_text_update(editable);
    _e_editable_cursor_update(editable);
 }
@@ -169,12 +164,11 @@ EAPI void
 e_editable_password_set(Evas_Object *editable, int password_mode)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
-   if (sd->password_mode == password_mode)
-     return;
-   
+   if (sd->password_mode == password_mode) return;
+
    sd->password_mode = password_mode;
    _e_editable_text_update(editable);
    _e_editable_cursor_update(editable);
@@ -190,7 +184,7 @@ EAPI int
 e_editable_password_get(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return 0;
    return sd->password_mode;
@@ -206,18 +200,17 @@ EAPI void
 e_editable_text_set(Evas_Object *editable, const char *text)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
-  
-   if (sd->password_mode) 
-     memset(sd->text, 0, sd->char_length);
+
+   if (sd->password_mode) memset(sd->text, 0, sd->char_length);
    free(sd->text);
    sd->text = NULL;
    sd->char_length = 0;
    sd->unicode_length = 0;
    sd->allocated_length = -1;
-   
+
    if (_e_editable_text_insert(editable, 0, text) <= 0)
      {
         sd->text = malloc((E_EDITABLE_BLOCK_SIZE + 1) * sizeof(char));
@@ -227,7 +220,7 @@ e_editable_text_set(Evas_Object *editable, const char *text)
         sd->allocated_length = E_EDITABLE_BLOCK_SIZE;
         _e_editable_text_update(editable);
      }
-   
+
    sd->cursor_pos = sd->unicode_length;
    sd->selection_pos = sd->unicode_length;
    _e_editable_cursor_update(editable);
@@ -243,7 +236,7 @@ EAPI const char *
 e_editable_text_get(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return NULL;
    return sd->text;
@@ -263,33 +256,27 @@ e_editable_text_range_get(Evas_Object *editable, int start, int end)
 {
    E_Editable_Smart_Data *sd;
    char *range;
-   int start_id, end_id;
-   int i;
-   
+   int start_id = 0, end_id = 0, i;
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return NULL;
-   
+
    start = E_CLAMP(start, 0, sd->unicode_length);
    end = E_CLAMP(end, 0, sd->unicode_length);
-   if (end <= start)
-     return NULL;
-   
-   start_id = 0;
-   end_id = 0;
+   if (end <= start) return NULL;
+
    for (i = 0; i < end; i++)
      {
         end_id = evas_string_char_next_get(sd->text, end_id, NULL);
-        if (i < start)
-          start_id = end_id;
+        if (i < start) start_id = end_id;
      }
-   
-   if (end_id <= start_id)
-      return NULL;
-   
+
+   if (end_id <= start_id) return NULL;
+
    range = malloc((end_id - start_id + 1) * sizeof(char));
    strncpy(range, &sd->text[start_id], end_id - start_id);
    range[end_id - start_id] = '\0';
-   
+
    return range;
 }
 
@@ -305,7 +292,7 @@ EAPI int
 e_editable_text_length_get(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return 0;
    return sd->unicode_length;
@@ -324,19 +311,18 @@ e_editable_insert(Evas_Object *editable, int pos, const char *text)
 {
    E_Editable_Smart_Data *sd;
    int unicode_length;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return 0;
-   
+
    unicode_length = _e_editable_text_insert(editable, pos, text);
-   if (unicode_length <= 0)
-     return 0;
-   
+   if (unicode_length <= 0) return 0;
+
    if (sd->cursor_pos >= pos)
      e_editable_cursor_pos_set(editable, sd->cursor_pos + unicode_length);
    if (sd->selection_pos >= pos)
      e_editable_selection_pos_set(editable, sd->selection_pos + unicode_length);
-   
+
    _e_editable_text_position_update(editable, -1);
    return 1;
 }
@@ -355,24 +341,23 @@ e_editable_delete(Evas_Object *editable, int start, int end)
 {
    E_Editable_Smart_Data *sd;
    int unicode_length;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return 0;
-   
+
    unicode_length = _e_editable_text_delete(editable, start, end);
-   if (unicode_length <= 0)
-     return 0;
-   
+   if (unicode_length <= 0) return 0;
+
    if (sd->cursor_pos > end)
      e_editable_cursor_pos_set(editable, sd->cursor_pos - unicode_length);
    else if (sd->cursor_pos > start)
      e_editable_cursor_pos_set(editable, start);
-   
+
    if (sd->selection_pos > end)
      e_editable_selection_pos_set(editable, sd->selection_pos - unicode_length);
    else if (sd->selection_pos > start)
      e_editable_selection_pos_set(editable, start);
-   
+
    _e_editable_text_position_update(editable, -1);
    return 1;
 }
@@ -387,14 +372,13 @@ EAPI void
 e_editable_cursor_pos_set(Evas_Object *editable, int pos)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
-   
+
    pos = E_CLAMP(pos, 0, sd->unicode_length);
-   if ((sd->cursor_pos == pos))
-     return;
-   
+   if ((sd->cursor_pos == pos)) return;
+
    sd->cursor_pos = pos;
    _e_editable_cursor_update(editable);
 }
@@ -409,7 +393,7 @@ EAPI int
 e_editable_cursor_pos_get(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return 0;
    return sd->cursor_pos;
@@ -424,7 +408,7 @@ EAPI void
 e_editable_cursor_move_to_start(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
    e_editable_cursor_pos_set(editable, 0);
@@ -439,7 +423,7 @@ EAPI void
 e_editable_cursor_move_to_end(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
    e_editable_cursor_pos_set(editable, sd->unicode_length);
@@ -454,7 +438,7 @@ EAPI void
 e_editable_cursor_move_left(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
    e_editable_cursor_pos_set(editable, sd->cursor_pos - 1);
@@ -469,7 +453,7 @@ EAPI void
 e_editable_cursor_move_right(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
    e_editable_cursor_pos_set(editable, sd->cursor_pos + 1);
@@ -484,12 +468,11 @@ EAPI void
 e_editable_cursor_show(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
-   if (sd->cursor_visible)
-     return;
-   
+   if (sd->cursor_visible) return;
+
    sd->cursor_visible = 1;
    if (evas_object_visible_get(editable))
      {
@@ -507,12 +490,11 @@ EAPI void
 e_editable_cursor_hide(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
-   if (!sd->cursor_visible)
-     return;
-   
+   if (!sd->cursor_visible) return;
+
    sd->cursor_visible = 0;
    evas_object_hide(sd->cursor_object);
 }
@@ -527,14 +509,13 @@ EAPI void
 e_editable_selection_pos_set(Evas_Object *editable, int pos)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
-   
+
    pos = E_CLAMP(pos, 0, sd->unicode_length);
-   if ((sd->selection_pos == pos))
-     return;
-   
+   if (sd->selection_pos == pos) return;
+
    sd->selection_pos = pos;
    _e_editable_selection_update(editable);
 }
@@ -549,7 +530,7 @@ EAPI int
 e_editable_selection_pos_get(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return 0;
    return sd->selection_pos;
@@ -564,7 +545,7 @@ EAPI void
 e_editable_selection_move_to_start(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
    e_editable_selection_pos_set(editable, 0);
@@ -579,7 +560,7 @@ EAPI void
 e_editable_selection_move_to_end(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
    e_editable_selection_pos_set(editable, sd->unicode_length);
@@ -594,7 +575,7 @@ EAPI void
 e_editable_selection_move_left(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
    e_editable_selection_pos_set(editable, sd->selection_pos - 1);
@@ -609,7 +590,7 @@ EAPI void
 e_editable_selection_move_right(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
    e_editable_selection_pos_set(editable, sd->selection_pos + 1);
@@ -625,8 +606,7 @@ e_editable_selection_move_right(Evas_Object *editable)
 EAPI void
 e_editable_select_all(Evas_Object *editable)
 {
-   if (!editable)
-      return;
+   if (!editable) return;
    e_editable_selection_move_to_start(editable);
    e_editable_cursor_move_to_end(editable);
 }
@@ -641,7 +621,7 @@ EAPI void
 e_editable_unselect_all(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
    e_editable_selection_pos_set(editable, sd->cursor_pos);
@@ -654,37 +634,27 @@ EAPI void
 e_editable_select_word(Evas_Object *editable, int index)
 {
    E_Editable_Smart_Data *sd;
-   int spos, epos, i, pos;
-
-   if (!editable || (!(sd = evas_object_smart_data_get(editable))))
-     return;
+   int spos = 0, epos = -1, i = 0, pos = 0;
 
-   if (index < 0 || index >= sd->unicode_length)
+   if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
+   if ((index < 0) || (index >= sd->unicode_length)) return;
 
-   i = 0;
-   spos = 0;
-   epos = -1;
-   pos = 0;
    while (i < sd->char_length)
      {
 	if (sd->text[i] == ' ')
 	  {
-	     if (pos < index)
-	       spos = pos + 1;
+	     if (pos < index) spos = pos + 1;
 	     else if (pos > index)
 	       {
 		  epos = pos;
 		  break;
 	       }
 	  }
-
 	i = evas_string_char_next_get(sd->text, i, NULL);
 	pos++;
      }
-   if (epos == -1)
-     epos = pos;
-
+   if (epos == -1) epos = pos;
    e_editable_selection_pos_set(editable, spos);
    e_editable_cursor_pos_set(editable, epos);
 }
@@ -698,12 +668,10 @@ EAPI void
 e_editable_selection_show(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
-   if (sd->selection_visible)
-     return;
-   
+   if (sd->selection_visible) return;
    sd->selection_visible = 1;
    if ((evas_object_visible_get(editable)) &&
        (sd->cursor_pos != sd->selection_pos))
@@ -719,12 +687,10 @@ EAPI void
 e_editable_selection_hide(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
-   if (!sd->selection_visible)
-     return;
-   
+   if (!sd->selection_visible) return;
    sd->selection_visible = 0;
    evas_object_hide(sd->selection_object);
 }
@@ -750,32 +716,31 @@ e_editable_pos_get_from_coords(Evas_Object *editable, Evas_Coord x, Evas_Coord y
    Evas_Coord canvas_x, canvas_y;
    int index, pos, i, j;
    const char *text;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return 0;
    if (!(text_obj = edje_object_part_object_get(sd->text_object, "e.text.text")))
      return 0;
-   
+
    evas_object_geometry_get(editable, &ox, &oy, NULL, NULL);
    evas_object_geometry_get(text_obj, &tx, &ty, &tw, &th);
    canvas_x = ox + x;
    canvas_y = oy + y;
-   
+
    if ((canvas_y < ty) || (canvas_x < tx))
-      pos = 0;
+     pos = 0;
    else if ((canvas_y > (ty + th)) || (canvas_x > (tx + tw)))
-      pos = sd->unicode_length;
+     pos = sd->unicode_length;
    else
      {
         index = evas_object_text_char_coords_get(text_obj,
-                                               canvas_x - tx, canvas_y - ty,
-                                               &cx, NULL, &cw, NULL);
+                                                 canvas_x - tx, canvas_y - ty,
+                                                 &cx, NULL, &cw, NULL);
         text = evas_object_text_text_get(text_obj);
         if ((index >= 0) && (text))
           {
-             if ((canvas_x - tx) > (cx + (cw / 2)))
-               index++;
-             
+             if ((canvas_x - tx) > (cx + (cw / 2))) index++;
+
              i = 0;
              j = -1;
              pos = 0;
@@ -785,14 +750,10 @@ e_editable_pos_get_from_coords(Evas_Object *editable, Evas_Coord x, Evas_Coord y
                   j = i;
                   i = evas_string_char_next_get(text, i, NULL);
                }
-             
-             if (pos > sd->unicode_length)
-               pos = sd->unicode_length;
+             if (pos > sd->unicode_length) pos = sd->unicode_length;
           }
-        else
-          pos = 0;
+        else pos = 0;
      }
-   
    return pos;
 }
 
@@ -818,22 +779,20 @@ e_editable_char_size_get(Evas_Object *editable, int *w, int *h)
    Evas_Text_Style_Type style;
    int font_size;
 
-   if (w)   *w = 0;
-   if (h)   *h = 0;
-   
+   if (w) *w = 0;
+   if (h) *h = 0;
    if ((!editable) || (!(evas = evas_object_evas_get(editable))))
      return;
-   if (!(sd = evas_object_smart_data_get(editable)))
-     return;
+   if (!(sd = evas_object_smart_data_get(editable))) return;
    if (!(text_obj = edje_object_part_object_get(sd->text_object, "e.text.text")))
      return;
-   
+
    if ((sd->average_char_w <= 0) || (sd->average_char_h <= 0))
      {
         font_source = evas_object_text_font_source_get(text_obj);
         evas_object_text_font_get(text_obj, &font, &font_size);
         style = evas_object_text_style_get(text_obj);
-        
+
         obj = evas_object_text_add(evas);
         evas_object_scale_set(obj, edje_scale_get());
         evas_object_text_font_source_set(obj, font_source);
@@ -842,23 +801,21 @@ e_editable_char_size_get(Evas_Object *editable, int *w, int *h)
         evas_object_text_text_set(obj, text);
         evas_object_geometry_get(obj, NULL, NULL, &tw, &th);
         evas_object_del(obj);
-        
-        sd->average_char_w = tw / strlen(text);
+        sd->average_char_w = (tw / strlen(text));
         sd->average_char_h = th;
      }
-   
-   if (w)   *w = sd->average_char_w;
-   if (h)   *h = sd->average_char_h;
+   if (w) *w = sd->average_char_w;
+   if (h) *h = sd->average_char_h;
 }
 
 EAPI void
 e_editable_enable(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
-   
+
    edje_object_signal_emit(sd->text_object, "e,state,enabled", "e");
 }
 
@@ -866,10 +823,10 @@ EAPI void
 e_editable_disable(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
-   
+
    edje_object_signal_emit(sd->text_object, "e,state,disabled", "e");
 }
 /* Private functions */
@@ -880,40 +837,33 @@ static int
 _e_editable_text_insert(Evas_Object *editable, int pos, const char *text)
 {
    E_Editable_Smart_Data *sd;
-   int char_length, unicode_length;
+   int char_length = -1, unicode_length = -1;
    int prev_char_length, new_char_length, new_unicode_length;
-   int index;
-   int i;
-   
+   int index = 0, i = 0;
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return 0;
-   if ((!text) || (*text == '\0'))
-     return 0;
-   
-   if (pos < 0)
-     pos = 0;
+   if ((!text) || (*text == '\0')) return 0;
+
+   if (pos < 0) pos = 0;
    else if (pos > sd->unicode_length)
      pos = sd->unicode_length;
-   
-   char_length = -1;
-   unicode_length = -1;
+
    for (i = 0; i != char_length; i = evas_string_char_next_get(text, i, NULL))
      {
         char_length = i;
         unicode_length++;
      }
-   
-   index = 0;
+
    for (i = 0; i < pos; i++)
      index = evas_string_char_next_get(sd->text, index, NULL);
 
-   if ((unicode_length <= 0) || (char_length <= 0))
-     return 0;
-   
+   if ((unicode_length <= 0) || (char_length <= 0)) return 0;
+
    prev_char_length = sd->char_length;
    new_char_length = sd->char_length + char_length;
    new_unicode_length = sd->unicode_length + unicode_length;
-   
+
    if (new_char_length > sd->allocated_length)
      {
 	int new_allocated_length = E_EDITABLE_SIZE_TO_ALLOC(new_char_length);
@@ -948,14 +898,13 @@ _e_editable_text_insert(Evas_Object *editable, int pos, const char *text)
      }
    sd->unicode_length = new_unicode_length;
    sd->char_length = new_char_length;
-   
+
    if (prev_char_length > index)
      memmove(&sd->text[index + char_length], &sd->text[index], prev_char_length - index);
    strncpy(&sd->text[index], text, char_length);
    sd->text[sd->char_length] = '\0';
-   
+
    _e_editable_text_update(editable);
-   
    return unicode_length;
 }
 
@@ -965,37 +914,31 @@ static int
 _e_editable_text_delete(Evas_Object *editable, int start, int end)
 {
    E_Editable_Smart_Data *sd;
-   int start_id, end_id;
-   int i;
-   
+   int start_id = 0, end_id = 0, i = 0;
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return 0;
-   
+
    start = E_CLAMP(start, 0, sd->unicode_length);
    end = E_CLAMP(end, 0, sd->unicode_length);
-   if (end <= start)
-     return 0;
-   
-   start_id = 0;
-   end_id = 0;
+   if (end <= start) return 0;
+
    for (i = 0; i < end; i++)
      {
         end_id = evas_string_char_next_get(sd->text, end_id, NULL);
-        if (i < start)
-          start_id = end_id;
+        if (i < start) start_id = end_id;
      }
-   
-   if (end_id <= start_id)
-      return 0;
-   
+
+   if (end_id <= start_id) return 0;
+
    memmove(&sd->text[start_id], &sd->text[end_id], sd->char_length - end_id);
    sd->char_length -= (end_id - start_id);
    sd->unicode_length -= (end - start);
    sd->text[sd->char_length] = '\0';
-   
+
    _e_editable_text_update(editable);
-   
-   return end - start;
+
+   return (end - start);
 }
 
 /* Updates the position of the cursor
@@ -1007,25 +950,25 @@ _e_editable_cursor_update(Evas_Object *editable)
    const Evas_Object *text_obj;
    Evas_Coord tx, ty;
    Evas_Coord cx, cy, ch;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
    if (!(text_obj = edje_object_part_object_get(sd->text_object, "e.text.text")))
      return;
-      
+
    evas_object_geometry_get(text_obj, &tx, &ty, NULL, NULL);
    _e_editable_char_geometry_get_from_pos(editable, sd->cursor_pos,
                                           &cx, &cy, NULL, &ch);
-   
+
    evas_object_move(sd->cursor_object, tx + cx, ty + cy);
    evas_object_resize(sd->cursor_object, sd->cursor_width, ch);
-   
+
    if (sd->cursor_visible && evas_object_visible_get(editable))
      {
         evas_object_show(sd->cursor_object);
         edje_object_signal_emit(sd->cursor_object, "e,action,show,cursor", "e");
      }
-   
+
    _e_editable_selection_update(editable);
    _e_editable_text_position_update(editable, -1);
 }
@@ -1040,32 +983,31 @@ _e_editable_selection_update(Evas_Object *editable)
    Evas_Coord cx, cy;
    Evas_Coord sx, sy, sw, sh;
    int start_pos, end_pos;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
    if (!(text_obj = edje_object_part_object_get(sd->text_object, "e.text.text")))
      return;
-   
+
    if ((sd->cursor_pos == sd->selection_pos) || (!sd->selection_visible))
      evas_object_hide(sd->selection_object);
    else
      {
         evas_object_geometry_get(text_obj, &tx, &ty, NULL, NULL);
-        
         start_pos = (sd->cursor_pos <= sd->selection_pos) ?
-                    sd->cursor_pos : sd->selection_pos;
+          sd->cursor_pos : sd->selection_pos;
         end_pos = (sd->cursor_pos >= sd->selection_pos) ?
-                  sd->cursor_pos : sd->selection_pos;
-        
+          sd->cursor_pos : sd->selection_pos;
+
         _e_editable_char_geometry_get_from_pos(editable, start_pos,
                                                &cx, &cy, NULL, NULL);
         sx = tx + cx;
         sy = ty + cy;
-        
+
         _e_editable_char_geometry_get_from_pos(editable, end_pos,
                                                &cx, NULL, NULL, &sh);
         sw = tx + cx - sx;
-        
+
         evas_object_move(sd->selection_object, sx, sy);
         evas_object_resize(sd->selection_object, sw, sh);
         evas_object_show(sd->selection_object);
@@ -1080,14 +1022,14 @@ _e_editable_text_update(Evas_Object *editable)
 {
    E_Editable_Smart_Data *sd;
    Evas_Coord minw, minh;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
-   
+
    if (sd->password_mode)
      {
         char *text;
-        
+
         text = malloc((sd->unicode_length + 1) * sizeof(char));
         memset(text, '*', sd->unicode_length * sizeof(char));
         text[sd->unicode_length] = '\0';
@@ -1095,10 +1037,8 @@ _e_editable_text_update(Evas_Object *editable)
         free(text);
      }
    else
-     {
-        edje_object_part_text_set(sd->text_object, "e.text.text", sd->text);
-     }
-   
+     edje_object_part_text_set(sd->text_object, "e.text.text", sd->text);
+
    edje_object_size_min_calc(sd->text_object, &minw, &minh);
    evas_object_resize(sd->text_object, minw, minh);
 }
@@ -1114,24 +1054,23 @@ _e_editable_text_position_update(Evas_Object *editable, Evas_Coord real_w)
    Evas_Coord cx, cy, cw;
    Evas_Coord sx, sy;
    Evas_Coord offset_x = 0;
-   
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
-   
+
    evas_object_geometry_get(editable, &ox, &oy, &ow, NULL);
-   if (real_w >= 0)
-      ow = real_w;
+   if (real_w >= 0) ow = real_w;
    evas_object_geometry_get(sd->text_object, &tx, &ty, &tw, NULL);
    evas_object_geometry_get(sd->cursor_object, &cx, &cy, &cw, NULL);
    evas_object_geometry_get(sd->selection_object, &sx, &sy, NULL, NULL);
-   
+
    if (tw <= ow)
      offset_x = ox - tx;
    else if (cx < (ox + E_EDITABLE_CURSOR_MARGIN))
      offset_x = ox + E_EDITABLE_CURSOR_MARGIN - cx;
    else if ((cx + cw + E_EDITABLE_CURSOR_MARGIN) > (ox + ow))
      offset_x = (ox + ow) - (cx + cw + E_EDITABLE_CURSOR_MARGIN);
-     
+
    if (tw > ow)
      {
         if ((tx + offset_x) > ox)
@@ -1139,13 +1078,13 @@ _e_editable_text_position_update(Evas_Object *editable, Evas_Coord real_w)
         else if ((tx + tw + offset_x) < (ox + ow))
           offset_x = (ox + ow) - (tx + tw);
      }
-   
+
    if (offset_x != 0)
-   {
-      evas_object_move(sd->text_object, tx + offset_x, ty);
-      evas_object_move(sd->cursor_object, cx + offset_x, cy);
-      evas_object_move(sd->selection_object, sx + offset_x, sy);
-   }
+     {
+        evas_object_move(sd->text_object, tx + offset_x, ty);
+        evas_object_move(sd->cursor_object, cx + offset_x, cy);
+        evas_object_move(sd->selection_object, sx + offset_x, sy);
+     }
 }
 
 /* Gets the geometry of the char according to its utf-8 pos */
@@ -1156,25 +1095,21 @@ _e_editable_char_geometry_get_from_pos(Evas_Object *editable, int utf_pos, Evas_
    const Evas_Object *text_obj;
    const char *text;
    Evas_Coord x, w;
-   int index, i;
-   int last_pos;
-   int ret;
-   
-   if (cx)   *cx = 0;
-   if (cy)   *cy = 0;
-   if (cw)   *cw = 0;
-   if (ch)   *ch = 0;
-   
+   int index = 0, i, last_pos, ret;
+
+   if (cx) *cx = 0;
+   if (cy) *cy = 0;
+   if (cw) *cw = 0;
+   if (ch) *ch = 0;
+
    if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return 0;
    if (!(text_obj = edje_object_part_object_get(sd->text_object, "e.text.text")))
      return 0;
-   
+
    text = evas_object_text_text_get(text_obj);
    if ((!text) || (sd->unicode_length <= 0) || (utf_pos <= 0))
      {
-        if (cx)   *cx = 0;
-        if (cy)   *cy = 0;
         e_editable_char_size_get(editable, cw, ch);
         return 1;
      }
@@ -1187,15 +1122,13 @@ _e_editable_char_geometry_get_from_pos(Evas_Object *editable, int utf_pos, Evas_
           }
         else
           last_pos = 0;
-        
-        
-        index = 0;
+
         for (i = 0; i < utf_pos; i++)
           index = evas_string_char_next_get(text, index, NULL);
-        
+
         ret = evas_object_text_char_pos_get(text_obj, index, &x, cy, &w, ch);
-        if (cx)   *cx = x - 1 + (last_pos ? w : 0);
-        if (cw)   *cw = last_pos ? 1 : w;
+        if (cx) *cx = x - 1 + (last_pos ? w : 0);
+        if (cw) *cw = last_pos ? 1 : w;
         return ret;
      }
 }
@@ -1208,29 +1141,28 @@ _e_editable_smart_add(Evas_Object *object)
    Evas *evas;
    E_Editable_Smart_Data *sd;
    Evas_Coord ox, oy;
-   
+
    if ((!object) || !(evas = evas_object_evas_get(object)))
      return;
 
    sd = malloc(sizeof(E_Editable_Smart_Data));
-   if (!sd)
-     return;
-   
+   if (!sd) return;
+
    _e_editable_smart_use++;
    evas_object_smart_data_set(object, sd);
    evas_object_geometry_get(object, &ox, &oy, NULL, NULL);
-   
+
    sd->text = malloc((E_EDITABLE_BLOCK_SIZE + 1) * sizeof(char));
    sd->text[0] = '\0';
    sd->char_length = 0;
    sd->unicode_length = 0;
    sd->allocated_length = E_EDITABLE_BLOCK_SIZE;
-   
+
    sd->cursor_width = 1;
    sd->selection_on_fg = 0;
    sd->average_char_w = -1;
    sd->average_char_h = -1;
-   
+
    sd->cursor_pos = 0;
    sd->cursor_visible = 1;
    sd->selection_pos = 0;
@@ -1240,31 +1172,31 @@ _e_editable_smart_add(Evas_Object *object)
    sd->clip_object = evas_object_rectangle_add(evas);
    evas_object_move(sd->clip_object, ox, oy);
    evas_object_smart_member_add(sd->clip_object, object);
-   
+
    sd->event_object = evas_object_rectangle_add(evas);
    evas_object_color_set(sd->event_object, 0, 0, 0, 0);
    evas_object_clip_set(sd->event_object, sd->clip_object);
    evas_object_move(sd->event_object, ox, oy);
    evas_object_smart_member_add(sd->event_object, object);
-   
+
    sd->text_object = edje_object_add(evas);
    evas_object_pass_events_set(sd->text_object, 1);
    evas_object_clip_set(sd->text_object, sd->clip_object);
    evas_object_move(sd->text_object, ox, oy);
    evas_object_smart_member_add(sd->text_object, object);
-   
+
    sd->selection_object = edje_object_add(evas);
    evas_object_pass_events_set(sd->selection_object, 1);
    evas_object_clip_set(sd->selection_object, sd->clip_object);
    evas_object_move(sd->selection_object, ox, oy);
    evas_object_smart_member_add(sd->selection_object, object);
-   
+
    sd->cursor_object = edje_object_add(evas);
    evas_object_pass_events_set(sd->cursor_object, 1);
    evas_object_clip_set(sd->cursor_object, sd->clip_object);
    evas_object_move(sd->cursor_object, ox, oy);
    evas_object_smart_member_add(sd->cursor_object, object);
-   
+
    _e_editable_cursor_update(object);
 }
 
@@ -1273,21 +1205,20 @@ static void
 _e_editable_smart_del(Evas_Object *object)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!object) || (!(sd = evas_object_smart_data_get(object))))
      return;
-   
+
    evas_object_del(sd->clip_object);
    evas_object_del(sd->event_object);
    evas_object_del(sd->text_object);
    evas_object_del(sd->cursor_object);
    evas_object_del(sd->selection_object);
    /* Security - clear out memory that contained a password */
-   if (sd->password_mode) 
-     memset(sd->text, 0, sd->char_length);
+   if (sd->password_mode) memset(sd->text, 0, sd->char_length);
    free(sd->text);
    free(sd);
-   
+
    _e_editable_smart_use--;
    if (_e_editable_smart_use <= 0)
      {
@@ -1303,21 +1234,17 @@ _e_editable_smart_move(Evas_Object *object, Evas_Coord x, Evas_Coord y)
    E_Editable_Smart_Data *sd;
    Evas_Coord prev_x, prev_y;
    Evas_Coord ox, oy;
-   
+
    if ((!object) || (!(sd = evas_object_smart_data_get(object))))
      return;
-   
+
    evas_object_geometry_get(object, &prev_x, &prev_y, NULL, NULL);
-   
    evas_object_move(sd->clip_object, x, y);
    evas_object_move(sd->event_object, x, y);
-   
    evas_object_geometry_get(sd->text_object, &ox, &oy, NULL, NULL);
    evas_object_move(sd->text_object, ox + (x - prev_x), oy + (y - prev_y));
-   
    evas_object_geometry_get(sd->cursor_object, &ox, &oy, NULL, NULL);
    evas_object_move(sd->cursor_object, ox + (x - prev_x), oy + (y - prev_y));
-   
    evas_object_geometry_get(sd->selection_object, &ox, &oy, NULL, NULL);
    evas_object_move(sd->selection_object, ox + (x - prev_x), oy + (y - prev_y));
 }
@@ -1327,10 +1254,10 @@ static void
 _e_editable_smart_resize(Evas_Object *object, Evas_Coord w, Evas_Coord h)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!object) || (!(sd = evas_object_smart_data_get(object))))
      return;
-   
+
    evas_object_resize(sd->clip_object, w, h);
    evas_object_resize(sd->event_object, w, h);
    _e_editable_text_position_update(object, w);
@@ -1341,20 +1268,20 @@ static void
 _e_editable_smart_show(Evas_Object *object)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!object) || (!(sd = evas_object_smart_data_get(object))))
      return;
-   
+
    evas_object_show(sd->clip_object);
    evas_object_show(sd->event_object);
    evas_object_show(sd->text_object);
-   
+
    if (sd->cursor_visible)
      {
         evas_object_show(sd->cursor_object);
         edje_object_signal_emit(sd->cursor_object, "e,action,show,cursor", "e");
      }
-   
+
    if ((sd->selection_visible) && (sd->cursor_pos != sd->selection_pos))
      evas_object_show(sd->selection_object);
 }
@@ -1364,10 +1291,10 @@ static void
 _e_editable_smart_hide(Evas_Object *object)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!object) || (!(sd = evas_object_smart_data_get(object))))
      return;
-   
+
    evas_object_hide(sd->clip_object);
    evas_object_hide(sd->event_object);
    evas_object_hide(sd->text_object);
@@ -1380,7 +1307,7 @@ static void
 _e_editable_color_set(Evas_Object *object, int r, int g, int b, int a)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!object) || (!(sd = evas_object_smart_data_get(object))))
      return;
    evas_object_color_set(sd->clip_object, r, g, b, a);
@@ -1391,7 +1318,7 @@ static void
 _e_editable_clip_set(Evas_Object *object, Evas_Object *clip)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!object) || (!(sd = evas_object_smart_data_get(object))))
      return;
    evas_object_clip_set(sd->clip_object, clip);
@@ -1402,7 +1329,7 @@ static void
 _e_editable_clip_unset(Evas_Object *object)
 {
    E_Editable_Smart_Data *sd;
-   
+
    if ((!object) || (!(sd = evas_object_smart_data_get(object))))
      return;
    evas_object_clip_unset(sd->clip_object);
diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c
index bd58b9a..3ee31a3 100644
--- a/src/bin/e_exec.c
+++ b/src/bin/e_exec.c
@@ -402,6 +402,7 @@ _e_exec_error_dialog(Efreet_Desktop *desktop, const char *exec, Ecore_Exe_Event_
 	return;
      }
    cfdata->desktop = desktop;
+   if (cfdata->desktop) efreet_desktop_ref(cfdata->desktop);
    if (exec) cfdata->exec = strdup(exec);
    cfdata->error = error;
    cfdata->read = read;
@@ -508,6 +509,8 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    if (cfdata->error) ecore_exe_event_data_free(cfdata->error);
    if (cfdata->read) ecore_exe_event_data_free(cfdata->read);
 
+   if (cfdata->desktop) efreet_desktop_free(cfdata->desktop);
+
    E_FREE(cfdata->exec);
    E_FREE(cfdata->signal);
    E_FREE(cfdata->exit);
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index eaa39f9..07f9a2c 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -78,6 +78,7 @@ struct _E_Fm2_Smart_Data
    Ecore_Job        *refresh_job;
    E_Menu           *menu;
    E_Entry_Dialog   *entry_dialog;
+   E_Dialog         *image_dialog;
    unsigned char     iconlist_changed : 1;
    unsigned char     order_file : 1;
    unsigned char     typebuf_visible : 1;
@@ -127,6 +128,8 @@ struct _E_Fm2_Smart_Data
       int ox, oy;
       int x, y, w, h;
    } selrect;
+
+   E_Fm2_Icon         *iop_icon;
 };
 
 struct _E_Fm2_Region
@@ -147,6 +150,7 @@ struct _E_Fm2_Icon
    int               saved_rel;
    E_Menu           *menu;
    E_Entry_Dialog   *entry_dialog;
+   Evas_Object      *entry_widget;
    E_Config_Dialog  *prop_dialog;
    E_Dialog         *dialog;
 
@@ -304,12 +308,17 @@ static void _e_fm2_menu_post_cb(void *data, E_Menu *m);
 static void _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp);
 static void _e_fm2_icon_menu_post_cb(void *data, E_Menu *m);
 static void _e_fm2_icon_menu_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_fm2_icon_view_menu_pre(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_fm2_toggle_inherit_dir_props(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_fm2_view_menu_pre(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_fm2_view_menu_grid_icons_cb(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_fm2_view_menu_custom_icons_cb(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_fm2_view_menu_list_cb(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_fm2_view_menu_use_default_cb(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_fm2_view_menu_set_background_cb(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_fm2_view_menu_set_overlay_cb(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_fm2_view_image_sel(E_Fm2_Smart_Data *sd, const char *title, void (*ok_cb) (void *data, E_Dialog *dia), void (*clear_cb) (void *data, E_Dialog *dia));
+static void _e_fm2_view_image_sel_close(void *data, E_Dialog *dia);
 static void _e_fm2_refresh(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_fm2_toggle_hidden_files(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_fm2_toggle_ordering(void *data, E_Menu *m, E_Menu_Item *mi);
@@ -324,6 +333,12 @@ static void _e_fm2_file_rename_yes_cb(char *text, void *data);
 static void _e_fm2_file_rename_no_cb(void *data);
 static void _e_fm2_file_properties(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_fm2_file_properties_delete_cb(void *obj);
+static void _e_fm2_file_do_rename(const char *text, E_Fm2_Icon *ic);
+
+static Evas_Object* _e_fm2_icon_entry_widget_add(E_Fm2_Icon *ic);
+static void         _e_fm2_icon_entry_widget_del(E_Fm2_Icon *ic);
+static void         _e_fm2_icon_entry_widget_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void         _e_fm2_icon_entry_widget_accept(E_Fm2_Icon *ic);
 
 static void _e_fm_retry_abort_dialog(int pid, const char *str);
 static void _e_fm_retry_abort_delete_cb(void *obj);
@@ -344,6 +359,8 @@ static void _e_fm_error_abort_cb(void *data, E_Dialog *dialog);
 static void _e_fm_error_ignore_this_cb(void *data, E_Dialog *dialog);
 static void _e_fm_error_ignore_all_cb(void *data, E_Dialog *dialog);
 
+static void _e_fm_hal_error_dialog(const char *title, const char *msg, const char *pstr);
+
 static void _e_fm2_file_delete(Evas_Object *obj);
 static void _e_fm2_file_delete_menu(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_fm2_file_delete_delete_cb(void *obj);
@@ -393,6 +410,15 @@ static int _e_fm2_context_list_sort(const void *data1, const void *data2);
 static char *_e_fm_string_append_char(char *str, size_t *size, size_t *len, char c);
 static char *_e_fm_string_append_quoted(char *str, size_t *size, size_t *len, const char *src);
 
+void _e_fm2_path_parent_set(Evas_Object *obj, const char *path);
+
+static void _e_fm2_volume_mount(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_fm2_volume_unmount(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_fm2_volume_eject(void *data, E_Menu *m, E_Menu_Item *mi);
+
+static void _e_fm2_icon_removable_update(E_Fm2_Icon *ic);
+static void _e_fm2_volume_icon_update(E_Volume *v);
+
 static char *_e_fm2_meta_path = NULL;
 static Evas_Smart *_e_fm2_smart = NULL;
 static Eina_List *_e_fm2_list = NULL;
@@ -794,12 +820,54 @@ _e_fm2_cb_mount_fail(void *data)
 
    sd = evas_object_smart_data_get(data);
    if (!sd) return; // safety
-   /* FIXME; some dialog */
    if (sd->mount)
      {
-	e_fm2_hal_unmount(sd->mount);
+        // At this moment E_Fm2_Mount object already deleted in e_fm_hal.c
 	sd->mount = NULL;
-	evas_object_smart_callback_call(data, "dir_deleted", NULL);
+        if (sd->config->view.open_dirs_in_place)
+           e_fm2_path_set(data, "favorites", "/");
+        else
+           evas_object_smart_callback_call(data, "dir_deleted", NULL);
+     }
+}
+
+static void
+_e_fm2_cb_unmount_ok(void *data)
+{
+   E_Fm2_Smart_Data *sd;
+
+   sd = evas_object_smart_data_get(data);
+   if (!sd) return;
+   if (sd->mount)
+     {
+        sd->mount = NULL;
+        if (sd->config->view.open_dirs_in_place)
+           _e_fm2_path_parent_set(data, sd->realpath);
+        else
+           evas_object_smart_callback_call(data, "dir_deleted", NULL);
+     }
+}
+
+void
+_e_fm2_path_parent_set(Evas_Object *obj, const char *path)
+{
+   char buf[PATH_MAX], *p;
+   int idx;
+
+   p = strrchr(path, '/');
+   if (!p || (p == path))
+      e_fm2_path_set(obj, "/", "/");
+   else
+     {
+        idx = p - path;
+        if (idx < PATH_MAX)
+          {
+             strncpy(buf, path, idx);
+             buf[idx] = '\0';
+             e_fm2_path_set(obj, "/", buf);
+          }
+        else
+          e_fm2_path_set(obj, "/", "/");
      }
 }
 
@@ -907,7 +975,7 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path)
 	if (v)
 	  sd->mount = e_fm2_hal_mount(v,
 				     _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail,
-				     NULL, NULL, obj);
+				     _e_fm2_cb_unmount_ok, NULL, obj);
      }
    else if (sd->config->view.open_dirs_in_place == 0)
      {
@@ -916,7 +984,7 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path)
 	if (m)
 	  sd->mount = e_fm2_hal_mount(m->volume,
 				     _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail,
-				     NULL, NULL, obj);
+				     _e_fm2_cb_unmount_ok, NULL, obj);
      }
 
    if (!sd->mount || sd->mount->mounted)
@@ -2540,6 +2608,19 @@ _e_fm2_client_unmount(const char *udi)
    return _e_fm_client_send_new(E_FM_OP_UNMOUNT, (void *)d, l);
 }
 
+EAPI int
+_e_fm2_client_eject(const char *udi)
+{
+   char *data;
+   int size;
+
+   size = strlen(udi) + 1;
+   data = alloca(size);
+   strcpy(data, udi);
+
+   return _e_fm_client_send_new(E_FM_OP_EJECT, data, size);
+}
+
 static void
 _e_fm2_client_monitor_list_end(Evas_Object *obj)
 {
@@ -2812,12 +2893,17 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
    while (dels)
      {
 	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;
-	evas_object_smart_callback_call(obj, "dir_deleted", NULL);
+	if (sd->config->view.open_dirs_in_place)
+          _e_fm2_path_parent_set(obj, sd->realpath);
+	else
+	  evas_object_smart_callback_call(obj, "dir_deleted", NULL);
      }
    _e_fm2_list_walking--;
    if (_e_fm2_list_walking == 0)
@@ -2864,7 +2950,13 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
 	     E_Volume *v;
 
 	     v = eet_data_descriptor_decode(_e_volume_edd, e->data, e->size);
-	     if (v) e_fm2_hal_volume_add(v);
+	     if (v) 
+	       {
+	          e_fm2_hal_volume_add(v);
+	          if (e_config->hal_auto_mount && !v->mounted && !v->first_time)
+	             _e_fm2_client_mount(v->udi, v->mount_point);
+	          v->first_time = 0;
+	       }
 	  }
 	break;
 
@@ -2889,7 +2981,21 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
 	     udi = e->data;
 	     mountpoint = udi + strlen(udi) + 1;
 	     v = e_fm2_hal_volume_find(udi);
-	     if (v) e_fm2_hal_mount_add(v, mountpoint);
+	     if (v) 
+	        {
+	           e_fm2_hal_mount_add(v, mountpoint);
+	           _e_fm2_volume_icon_update(v);
+	           if (e_config->hal_auto_open && !eina_list_count(v->mounts))
+	             {
+	                E_Action *a;
+	                Eina_List *m;
+
+	                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);
+	             }
+	        }
 	  }
 	break;
 
@@ -2901,15 +3007,62 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
 
 	     udi = e->data;
 	     v = e_fm2_hal_volume_find(udi);
-	     if (v)
-	       {
-		  v->mounted = 0;
-		  if (v->mount_point) free(v->mount_point);
-		  v->mount_point = NULL;
-	       }
+	     if (v) 
+	        {
+	           e_fm2_hal_mount_del(v);
+	           _e_fm2_volume_icon_update(v);
+	        }
 	  }
 	break;
 
+      case E_FM_OP_EJECT_DONE:
+        break;
+        
+      case E_FM_OP_MOUNT_ERROR:/*mount error*/
+        if (e->data && (e->size > 1))
+          {
+             E_Volume *v;
+             char *udi;
+
+             udi = e->data;
+             v = e_fm2_hal_volume_find(udi);
+             if (v) 
+               {
+                  _e_fm_hal_error_dialog(_("Mount Error"), _("Can't mount device"), e->data);
+                  e_fm2_hal_mount_fail(v);
+               }
+          }
+        break;
+        
+      case E_FM_OP_UNMOUNT_ERROR:/*unmount error*/
+        if (e->data && (e->size > 1))
+          {
+             E_Volume *v;
+             char *udi;
+
+             udi = e->data;
+             v = e_fm2_hal_volume_find(udi);
+             if (v)
+               {
+                  _e_fm_hal_error_dialog(_("Unmount Error"), _("Can't unmount device"), e->data);
+                  e_fm2_hal_unmount_fail(v);
+               }
+          }
+        break;
+        
+      case E_FM_OP_EJECT_ERROR:
+        if (e->data && (e->size > 1))
+          {
+             E_Volume *v;
+             char *udi;
+
+             udi = e->data;
+             v = e_fm2_hal_volume_find(udi);
+             if (v)
+                _e_fm_hal_error_dialog(_("Eject Error"), _("Can't eject device"), e->data);
+          }
+        break;
+        
       case E_FM_OP_ERROR:/*error*/
 	 printf("%s:%s(%d) Error from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, (char *)e->data);
 	 _e_fm_error_dialog(e->ref, e->data);
@@ -4453,6 +4606,8 @@ _e_fm2_icon_free(E_Fm2_Icon *ic)
 	e_object_del(E_OBJECT(ic->entry_dialog));
 	ic->entry_dialog = NULL;
      }
+   if (ic->entry_widget)
+     _e_fm2_icon_entry_widget_del(ic);
    if (ic->prop_dialog)
      {
 	e_object_del(E_OBJECT(ic->prop_dialog));
@@ -4556,10 +4711,9 @@ _e_fm2_icon_realize(E_Fm2_Icon *ic)
         if ((selectraise) && (!strcmp(selectraise, "on")))
 	  evas_object_stack_below(ic->obj, ic->sd->drop);
      }
-   if (ic->info.removable_full)
-     edje_object_signal_emit(ic->obj_icon, "e,state,removable,full", "e");
-//   else
-//     edje_object_signal_emit(ic->obj_icon, "e,state,removable,empty", "e");
+
+   if (ic->info.removable)
+      _e_fm2_icon_removable_update(ic);
 }
 
 static void
@@ -4669,6 +4823,9 @@ _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);
+
 	edje_object_signal_emit(ic->obj, "e,state,selected", "e");
 	edje_object_signal_emit(ic->obj_icon, "e,state,selected", "e");
 	evas_object_stack_below(ic->obj, ic->sd->drop);
@@ -4688,6 +4845,9 @@ _e_fm2_icon_deselect(E_Fm2_Icon *ic)
      {
 	const char *stacking, *selectraise;
 
+	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");
         stacking = edje_object_data_get(ic->obj, "stacking");
@@ -6297,6 +6457,10 @@ _e_fm2_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
 
    ic = data;
    ev = event_info;
+
+   if (ic->entry_widget)
+      return;
+
    if ((ev->button == 1) && (ev->flags & EVAS_BUTTON_DOUBLE_CLICK))
      {
 	/* if its a directory && open dirs in-place is set then change the dir
@@ -6340,6 +6504,9 @@ _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 ((ev->button == 1) && (!ic->drag.dnd))
      {
 	if (!(ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD))
@@ -6449,6 +6616,10 @@ _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 (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if ((ic->drag.start) && (ic->sd->eobj))
      {
@@ -6656,6 +6827,9 @@ _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 (evas_key_modifier_is_set(ev->modifiers, "Control"))
      {
 	if (!strcmp(ev->key, "x"))
@@ -7337,6 +7511,11 @@ _e_fm2_smart_del(Evas_Object *obj)
 	e_object_del(E_OBJECT(sd->entry_dialog));
 	sd->entry_dialog = NULL;
      }
+   if (sd->image_dialog)
+     {
+        e_object_del(E_OBJECT(sd->image_dialog));
+        sd->image_dialog = NULL;
+     }
    if (sd->scroll_job) ecore_job_del(sd->scroll_job);
    if (sd->resize_job) ecore_job_del(sd->resize_job);
    if (sd->refresh_job) ecore_job_del(sd->refresh_job);
@@ -7693,7 +7872,7 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
 	     mi = e_menu_item_new(mn);
 	     e_menu_item_label_set(mi, _("View Mode"));
 	     e_util_menu_item_theme_icon_set(mi, "preferences-appearance");
-	     e_menu_item_submenu_pre_callback_set(mi, _e_fm2_view_menu_pre, sd);
+	     e_menu_item_submenu_pre_callback_set(mi, _e_fm2_icon_view_menu_pre, sd);
 	  }
 	if (!(sd->icon_menu.flags & E_FM2_MENU_NO_REFRESH))
 	  {
@@ -7747,6 +7926,7 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
 		  e_menu_item_callback_set(mi, _e_fm2_new_directory, sd);
 	       }
 	  }
+	if (!ic->info.removable) {
 	if (!(sd->icon_menu.flags & E_FM2_MENU_NO_CUT))
 	  {
 	     if (ecore_file_can_write(sd->realpath))
@@ -7795,7 +7975,8 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
 		  e_menu_item_callback_set(mi, _e_fm2_file_symlink_menu, sd);
 	       }
 	  }
-
+	}
+	
 	can_w = 0;
 	can_w2 = 1;
 	if (ic->sd->order_file)
@@ -7839,7 +8020,7 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
 	  protect = 0;
 	sel = eina_list_free(sel);
 
-	if ((can_w) && (can_w2) && !(protect))
+	if ((can_w) && (can_w2) && !(protect) && !ic->info.removable)
 	  {
 	     mi = e_menu_item_new(mn);
 	     e_menu_item_separator_set(mi, 1);
@@ -7861,10 +8042,42 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
 	       }
 	  }
 
-	mi = e_menu_item_new(mn);
-	e_menu_item_label_set(mi, _("Properties"));
-	e_util_menu_item_theme_icon_set(mi, "document-properties");
-	e_menu_item_callback_set(mi, _e_fm2_file_properties, ic);
+	if (ic->info.removable)
+	  {
+	     E_Volume *v;
+	     
+             v = e_fm2_hal_volume_find(ic->info.link);
+             if (v)
+               {
+                  mi = e_menu_item_new(mn);
+                  e_menu_item_separator_set(mi, 1);
+
+                  mi = e_menu_item_new(mn);
+                  if (v->mounted)
+                    {
+                       e_menu_item_label_set(mi, _("Unmount"));
+                       e_menu_item_callback_set(mi, _e_fm2_volume_unmount, v);
+                    }
+                  else
+                    {
+                       e_menu_item_label_set(mi, _("Mount"));
+                       e_menu_item_callback_set(mi, _e_fm2_volume_mount, v);
+                    }
+                  
+                  mi = e_menu_item_new(mn);
+                  e_menu_item_label_set(mi, _("Eject"));
+                  e_util_menu_item_theme_icon_set(mi, "media-eject");
+                  e_menu_item_callback_set(mi, _e_fm2_volume_eject, v);
+
+                  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, _("Properties"));
+        e_util_menu_item_theme_icon_set(mi, "document-properties");
+        e_menu_item_callback_set(mi, _e_fm2_file_properties, ic);
 
 	if (ic->info.mime)
 	  {
@@ -8115,20 +8328,11 @@ _e_fm2_toggle_inherit_dir_props(void *data, E_Menu *m, E_Menu_Item *mi)
 }
 
 static void
-_e_fm2_view_menu_pre(void *data, E_Menu *m, E_Menu_Item *mi)
+_e_fm2_view_menu_common(E_Menu *subm, E_Fm2_Smart_Data *sd)
 {
-   E_Menu *subm;
-   E_Fm2_Smart_Data *sd;
-   E_Fm2_Config *cfg;
+   E_Menu_Item *mi;
    char view_mode;
 
-   sd = data;
-   cfg = e_fm2_config_get(sd->obj);
-
-   subm = e_menu_new();
-   e_object_data_set(E_OBJECT(subm), sd);
-   e_menu_item_submenu_set(mi, subm);
-
    view_mode = _e_fm2_view_mode_get(sd);
 
    mi = e_menu_item_new(subm);
@@ -8179,6 +8383,55 @@ _e_fm2_view_menu_pre(void *data, E_Menu *m, E_Menu_Item *mi)
    e_menu_item_label_set(mi, buf);
    e_menu_item_submenu_pre_callback_set(mi, _e_fm2_view_menu_icon_size_pre, sd);
 }
+                            
+static void
+_e_fm2_icon_view_menu_pre(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+   E_Menu *subm;
+   E_Fm2_Smart_Data *sd;
+
+   sd = data;
+
+   subm = e_menu_new();
+   e_object_data_set(E_OBJECT(subm), sd);
+   e_menu_item_submenu_set(mi, subm);
+
+   _e_fm2_view_menu_common(subm, sd);
+}
+
+static void
+_e_fm2_view_menu_pre(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+   E_Menu *subm;
+   E_Fm2_Smart_Data *sd;
+   char buf[PATH_MAX];
+   int access_ok;
+   sd = data;
+
+   subm = e_menu_new();
+   e_object_data_set(E_OBJECT(subm), sd);
+   e_menu_item_submenu_set(mi, subm);
+
+   _e_fm2_view_menu_common(subm, sd);
+
+   snprintf(buf, sizeof(buf), "%s/.directory.desktop", sd->realpath);
+   access_ok = ecore_file_exists(buf) ? ecore_file_can_write(buf) 
+                                      : ecore_file_can_write(sd->realpath); 
+   if (access_ok)
+     {
+        mi = e_menu_item_new(subm);
+        e_menu_item_separator_set(mi, 1);
+   
+        mi = e_menu_item_new(subm);
+        e_menu_item_label_set(mi, _("Set background..."));
+        e_util_menu_item_theme_icon_set(mi, "preferences-desktop-wallpaper");
+        e_menu_item_callback_set(mi, _e_fm2_view_menu_set_background_cb, sd);
+   
+        mi = e_menu_item_new(subm);
+        e_menu_item_label_set(mi, _("Set overlay..."));
+        e_menu_item_callback_set(mi, _e_fm2_view_menu_set_overlay_cb, sd);
+     }
+}
 
 static void
 _e_fm2_view_menu_grid_icons_cb(void *data, E_Menu *m, E_Menu_Item *mi)
@@ -8248,6 +8501,181 @@ _e_fm2_view_menu_use_default_cb(void *data, E_Menu *m, E_Menu_Item *mi)
 }
 
 static void
+_e_fm2_view_image_sel(E_Fm2_Smart_Data *sd, const char *title, 
+                      void (*ok_cb) (void *data, E_Dialog *dia),
+                      void (*clear_cb) (void *data, E_Dialog *dia))
+{
+   E_Manager *man;
+   E_Container *con;
+   E_Dialog *dia;
+   Evas_Object *o;
+   Evas_Coord w, h;
+   
+   man = e_manager_current_get();
+   if (!man) return;
+   con = e_container_current_get(man);
+   if (!con) return;
+
+   dia = e_dialog_new(con, "E", "_fm2_view_image_select_dialog");
+   if (!dia) return;
+   e_dialog_title_set(dia, 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_dialog_content_set(dia, o, w, h);
+   dia->data = o;
+
+   e_dialog_button_add(dia, _("OK"), NULL, ok_cb, sd);
+   e_dialog_button_add(dia, _("Clear"), NULL, clear_cb, sd);
+   e_dialog_button_add(dia, _("Cancel"), NULL, _e_fm2_view_image_sel_close, sd);
+   e_dialog_resizable_set(dia, 1);
+   e_win_centered_set(dia->win, 1);
+   e_dialog_show(dia);
+
+   sd->image_dialog = dia;
+}
+
+static void
+_e_fm2_view_image_sel_close(void *data, E_Dialog *dia)
+{
+   E_Fm2_Smart_Data *sd;
+   
+   sd = data;
+   e_object_del(E_OBJECT(dia));
+   sd->image_dialog = NULL;
+}
+
+static void
+_custom_file_key_set(E_Fm2_Smart_Data *sd, const char *key, const char *value)
+{
+   Efreet_Desktop *ef;
+   char buf[PATH_MAX];
+   int len;
+   
+   snprintf(buf, sizeof(buf), "%s/.directory.desktop", sd->realpath);
+   ef = efreet_desktop_new(buf);
+   if (!ef)
+     {
+        ef = efreet_desktop_empty_new(buf);
+        if (!ef) return;
+        ef->type = EFREET_DESKTOP_TYPE_DIRECTORY;
+        ef->name = strdup("Directory look and feel");
+     }
+   
+   len = strlen(sd->realpath);
+   if (!strncmp(value, sd->realpath, len))
+      efreet_desktop_x_field_set(ef, key, value + len + 1);
+   else
+      efreet_desktop_x_field_set(ef, key, value);
+   
+   efreet_desktop_save(ef);
+   efreet_desktop_free(ef);
+}
+
+static void
+_custom_file_key_del(E_Fm2_Smart_Data *sd, const char *key)
+{
+   Efreet_Desktop *ef;
+   char buf[PATH_MAX];
+
+   snprintf(buf, sizeof(buf), "%s/.directory.desktop", sd->realpath);
+   ef = efreet_desktop_new(buf);
+   if (!ef) return;
+   
+   if (efreet_desktop_x_field_del(ef, key))
+      efreet_desktop_save(ef);
+   
+   efreet_desktop_free(ef);
+}
+
+static void
+_set_background_cb(void *data, E_Dialog *dia)
+{
+  E_Fm2_Smart_Data *sd;
+  const char *file;
+  
+  sd = data;
+  if (!sd) return;
+  
+  file = e_widget_fsel_selection_path_get(dia->data);
+
+  if (file)
+     _custom_file_key_set(sd, "X-Enlightenment-Directory-Wallpaper", file);
+  
+  _e_fm2_view_image_sel_close(data, dia);
+  evas_object_smart_callback_call(sd->obj, "dir_changed", NULL);
+}
+
+static void
+_clear_background_cb(void *data, E_Dialog *dia)
+{
+   E_Fm2_Smart_Data *sd;
+   
+   sd = data;
+   if (!sd) return;
+   
+   _e_fm2_view_image_sel_close(data, dia);
+   
+   _custom_file_key_del(sd, "X-Enlightenment-Directory-Wallpaper");
+   evas_object_smart_callback_call(sd->obj, "dir_changed", NULL);
+}
+
+static void
+_e_fm2_view_menu_set_background_cb(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+   E_Fm2_Smart_Data *sd;
+   
+   sd = data;
+   if (sd->image_dialog) return;
+   
+   _e_fm2_view_image_sel(sd, _("Set background..."), _set_background_cb, _clear_background_cb);
+}
+
+static void
+_set_overlay_cb(void *data, E_Dialog *dia)
+{
+  E_Fm2_Smart_Data *sd;
+  const char *file;
+  
+  sd = data;
+  if (!sd) return;
+  
+  file = e_widget_fsel_selection_path_get(dia->data);
+
+  if (file)
+     _custom_file_key_set(sd, "X-Enlightenment-Directory-Overlay", file);
+
+  _e_fm2_view_image_sel_close(data, dia);
+  evas_object_smart_callback_call(sd->obj, "dir_changed", NULL);
+}
+
+static void
+_clear_overlay_cb(void *data, E_Dialog *dia)
+{
+   E_Fm2_Smart_Data *sd;
+   
+   sd = data;
+   if (!sd) return;
+   
+   _e_fm2_view_image_sel_close(data, dia);
+
+   _custom_file_key_del(sd, "X-Enlightenment-Directory-Overlay");
+   evas_object_smart_callback_call(sd->obj, "dir_changed", NULL);
+}
+
+static void
+_e_fm2_view_menu_set_overlay_cb(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+   E_Fm2_Smart_Data *sd;
+
+   sd = data;
+   if (sd->image_dialog) return;
+   
+   _e_fm2_view_image_sel(sd, _("Set overlay..."), _set_overlay_cb, _clear_overlay_cb);
+}
+
+static void
 _e_fm2_refresh(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Fm2_Smart_Data *sd;
@@ -8370,27 +8798,81 @@ static void
 _e_fm2_file_rename(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Fm2_Icon *ic;
-   E_Manager *man;
-   E_Container *con;
    char text[PATH_MAX + 256];
 
    ic = data;
-   if (ic->entry_dialog) return;
+   if (ic->entry_dialog || ic->entry_widget) return;
 
-   man = e_manager_current_get();
-   if (!man) return;
-   con = e_container_current_get(man);
-   if (!con) return;
+   if (!_e_fm2_icon_entry_widget_add(ic))
+     {
+        snprintf(text, PATH_MAX + 256,
+	             _("Rename %s to:"),
+	             ic->info.file);
+        ic->entry_dialog = e_entry_dialog_show(_("Rename File"), "edit-rename",
+		                   text, ic->info.file, NULL, NULL,
+					       _e_fm2_file_rename_yes_cb,
+					       _e_fm2_file_rename_no_cb, ic);
+        E_OBJECT(ic->entry_dialog)->data = ic;
+        e_object_del_attach_func_set(E_OBJECT(ic->entry_dialog), _e_fm2_file_rename_delete_cb);
+     }
+}
+
+static Evas_Object*
+_e_fm2_icon_entry_widget_add(E_Fm2_Icon *ic)
+{
+   Evas_Object *eo;
+
+   if (ic->sd->iop_icon)
+      _e_fm2_icon_entry_widget_accept(ic->sd->iop_icon);
+
+   if (!edje_object_part_exists(ic->obj, "e.swallow.entry"))
+      return NULL;
 
-   snprintf(text, PATH_MAX + 256,
-	    _("Rename %s to:"),
-	    ic->info.file);
-   ic->entry_dialog = e_entry_dialog_show(_("Rename File"), "edit-rename",
-					  text, ic->info.file, NULL, NULL,
-					  _e_fm2_file_rename_yes_cb,
-					  _e_fm2_file_rename_no_cb, ic);
-   E_OBJECT(ic->entry_dialog)->data = ic;
-   e_object_del_attach_func_set(E_OBJECT(ic->entry_dialog), _e_fm2_file_rename_delete_cb);
+   ic->entry_widget = e_widget_entry_add(evas_object_evas_get(ic->obj),
+                                         NULL, NULL, NULL, NULL);
+   evas_object_event_callback_add(ic->entry_widget, EVAS_CALLBACK_KEY_DOWN,
+                                  _e_fm2_icon_entry_widget_cb_key_down, ic);
+   edje_object_part_swallow(ic->obj, "e.swallow.entry", ic->entry_widget);
+   evas_object_show(ic->entry_widget);
+   e_widget_entry_text_set(ic->entry_widget, ic->info.file);
+   e_widget_focus_set(ic->entry_widget, 0);
+   eo = e_widget_entry_editable_object_get(ic->entry_widget);
+   e_editable_cursor_move_to_start(eo);
+   e_editable_selection_move_to_end(eo);
+   ic->sd->iop_icon = ic;
+
+   return ic->entry_widget;
+}
+
+static void
+_e_fm2_icon_entry_widget_del(E_Fm2_Icon *ic)
+{
+   ic->sd->iop_icon = NULL;
+   evas_object_focus_set(ic->sd->obj, 1);
+   evas_object_del(ic->entry_widget);
+   ic->entry_widget = NULL;
+}
+
+static void
+_e_fm2_icon_entry_widget_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Key_Down *ev;
+   E_Fm2_Icon *ic;
+
+   ev = event_info;
+   ic = data;
+
+   if (!strcmp(ev->key, "Escape"))
+      _e_fm2_icon_entry_widget_del(ic);
+   else if (!strcmp(ev->key, "Return"))
+      _e_fm2_icon_entry_widget_accept(ic);
+}
+
+static void
+_e_fm2_icon_entry_widget_accept(E_Fm2_Icon *ic)
+{
+   _e_fm2_file_do_rename(e_widget_entry_text_get(ic->entry_widget), ic);
+   _e_fm2_icon_entry_widget_del(ic);
 }
 
 static void
@@ -8406,27 +8888,11 @@ static void
 _e_fm2_file_rename_yes_cb(char *text, void *data)
 {
    E_Fm2_Icon *ic;
-   char oldpath[PATH_MAX];
-   char newpath[PATH_MAX];
-   char *args = NULL;
-   size_t size = 0;
-   size_t length = 0;
 
    ic = data;
    ic->entry_dialog = NULL;
-   if ((text) && (strcmp(text, ic->info.file)))
-     {
-	_e_fm2_icon_realpath(ic, oldpath, sizeof(oldpath));
-	snprintf(newpath, sizeof(newpath), "%s/%s", ic->sd->realpath, text);
-	if (e_filereg_file_protected(oldpath)) return;
 
-	args = _e_fm_string_append_quoted(args, &size, &length, oldpath);
-	args = _e_fm_string_append_char(args, &size, &length, ' ');
-	args = _e_fm_string_append_quoted(args, &size, &length, newpath);
-
-	_e_fm_client_file_move(args, ic->sd->obj);
-	free(args);
-     }
+   _e_fm2_file_do_rename(text, ic);
 }
 
 static void
@@ -8438,6 +8904,30 @@ _e_fm2_file_rename_no_cb(void *data)
    ic->entry_dialog = NULL;
 }
 
+static void
+_e_fm2_file_do_rename(const char *text, E_Fm2_Icon *ic)
+{
+   char oldpath[PATH_MAX];
+   char newpath[PATH_MAX];
+   char *args = NULL;
+   size_t size = 0;
+   size_t length = 0;
+
+   if ((text) && (strcmp(text, ic->info.file)))
+     {
+        _e_fm2_icon_realpath(ic, oldpath, sizeof(oldpath));
+        snprintf(newpath, sizeof(newpath), "%s/%s", ic->sd->realpath, text);
+        if (e_filereg_file_protected(oldpath)) return;
+
+        args = _e_fm_string_append_quoted(args, &size, &length, oldpath);
+        args = _e_fm_string_append_char(args, &size, &length, ' ');
+        args = _e_fm_string_append_quoted(args, &size, &length, newpath);
+
+        _e_fm_client_file_move(args, ic->sd->obj);
+        free(args);
+     }
+}
+
 static void _e_fm_retry_abort_dialog(int pid, const char *str)
 {
    E_Manager *man;
@@ -8655,6 +9145,37 @@ _e_fm_error_ignore_all_cb(void *data, E_Dialog *dialog)
 }
 
 static void
+_e_fm_hal_error_dialog(const char *title, const char *msg, const char *pstr)
+{
+   E_Manager *man;
+   E_Container *con;
+   E_Dialog *dialog;
+   char text[4096];
+   const char *u, *d, *n, *m;
+
+   man = e_manager_current_get();
+   if (!man) return;
+   con = e_container_current_get(man);
+   if (!con) return;
+
+   dialog = e_dialog_new(con, "E", "_fm_hal_error_dialog");
+   e_dialog_title_set(dialog, title);
+   e_dialog_icon_set(dialog, "drive-harddisk", 64);
+   e_dialog_button_add(dialog, _("OK"), NULL, NULL, NULL);
+   
+   u = pstr;
+   d = pstr += strlen(pstr) + 1;
+   n = pstr += strlen(pstr) + 1;
+   m = pstr += strlen(pstr) + 1;
+   snprintf(text, sizeof(text), "%s<br>%s<br>%s<br>%s<br>%s", msg, u, d, n, m);
+   e_dialog_text_set(dialog, text);
+
+   e_win_centered_set(dialog->win, 1);
+   e_dialog_button_focus_num(dialog, 0);
+   e_dialog_show(dialog);
+}
+
+static void
 _e_fm2_file_properties(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Fm2_Icon *ic;
@@ -8662,7 +9183,7 @@ _e_fm2_file_properties(void *data, E_Menu *m, E_Menu_Item *mi)
    E_Container *con;
 
    ic = data;
-   if (ic->entry_dialog) return;
+   if (ic->entry_dialog || ic->entry_widget) return;
 
    man = e_manager_current_get();
    if (!man) return;
@@ -9022,10 +9543,7 @@ _e_fm2_live_process(Evas_Object *obj)
 				 ic->removable_state_change = 0;
 				 if ((ic->realized) && (ic->obj_icon))
 				   {
-				      if (ic->info.removable_full)
-					edje_object_signal_emit(ic->obj_icon, "e,state,removable,full", "e");
-				      else
-					edje_object_signal_emit(ic->obj_icon, "e,state,removable,empty", "e");
+				      _e_fm2_icon_removable_update(ic);
 				      _e_fm2_icon_label_set(ic, ic->obj);
 				   }
 			      }
@@ -9163,3 +9681,101 @@ _e_fm2_theme_edje_icon_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const ch
    ret = e_theme_edje_object_set(o, category, buf);
    return ret;
 }
+
+static void 
+_e_fm2_volume_mount(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+   E_Volume *v;
+   char *mp;
+   
+   v = data;
+   if (!v) return;
+   
+   mp = e_fm2_hal_volume_mountpoint_get(v);
+   _e_fm2_client_mount(v->udi, mp);
+   free(mp);
+}
+
+static void 
+_e_fm2_volume_unmount(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+   E_Volume *v;
+   
+   v = data;
+   if (!v) return;
+   
+   v->auto_unmount = 0;
+   _e_fm2_client_unmount(v->udi);
+}
+
+static void 
+_e_fm2_volume_eject(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+   E_Volume *v;
+   
+   v = data;
+   if (!v) return;
+   
+   v->auto_unmount = 0;
+   _e_fm2_client_eject(v->udi);
+}
+
+static void
+_update_volume_icon(E_Volume *v, E_Fm2_Icon *ic)
+{
+   if (ic->info.removable_full)
+     edje_object_signal_emit(ic->obj_icon, "e,state,removable,full", "e");
+   else
+     edje_object_signal_emit(ic->obj_icon, "e,state,removable,empty", "e");
+
+   if (v)
+     {
+        if (v->mounted)
+           edje_object_signal_emit(ic->obj, "e,state,volume,mounted", "e");
+        else
+           edje_object_signal_emit(ic->obj, "e,state,volume,unmounted", "e");
+     }
+   else
+      edje_object_signal_emit(ic->obj, "e,state,volume,off", "e");
+}
+
+static void
+_e_fm2_volume_icon_update(E_Volume *v)
+{
+   Evas_Object *o;
+   char file[PATH_MAX], fav[PATH_MAX], desk[PATH_MAX];
+   Eina_List *l;
+   E_Fm2_Icon *ic;
+
+   if (!v || !v->storage) return;
+   
+   e_user_dir_snprintf(fav, sizeof(fav), "fileman/favorites");
+   e_user_homedir_snprintf(desk, sizeof(desk), "Desktop");
+   snprintf(file, sizeof(file), "|%s_%d.desktop", 
+            ecore_file_file_get(v->storage->udi), v->partition_number);
+   
+   EINA_LIST_FOREACH(_e_fm2_list, l, o)
+     {
+        const char *rp;
+        
+        if ((_e_fm2_list_walking > 0) &&
+            (eina_list_data_find(_e_fm2_list_remove, o))) continue;
+        
+        rp = e_fm2_real_path_get(o);
+        if (strcmp(rp, fav) && strcmp(rp, desk)) continue;
+        
+        ic = _e_fm2_icon_find(l->data, file);
+        if (ic)
+           _update_volume_icon(v, ic);
+     }
+}
+
+static void
+_e_fm2_icon_removable_update(E_Fm2_Icon *ic)
+{
+   E_Volume *v;
+   
+   if (!ic) return;
+   v = e_fm2_hal_volume_find(ic->info.link);
+   _update_volume_icon(v, ic);
+}
diff --git a/src/bin/e_fm_hal.c b/src/bin/e_fm_hal.c
index f9d7d6a..9cfa396 100644
--- a/src/bin/e_fm_hal.c
+++ b/src/bin/e_fm_hal.c
@@ -9,8 +9,11 @@
 
 static void _e_fm2_volume_write(E_Volume *v) EINA_ARG_NONNULL(1);
 static void _e_fm2_volume_erase(E_Volume *v) EINA_ARG_NONNULL(1);
+static void _e_fm2_hal_mount_free(E_Fm2_Mount *m); EINA_ARG_NONNULL(1);
 static void _e_fm2_hal_mount_ok(E_Fm2_Mount *m) EINA_ARG_NONNULL(1);
-static int  _e_fm2_hal_mount_timeout(E_Fm2_Mount *m) EINA_ARG_NONNULL(1);
+static void _e_fm2_hal_mount_fail(E_Fm2_Mount *m) EINA_ARG_NONNULL(1);
+static void _e_fm2_hal_unmount_ok(E_Fm2_Mount *m) EINA_ARG_NONNULL(1);
+static void _e_fm2_hal_unmount_fail(E_Fm2_Mount *m) EINA_ARG_NONNULL(1);
 
 static Eina_List *_e_stores = NULL;
 static Eina_List *_e_vols   = NULL;
@@ -268,11 +271,20 @@ e_fm2_hal_volume_add(E_Volume *v)
 EAPI void
 e_fm2_hal_volume_del(E_Volume *v)
 {
+   Eina_List *l, *l_nxt;
+   E_Fm2_Mount *m;
+   
 //   printf("VOL- %s\n", v->udi);
    if (v->storage) 
      v->storage->volumes = eina_list_remove(v->storage->volumes, v);
    _e_vols = eina_list_remove(_e_vols, v);
    _e_fm2_volume_erase(v);
+   EINA_LIST_FOREACH_SAFE(v->mounts, l, l_nxt, m)
+     {
+        _e_fm2_hal_unmount_ok(m);
+        v->mounts = eina_list_remove_list(v->mounts, l);
+        _e_fm2_hal_mount_free(m);
+     }
    _e_volume_free(v);
 }
 
@@ -382,10 +394,10 @@ e_fm2_hal_volume_mountpoint_get(E_Volume *v)
 	return strdup(v->mount_point);
      }
    
-   if (v->uuid && v->uuid[0] != '\0')
-     snprintf(buf, sizeof(buf) - 1, "/media/%s", v->uuid);
-   else if (v->label && v->label[0] != '\0')
+   if (v->label && v->label[0] != '\0')
      snprintf(buf, sizeof(buf) - 1, "/media/%s", v->label);
+   else if (v->uuid && v->uuid[0] != '\0')
+     snprintf(buf, sizeof(buf) - 1, "/media/%s", v->uuid);
    else if ((v->storage) && (v->storage->serial) && v->storage->serial[0] != '\0')
      snprintf(buf, sizeof(buf) - 1, "/media/%s", v->storage->serial);
    else
@@ -403,7 +415,12 @@ e_fm2_hal_mount_add(E_Volume *v, const char *mountpoint)
    Eina_List *l;
 
    v->mounted = 1;
-   v->mount_point = strdup(mountpoint);
+   if (mountpoint && (*mountpoint != 0))
+     {
+        if (v->mount_point) 
+           free(v->mount_point);
+        v->mount_point = strdup(mountpoint);
+     }
 
    for (l = v->mounts; l; l = l->next)
      _e_fm2_hal_mount_ok(l->data);
@@ -412,18 +429,34 @@ e_fm2_hal_mount_add(E_Volume *v, const char *mountpoint)
 }
 
 EAPI void
-e_fm2_hal_mount_del(E_Fm2_Mount *m)
+e_fm2_hal_mount_del(E_Volume *v)
+{
+   Eina_List *l, *l_nxt;
+   E_Fm2_Mount *m;
+   
+   v->mounted = 0;
+   if (v->mount_point) 
+     {
+        free(v->mount_point);
+        v->mount_point = NULL;
+     }
+
+   EINA_LIST_FOREACH_SAFE(v->mounts, l, l_nxt, m)
+     {
+        _e_fm2_hal_unmount_ok(m);
+        v->mounts = eina_list_remove_list(v->mounts, l);
+        _e_fm2_hal_mount_free(m);
+     }
+}
+
+EAPI void
+_e_fm2_hal_mount_free(E_Fm2_Mount *m)
 {
    if (!m) return;
 
    if (m->udi) eina_stringshare_del(m->udi);
    if (m->mount_point) eina_stringshare_del(m->mount_point);
 
-   if (m->timeout) 
-     {
-	ecore_timer_del(m->timeout);
-	m->timeout = NULL;
-     }
    free(m);
 }
 
@@ -469,49 +502,109 @@ e_fm2_hal_mount(E_Volume *v,
    v->mounts = eina_list_prepend(v->mounts, m);
 
 //   printf("BEGIN MOUNT %p '%s'\n", m, v->mount_point);
-   
+
    if (!v->mounted)
      {
-	if (m->timeout) ecore_timer_del(m->timeout);
-	m->timeout = ecore_timer_add(10.0, (int (*)(void*))_e_fm2_hal_mount_timeout, m);
+        v->auto_unmount = 1;
 	_e_fm2_client_mount(v->udi, v->mount_point);
      }
+   else
+     {
+        v->auto_unmount = 0;
+        m->mount_point = eina_stringshare_add(v->mount_point);
+     }
+
    return m;
 }
 
 EAPI void
+e_fm2_hal_mount_fail(E_Volume *v)
+{
+   Eina_List *l, *l_nxt;
+   E_Fm2_Mount *m;
+
+   v->mounted = 0;
+   if (v->mount_point) 
+     {
+        free(v->mount_point);
+        v->mount_point = NULL;
+     }
+
+   EINA_LIST_FOREACH_SAFE(v->mounts, l, l_nxt, m)
+     {
+        _e_fm2_hal_mount_fail(m);
+        v->mounts = eina_list_remove_list(v->mounts, l);
+        _e_fm2_hal_mount_free(m);
+     }
+}
+
+EAPI void
 e_fm2_hal_unmount(E_Fm2_Mount *m)
 {
    E_Volume *v;
 
    if (!(v = m->volume)) return;
    v->mounts = eina_list_remove(v->mounts, m);
-   e_fm2_hal_mount_del(m);
+   _e_fm2_hal_mount_free(m);
 
-   if (!eina_list_count(v->mounts))
+   if (v->auto_unmount && v->mounted && !eina_list_count(v->mounts))
      _e_fm2_client_unmount(v->udi);
 }
 
+EAPI void
+e_fm2_hal_unmount_fail(E_Volume *v)
+{
+   Eina_List *l;
+
+   v->mounted = 1;
+
+   for (l = v->mounts; l; l = l->next)
+     _e_fm2_hal_unmount_fail(l->data);
+}
+
 static void
 _e_fm2_hal_mount_ok(E_Fm2_Mount *m)
 {
    m->mounted = 1;
-   if (m->volume) m->mount_point = eina_stringshare_add(m->volume->mount_point);
-   if (m->timeout)
+   if (m->volume) 
+      m->mount_point = eina_stringshare_add(m->volume->mount_point);
+   if (m->mount_ok) 
+      m->mount_ok(m->data);
+//   printf("MOUNT OK '%s'\n", m->mount_point);
+}
+
+static void
+_e_fm2_hal_mount_fail(E_Fm2_Mount *m)
+{
+   m->mounted = 0;
+   if (m->mount_point)
      {
-	ecore_timer_del(m->timeout);
-	m->timeout = NULL;
+        eina_stringshare_del(m->mount_point);
+        m->mount_point = NULL;
      }
-   if (m->mount_ok) m->mount_ok(m->data);
-//   printf("MOUNT OK '%s'\n", m->mount_point);
+   if (m->mount_fail) 
+     m->mount_fail(m->data);
 }
 
-static int
-_e_fm2_hal_mount_timeout(E_Fm2_Mount *m)
+static void
+_e_fm2_hal_unmount_ok(E_Fm2_Mount *m)
 {
-   m->mount_fail(m->data);
-   m->timeout = NULL;
-   return 0;
+   m->mounted = 0;
+   if (m->mount_point)
+     {
+        eina_stringshare_del(m->mount_point);
+        m->mount_point = NULL;
+     }
+   if (m->unmount_ok) 
+      m->unmount_ok(m->data);
+}
+
+static void
+_e_fm2_hal_unmount_fail(E_Fm2_Mount *m)
+{
+   m->mounted = 1;
+   if (m->unmount_fail) 
+     m->unmount_fail(m->data);
 }
 
 EAPI void
diff --git a/src/bin/e_fm_hal.h b/src/bin/e_fm_hal.h
index 9c7e708..521daa4 100644
--- a/src/bin/e_fm_hal.h
+++ b/src/bin/e_fm_hal.h
@@ -17,13 +17,15 @@ EAPI E_Volume    *e_fm2_hal_volume_find(const char *udi);
 EAPI char        *e_fm2_hal_volume_mountpoint_get(E_Volume *v);
 
 EAPI void         e_fm2_hal_mount_add(E_Volume *v, const char *mountpoint);
-EAPI void         e_fm2_hal_mount_del(E_Fm2_Mount *m);
+EAPI void         e_fm2_hal_mount_del(E_Volume *v);
 EAPI E_Fm2_Mount *e_fm2_hal_mount_find(const char *path);
 EAPI E_Fm2_Mount *e_fm2_hal_mount(E_Volume *v,
                                   void (*mount_ok) (void *data), void (*mount_fail) (void *data), 
 				  void (*unmount_ok) (void *data), void (*unmount_fail) (void *data), 
 				  void *data);
+EAPI void         e_fm2_hal_mount_fail(E_Volume *v);
 EAPI void         e_fm2_hal_unmount(E_Fm2_Mount *m);
+EAPI void         e_fm2_hal_unmount_fail(E_Volume *v);
 
 EAPI void         e_fm2_hal_show_desktop_icons(void);
 EAPI void         e_fm2_hal_hide_desktop_icons(void);
diff --git a/src/bin/e_fm_main.c b/src/bin/e_fm_main.c
index 158d69b..60386fb 100644
--- a/src/bin/e_fm_main.c
+++ b/src/bin/e_fm_main.c
@@ -58,6 +58,10 @@
 #define DEF_ROUND_TRIP_TOLERANCE 0.01
 #define DEF_MOD_BACKOFF 0.2
 
+#define E_FM_MOUNT_TIMEOUT 30.0
+#define E_FM_UNMOUNT_TIMEOUT 60.0
+#define E_FM_EJECT_TIMEOUT 15.0
+
 typedef struct _E_Dir E_Dir;
 typedef struct _E_Fop E_Fop;
 typedef struct _E_Mod E_Mod;
@@ -189,17 +193,26 @@ static void _e_dbus_cb_vol_prop(void *data, void *reply_data, DBusError *error);
 static void _e_dbus_cb_vol_prop_mount_modified(void *data, void *reply_data, DBusError *error);
 static void _e_dbus_cb_vol_mounted(void *user_data, void *method_return, DBusError *error);
 static void _e_dbus_cb_vol_unmounted(void *user_data, void *method_return, DBusError *error);
+static void _e_dbus_cb_vol_unmounted_before_eject(void *user_data, void *method_return, DBusError *error);
+static int  _e_dbus_vb_vol_ejecting_after_unmount(void *data);
+static void _e_dbus_cb_vol_ejected(void *user_data, void *method_return, DBusError *error);
+static int  _e_dbus_format_error_msg(char **buf, E_Volume *v, DBusError *error);
+
+static int  _e_dbus_vol_mount_timeout(void *data);
+static int  _e_dbus_vol_unmount_timeout(void *data);
+static int  _e_dbus_vol_eject_timeout(void *data);
 
 EAPI E_Storage *e_storage_add(const char *udi);
 EAPI void       e_storage_del(const char *udi);
 EAPI E_Storage *e_storage_find(const char *udi);
 
-EAPI E_Volume *e_volume_add(const char *udi);
+EAPI E_Volume *e_volume_add(const char *udi, char first_time);
 EAPI void      e_volume_del(const char *udi);
 EAPI E_Volume *e_volume_find(const char *udi);
 
 EAPI void      e_volume_mount(E_Volume *v);
 EAPI void      e_volume_unmount(E_Volume *v);
+EAPI void      e_volume_eject(E_Volume *v);
 
 /* local subsystem globals */
 static Ecore_Ipc_Server *_e_ipc_server = NULL;
@@ -366,7 +379,7 @@ _e_dbus_cb_dev_vol(void *user_data, void *reply_data, DBusError *error)
    EINA_LIST_FOREACH(ret->strings, l, device)
      {
 //	printf("DB VOL+: %s\n", device);
-	e_volume_add(device);
+	e_volume_add(device, 1);
      }
 }
 
@@ -407,7 +420,7 @@ _e_dbus_cb_vol_is(void *user_data, void *reply_data, DBusError *error)
    if (ret && ret->boolean)
      {
 //	printf("DB VOL IS+: %s\n", udi);
-	e_volume_add(udi);
+	e_volume_add(udi, 0);
      }
    
    error:
@@ -720,6 +733,26 @@ _e_dbus_cb_vol_prop(void *data, void *reply_data, DBusError *error)
    return;
 }
 
+static int
+_e_dbus_format_error_msg(char **buf, E_Volume *v, DBusError *error)
+{
+   int size, vu, vm, en;
+   char *tmp;
+   
+   vu = strlen(v->udi) + 1;
+   vm = strlen(v->mount_point) + 1;
+   en = strlen(error->name) + 1;
+   size = vu + vm + en + strlen(error->message) + 1;
+   tmp = *buf = malloc(size);
+   
+   strcpy(tmp, v->udi);
+   strcpy(tmp += vu, v->mount_point);
+   strcpy(tmp += vm, error->name);
+   strcpy(tmp += en, error->message);
+   
+   return size;
+}
+
 static void
 _e_dbus_cb_vol_prop_mount_modified(void *data, void *reply_data, DBusError *error)
 {
@@ -730,7 +763,18 @@ _e_dbus_cb_vol_prop_mount_modified(void *data, void *reply_data, DBusError *erro
    if (!ret) return;
    if (dbus_error_is_set(error))
      {
+        char *buf;
+        int size;
+   
+        size = _e_dbus_format_error_msg(&buf, v, error);
+        if (v->mounted)
+           ecore_ipc_server_send(_e_ipc_server, 6/*E_IPC_DOMAIN_FM*/, E_FM_OP_UNMOUNT_ERROR,
+                                 0, 0, 0, buf, size);
+        else
+           ecore_ipc_server_send(_e_ipc_server, 6/*E_IPC_DOMAIN_FM*/, E_FM_OP_MOUNT_ERROR,
+                                 0, 0, 0, buf, size);
 	dbus_error_free(error);
+	free(buf);
 	return;
      }
    
@@ -767,7 +811,7 @@ _e_dbus_cb_vol_prop_mount_modified(void *data, void *reply_data, DBusError *erro
 static Eina_List *_e_vols = NULL;
 
 EAPI E_Volume *
-e_volume_add(const char *udi)
+e_volume_add(const char *udi, char first_time)
 {
    E_Volume *v;
    
@@ -778,6 +822,7 @@ e_volume_add(const char *udi)
 //   printf("VOL+ %s\n", udi);
    v->udi = strdup(udi);
    v->icon = NULL;
+   v->first_time = first_time;
    _e_vols = eina_list_append(_e_vols, v);
    e_hal_device_get_all_properties(_e_dbus_conn, v->udi,
 				   _e_dbus_cb_vol_prop, v);
@@ -785,7 +830,8 @@ e_volume_add(const char *udi)
 					       udi,
 					       "org.freedesktop.Hal.Device",
 					       "PropertyModified", _e_dbus_cb_prop_modified, v);
-
+   v->guard = NULL;
+   
    return v;
 }
 
@@ -796,6 +842,11 @@ e_volume_del(const char *udi)
    
    v = e_volume_find(udi);
    if (!v) return;
+   if (v->guard)
+     {
+        ecore_timer_del(v->guard);
+        v->guard = NULL;      
+     }
    if (v->prop_handler) e_dbus_signal_handler_del(_e_dbus_conn, v->prop_handler);
    if (v->validated)
      {
@@ -825,6 +876,26 @@ e_volume_find(const char *udi)
    return NULL;
 }
 
+static int
+_e_dbus_vol_mount_timeout(void *data)
+{
+   E_Volume *v = data;
+   DBusError error;
+   char *buf;
+   int size;
+
+   v->guard = NULL;
+   dbus_pending_call_cancel(v->op);
+   error.name = "org.enlightenment.fm2.MountTimeout";
+   error.message = "Unable to mount the volume with specified time-out.";
+   size = _e_dbus_format_error_msg(&buf, v, &error);
+   ecore_ipc_server_send(_e_ipc_server, 6/*E_IPC_DOMAIN_FM*/, E_FM_OP_MOUNT_ERROR,
+                         0, 0, 0, buf, size);
+   free(buf);
+   
+   return 0;
+}
+
 static void
 _e_dbus_cb_vol_mounted(void *user_data, void *method_return, DBusError *error)
 {
@@ -832,11 +903,23 @@ _e_dbus_cb_vol_mounted(void *user_data, void *method_return, DBusError *error)
    char *buf;
    int size;
    
+   if (v->guard)
+     {
+        ecore_timer_del(v->guard);
+        v->guard = NULL;
+     }
+   
    if (dbus_error_is_set(error))
      {
-	dbus_error_free(error);
-	return;
+        size = _e_dbus_format_error_msg(&buf, v, error);
+        ecore_ipc_server_send(_e_ipc_server, 6/*E_IPC_DOMAIN_FM*/, E_FM_OP_MOUNT_ERROR,
+                              0, 0, 0, buf, size);
+        dbus_error_free(error);
+        free(buf);
+        return;
      }
+
+/*
    v->mounted = 1;
 //   printf("MOUNT: %s from %s\n", v->udi, v->mount_point);
    size = strlen(v->udi) + 1 + strlen(v->mount_point) + 1;
@@ -844,9 +927,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);
+*/
 }
 
 EAPI void
@@ -856,7 +940,7 @@ e_volume_mount(E_Volume *v)
    char *mount_point;
    Eina_List *opt = NULL;
 
-   if (!v || !v->mount_point || strncmp(v->mount_point, "/media/", 7))
+   if (!v || v->guard || !v->mount_point || strncmp(v->mount_point, "/media/", 7))
      return;
 
    mount_point = v->mount_point + 7;
@@ -869,11 +953,32 @@ e_volume_mount(E_Volume *v)
 	snprintf(buf, sizeof(buf), "uid=%i", (int)getuid());
 	opt = eina_list_append(opt, buf);
      }
-   e_hal_device_volume_mount(_e_dbus_conn, v->udi, mount_point,
-			     v->fstype, opt, NULL, v);
+   v->guard = ecore_timer_add(E_FM_MOUNT_TIMEOUT, _e_dbus_vol_mount_timeout, v);
+   v->op = e_hal_device_volume_mount(_e_dbus_conn, v->udi, mount_point,
+                                     v->fstype, opt, _e_dbus_cb_vol_mounted, v);
    opt = eina_list_free(opt);
 }
 
+static int
+_e_dbus_vol_unmount_timeout(void *data)
+{
+   E_Volume *v = data;
+   DBusError error;
+   char *buf;
+   int size;
+
+   v->guard = NULL;
+   dbus_pending_call_cancel(v->op);
+   error.name = "org.enlightenment.fm2.UnmountTimeout";
+   error.message = "Unable to unmount the volume with specified time-out.";
+   size = _e_dbus_format_error_msg(&buf, v, &error);
+   ecore_ipc_server_send(_e_ipc_server, 6/*E_IPC_DOMAIN_FM*/, E_FM_OP_UNMOUNT_ERROR,
+                         0, 0, 0, buf, size);
+   free(buf);
+   
+   return 0;
+}
+
 static void
 _e_dbus_cb_vol_unmounted(void *user_data, void *method_return, DBusError *error)
 {
@@ -881,11 +986,23 @@ _e_dbus_cb_vol_unmounted(void *user_data, void *method_return, DBusError *error)
    char *buf;
    int size;
 
+   if (v->guard)
+     {
+        ecore_timer_del(v->guard);
+        v->guard = NULL;
+     }
+   
    if (dbus_error_is_set(error))
      {
-	dbus_error_free(error);
-	return;
+        size = _e_dbus_format_error_msg(&buf, v, error);
+        ecore_ipc_server_send(_e_ipc_server, 6/*E_IPC_DOMAIN_FM*/, E_FM_OP_UNMOUNT_ERROR,
+                              0, 0, 0, buf, size);
+        dbus_error_free(error);
+        free(buf);
+        return;
      }
+
+/*
    v->mounted = 0;
 //   printf("UNMOUNT: %s from %s\n", v->udi, v->mount_point);
    size = strlen(v->udi) + 1 + strlen(v->mount_point) + 1;
@@ -893,17 +1010,118 @@ _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);
+*/
 }
 
 EAPI void
 e_volume_unmount(E_Volume *v)
 {
 //   printf("unmount %s %s\n", v->udi, v->mount_point);
-   e_hal_device_volume_unmount(_e_dbus_conn, v->udi, NULL,
-			       _e_dbus_cb_vol_unmounted, v);
+   if (!v || v->guard) return;
+   
+   v->guard = ecore_timer_add(E_FM_UNMOUNT_TIMEOUT, _e_dbus_vol_unmount_timeout, v);
+   v->op = e_hal_device_volume_unmount(_e_dbus_conn, v->udi, NULL,
+                                       _e_dbus_cb_vol_unmounted, v);
+}
+
+static int
+_e_dbus_vol_eject_timeout(void *data)
+{
+   E_Volume *v = data;
+   DBusError error;
+   char *buf;
+   int size;
+
+   v->guard = NULL;
+   dbus_pending_call_cancel(v->op);
+   error.name = "org.enlightenment.fm2.EjectTimeout";
+   error.message = "Unable to eject the media with specified time-out.";
+   size = _e_dbus_format_error_msg(&buf, v, &error);
+   ecore_ipc_server_send(_e_ipc_server, 6/*E_IPC_DOMAIN_FM*/, E_FM_OP_EJECT_ERROR,
+                         0, 0, 0, buf, size);
+   free(buf);
+   
+   return 0;
+}
+
+static int
+_e_dbus_vb_vol_ejecting_after_unmount(void *data)
+{
+   E_Volume *v = data;
+   
+   v->guard = ecore_timer_add(E_FM_EJECT_TIMEOUT, _e_dbus_vol_eject_timeout, v);
+   v->op = e_hal_device_volume_eject(_e_dbus_conn, v->udi, NULL,
+                                     _e_dbus_cb_vol_ejected, v);
+   
+   return 0;
+}
+
+static void
+_e_dbus_cb_vol_unmounted_before_eject(void *user_data, void *method_return, DBusError *error)
+{
+   E_Volume *v = user_data;
+   char err;
+
+   err = dbus_error_is_set(error) ? 1 : 0;
+   _e_dbus_cb_vol_unmounted(user_data, method_return, error);
+   
+   // delay is required for all message handlers were executed after unmount
+   if (!err)
+      ecore_timer_add(1.0, _e_dbus_vb_vol_ejecting_after_unmount, v);
+}
+
+static void
+_e_dbus_cb_vol_ejected(void *user_data, void *method_return, DBusError *error)
+{
+   E_Volume *v = user_data;
+   char *buf;
+   int size;
+
+   if (v->guard)
+     {
+        ecore_timer_del(v->guard);
+        v->guard = NULL;
+     }
+   
+   if (dbus_error_is_set(error))
+     {
+        size = _e_dbus_format_error_msg(&buf, v, error);
+        ecore_ipc_server_send(_e_ipc_server, 6/*E_IPC_DOMAIN_FM*/, E_FM_OP_EJECT_ERROR,
+                              0, 0, 0, buf, size);
+        dbus_error_free(error);
+        free(buf);
+        return;
+     }
+   
+   size = strlen(v->udi) + 1;
+   buf = alloca(size);
+   strcpy(buf, v->udi);
+   ecore_ipc_server_send(_e_ipc_server,
+                         6/*E_IPC_DOMAIN_FM*/,
+                         E_FM_OP_EJECT_DONE,
+                         0, 0, 0, buf, size);
+}
+
+EAPI void
+e_volume_eject(E_Volume *v)
+{
+   if (!v || v->guard) return;
+
+   if (v->mounted)
+     {
+        v->guard = ecore_timer_add(E_FM_UNMOUNT_TIMEOUT, _e_dbus_vol_unmount_timeout, v);
+        v->op = e_hal_device_volume_unmount(_e_dbus_conn, v->udi, NULL,
+                                            _e_dbus_cb_vol_unmounted_before_eject, v);
+     }
+   else
+     {
+        v->guard = ecore_timer_add(E_FM_EJECT_TIMEOUT, _e_dbus_vol_eject_timeout, v);
+        v->op = e_hal_device_volume_eject(_e_dbus_conn, v->udi, NULL,
+                                          _e_dbus_cb_vol_ejected, v);
+     }
 }
 
 /* local subsystem functions */
@@ -1376,6 +1594,17 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
 	       }
 	  }
 	break;
+      case E_FM_OP_EJECT:/* eject udi */
+          {
+             E_Volume *v;
+             const char *udi;
+             
+             udi = e->data;
+             v = e_volume_find(udi);
+             if (v)
+               e_volume_eject(v);
+          }
+        break;
       case E_FM_OP_QUIT: /* quit */
 	ecore_main_loop_quit();
 	break;
diff --git a/src/bin/e_fm_op.h b/src/bin/e_fm_op.h
index f7f8d97..08af888 100644
--- a/src/bin/e_fm_op.h
+++ b/src/bin/e_fm_op.h
@@ -47,7 +47,12 @@ typedef enum _E_Fm_Op_Type
    E_FM_OP_SYMLINK,
    E_FM_OP_OK,
    E_FM_OP_ERROR_RETRY_ABORT,
-   E_FM_OP_REORDER
+   E_FM_OP_REORDER,
+   E_FM_OP_MOUNT_ERROR,
+   E_FM_OP_UNMOUNT_ERROR,
+   E_FM_OP_EJECT,
+   E_FM_OP_EJECT_DONE,
+   E_FM_OP_EJECT_ERROR
 } E_Fm_Op_Type;
 
 #else
diff --git a/src/bin/e_fm_prop.c b/src/bin/e_fm_prop.c
index 3b9edb7..a24bb04 100644
--- a/src/bin/e_fm_prop.c
+++ b/src/bin/e_fm_prop.c
@@ -513,9 +513,9 @@ _cb_icon_sel(void *data, void *data2)
    e_dialog_button_add(dia, _("OK"), NULL, _cb_fsel_ok, cfdata);
    e_dialog_button_add(dia, _("Cancel"), NULL, _cb_fsel_cancel, cfdata);
    e_dialog_resizable_set(dia, 1);
+   e_util_win_auto_resize_fill(dia->win);
    e_win_centered_set(dia->win, 1);
    e_dialog_show(dia);
-   e_win_resize(dia->win, 475, 341);
 
    cfdata->gui.fsel = dia;
 }
diff --git a/src/bin/e_fm_shared.h b/src/bin/e_fm_shared.h
index 849cb50..4c5e9b0 100644
--- a/src/bin/e_fm_shared.h
+++ b/src/bin/e_fm_shared.h
@@ -58,6 +58,11 @@ struct _E_Volume
    Eina_List *mounts;
    
    unsigned char validated;
+   
+   char auto_unmount;                  // unmount, when last associated fm window closed
+   char first_time;                    // volume discovery in init sequence
+   Ecore_Timer *guard;                 // operation guard timer
+   DBusPendingCall *op;                // d-bus call handle
 };
 
 struct _E_Fm2_Mount
@@ -65,7 +70,6 @@ struct _E_Fm2_Mount
    const char   *udi;
    const char   *mount_point;
    
-   Ecore_Timer  *timeout;
    void        (*mount_ok) (void *data);
    void        (*mount_fail) (void *data);
    void        (*unmount_ok) (void *data);
@@ -161,6 +165,7 @@ _e_volume_edd_new(void)
    DAT("mounted", mounted, EET_T_CHAR);
    DAT("mount_point", mount_point, EET_T_STRING);
    DAT("parent", parent, EET_T_STRING);
+   DAT("first_time", first_time, EET_T_CHAR);
 #undef DAT
    return edd;
 }
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 3eb0656..1dd080b 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -77,6 +77,8 @@ static void e_gadcon_layout_pack_min_size_set(Evas_Object *obj, int w, int h);
 static void e_gadcon_layout_pack_aspect_set(Evas_Object *obj, int w, int h);
 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);
 
 /********************/
 #define E_LAYOUT_ITEM_DRAG_RESIST_LEVEL 10
@@ -185,6 +187,8 @@ struct _E_Layout_Item_Container
 static Eina_Hash *providers = NULL;
 static Eina_List *providers_list = NULL;
 static Eina_List *gadcons = NULL;
+static Eina_List *populate_requests = NULL;
+static Ecore_Idler *populate_idler = NULL;
 
 /* This is the gadcon client which is currently dragged */
 static E_Gadcon_Client *drag_gcc = NULL;
@@ -201,26 +205,23 @@ e_gadcon_init(void)
 EAPI int
 e_gadcon_shutdown(void)
 {
+   eina_list_free(populate_requests);
+   if (populate_idler)
+     {
+	ecore_idler_del(populate_idler);
+	populate_idler = NULL;
+     }
+
    return 1;
 }
 
 EAPI void
 e_gadcon_provider_register(const E_Gadcon_Client_Class *cc)
 {
-   Eina_List *l;
-   E_Gadcon *gc;
-
    if (!providers) providers = eina_hash_string_superfast_new(NULL);
    eina_hash_direct_add(providers, cc->name, cc);
    providers_list = eina_list_append(providers_list, cc);
-   for (l = gadcons; l; l = l->next)
-     {
-	gc = l->data;
-	if (gc->populate_class.func)
-	  gc->populate_class.func(gc->populate_class.data, gc, cc);
-	else
-	  e_gadcon_populate_class(gc, cc);
-     }
+   _e_gadcon_provider_populate_request(cc);
 }
 
 EAPI void
@@ -229,7 +230,9 @@ e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc)
    Eina_List *l, *ll, *dlist = NULL;
    E_Gadcon *gc;
    E_Gadcon_Client *gcc;
-   
+
+   _e_gadcon_provider_populate_unrequest(cc);
+
    for (l = gadcons; l; l = l->next)
      {
 	gc = l->data;
@@ -414,6 +417,9 @@ e_gadcon_populate(E_Gadcon *gc)
 	  {
 	     E_Gadcon_Client *gcc;
 
+	     if (eina_list_data_find(populate_requests, cc))
+	       continue;
+
 	     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));
@@ -5082,3 +5088,50 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
      }
 }
 
+static int
+_e_gadcon_provider_populate_idler(void *data __UNUSED__)
+{
+   const E_Gadcon_Client_Class *cc;
+   const Eina_List *l;
+   E_Gadcon *gc;
+
+   EINA_LIST_FOREACH(gadcons, l, gc)
+     e_gadcon_layout_freeze(gc->o_container);
+
+   EINA_LIST_FREE(populate_requests, cc)
+     {
+	EINA_LIST_FOREACH(gadcons, l, gc)
+	  {
+	     if (gc->populate_class.func)
+	       gc->populate_class.func(gc->populate_class.data, gc, cc);
+	     else
+	       e_gadcon_populate_class(gc, cc);
+	  }
+     }
+
+   EINA_LIST_FOREACH(gadcons, l, gc)
+     e_gadcon_layout_thaw(gc->o_container);
+
+   populate_idler = NULL;
+   return 0;
+}
+
+static void
+_e_gadcon_provider_populate_request(const E_Gadcon_Client_Class *cc)
+{
+   if (!populate_idler)
+     populate_idler = ecore_idler_add(_e_gadcon_provider_populate_idler, NULL);
+   if (!eina_list_data_find(populate_requests, cc))
+     populate_requests = eina_list_append(populate_requests, cc);
+}
+
+static void
+_e_gadcon_provider_populate_unrequest(const E_Gadcon_Client_Class *cc)
+{
+   populate_requests = eina_list_remove(populate_requests, cc);
+   if ((!populate_requests) && (populate_idler))
+     {
+	ecore_idler_del(populate_idler);
+	populate_idler = NULL;
+     }
+}
diff --git a/src/bin/e_gadcon_popup.c b/src/bin/e_gadcon_popup.c
index fdb7457..1d075cc 100644
--- a/src/bin/e_gadcon_popup.c
+++ b/src/bin/e_gadcon_popup.c
@@ -6,19 +6,24 @@
 /* local subsystem functions */
 static void _e_gadcon_popup_free(E_Gadcon_Popup *pop);
 static void _e_gadcon_popup_locked_set(E_Gadcon_Popup *pop, Eina_Bool locked);
+static void _e_gadcon_popup_size_recalc(E_Gadcon_Popup *pop, Evas_Object *obj);
+static void _e_gadcon_popup_position(E_Gadcon_Popup *pop);
+static void _e_gadcon_popup_changed_size_hints_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
 
 /* externally accessible functions */
 
 EAPI E_Gadcon_Popup *
-e_gadcon_popup_new(E_Gadcon_Client *gcc, void (*resize_func) (Evas_Object *obj, int *w, int *h))
+e_gadcon_popup_new(E_Gadcon_Client *gcc)
 {
    E_Gadcon_Popup *pop;
    Evas_Object *o;
    E_Zone *zone;
+   Evas_Coord gx, gy;
 
    pop = E_OBJECT_ALLOC(E_Gadcon_Popup, E_GADCON_POPUP_TYPE, _e_gadcon_popup_free);
    if (!pop) return NULL;
-   zone = e_util_zone_current_get(e_manager_current_get());
+   e_gadcon_client_geometry_get(gcc, &gx, &gy, NULL, NULL);
+   zone = e_container_zone_at_point_get(e_container_current_get(e_manager_current_get()), gx, gy);
    pop->win = e_popup_new(zone, 0, 0, 0, 0);
    e_popup_layer_set(pop->win, 255);
 
@@ -32,7 +37,6 @@ e_gadcon_popup_new(E_Gadcon_Client *gcc, void (*resize_func) (Evas_Object *obj,
    pop->gcc = gcc;
    pop->gadcon_lock = 1;
    pop->gadcon_was_locked = 0;
-   pop->resize_func = resize_func;
 
    return pop;
 }
@@ -40,7 +44,6 @@ e_gadcon_popup_new(E_Gadcon_Client *gcc, void (*resize_func) (Evas_Object *obj,
 EAPI void
 e_gadcon_popup_content_set(E_Gadcon_Popup *pop, Evas_Object *o)
 {
-   Evas_Coord w = 0, h = 0;
    Evas_Object *old_o;
 
    if (!pop) return;
@@ -53,55 +56,126 @@ e_gadcon_popup_content_set(E_Gadcon_Popup *pop, Evas_Object *o)
 	edje_object_part_unswallow(pop->o_bg, old_o);
 	evas_object_del(old_o);
      }
-   e_widget_min_size_get(o, &w, &h);
-   if ((!w) || (!h)) edje_object_size_min_calc(o, &w, &h);
-   edje_extern_object_min_size_set(o, w, h);
    edje_object_part_swallow(pop->o_bg, "e.swallow.content", o);
-   edje_object_size_min_calc(pop->o_bg, &pop->w, &pop->h);
-   evas_object_resize(pop->o_bg, pop->w, pop->h);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+	 _e_gadcon_popup_changed_size_hints_cb, pop);
+
+   _e_gadcon_popup_size_recalc(pop, o);
 }
 
 EAPI void
 e_gadcon_popup_show(E_Gadcon_Popup *pop)
 {
-   Evas_Object *o;
-   Evas_Coord gx, gy, gw, gh, zw, zh, zx, zy;
-   Evas_Coord px, py, ww, wh;
-
    if (!pop) return;
    E_OBJECT_CHECK(pop);
    E_OBJECT_TYPE_CHECK(pop, E_GADCON_POPUP_TYPE);
 
    if (pop->win->visible) return;
 
-   if ((o = edje_object_part_swallow_get(pop->o_bg, "e.swallow.content")))
+   e_popup_show(pop->win);
+
+   _e_gadcon_popup_position(pop);
+}
+
+EAPI void
+e_gadcon_popup_hide(E_Gadcon_Popup *pop)
+{
+   if (!pop) return;
+   E_OBJECT_CHECK(pop);
+   E_OBJECT_TYPE_CHECK(pop, E_GADCON_POPUP_TYPE);
+   if (pop->pinned) return;
+   e_popup_hide(pop->win);
+   if (pop->gadcon_was_locked)
+     _e_gadcon_popup_locked_set(pop, 0);
+}
+
+EAPI void
+e_gadcon_popup_toggle_pinned(E_Gadcon_Popup *pop)
+{
+   if (!pop) return;
+   E_OBJECT_CHECK(pop);
+   E_OBJECT_TYPE_CHECK(pop, E_GADCON_POPUP_TYPE);
+
+   if (pop->pinned)
      {
-	Evas_Coord w = 0, h = 0;
-
-	e_widget_min_size_get(o, &w, &h);
-	if ((!w) || (!h))
-	  {
-	     edje_object_size_min_get(o, &w, &h);
-	     edje_object_size_min_restricted_calc(o, &w, &h, w, h);
-	  }
-	if (pop->resize_func) pop->resize_func(o, &w, &h);
-	edje_extern_object_min_size_set(o, w, h);
+	pop->pinned = 0;
+	edje_object_signal_emit(pop->o_bg, "e,state,unpinned", "e");
      }
+   else
+     {
+	pop->pinned = 1;
+	edje_object_signal_emit(pop->o_bg, "e,state,pinned", "e");
+     }
+}
 
-   evas_object_show(pop->o_bg);
-   edje_object_size_min_calc(pop->o_bg, &ww, &wh);
-   e_popup_show(pop->win);
+EAPI void
+e_gadcon_popup_lock_set(E_Gadcon_Popup *pop, Eina_Bool setting)
+{
+   if (!pop) return;
+   E_OBJECT_CHECK(pop);
+   E_OBJECT_TYPE_CHECK(pop, E_GADCON_POPUP_TYPE);
+
+   setting = !!setting;
+   if (pop->gadcon_lock == setting) return;
+   pop->gadcon_lock = setting;
+
+   if (setting != pop->gadcon_was_locked)
+     _e_gadcon_popup_locked_set(pop, setting);
+}
+
+/* local subsystem functions */
+
+static void
+_e_gadcon_popup_free(E_Gadcon_Popup *pop)
+{
+   if (pop->gadcon_was_locked)
+     _e_gadcon_popup_locked_set(pop, 0);
+   pop->gcc = NULL;
+   e_object_del(E_OBJECT(pop->win));
+   free(pop);
+}
 
-   evas_object_resize(pop->o_bg, ww, wh);
-   pop->w = ww;
-   pop->h = wh;
+static void
+_e_gadcon_popup_locked_set(E_Gadcon_Popup *pop, Eina_Bool locked)
+{
+   if (!pop->gcc)
+     return;
+
+   e_gadcon_locked_set(pop->gcc->gadcon, locked);
+   pop->gadcon_was_locked = locked;
+}
+
+static void
+_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);
+   if ((!w) || (!h)) evas_object_size_hint_min_get(obj, &w, &h);
+   if ((!w) || (!h))
+     {
+	edje_object_size_min_get(obj, &w, &h);
+	edje_object_size_min_restricted_calc(obj, &w, &h, w, h);
+     }
+   edje_extern_object_min_size_set(obj, w, h);
+   edje_object_size_min_calc(pop->o_bg, &pop->w, &pop->h);
+   evas_object_resize(pop->o_bg, pop->w, pop->h);
+
+   if (pop->win->visible)
+     _e_gadcon_popup_position(pop);
+}
+
+static void
+_e_gadcon_popup_position(E_Gadcon_Popup *pop)
+{
+   Evas_Coord gx, gy, gw, gh, zw, zh, zx, zy, px, py;
 
    /* Popup positioning */
    e_gadcon_client_geometry_get(pop->gcc, &gx, &gy, &gw, &gh);
-   zx = pop->gcc->gadcon->zone->x;
-   zy = pop->gcc->gadcon->zone->y;
-   zw = pop->gcc->gadcon->zone->w;
-   zh = pop->gcc->gadcon->zone->h;
+   zx = pop->win->zone->x;
+   zy = pop->win->zone->y;
+   zw = pop->win->zone->w;
+   zh = pop->win->zone->h;
    switch (pop->gcc->gadcon->orient)
      {
       case E_GADCON_ORIENT_CORNER_RT:
@@ -165,70 +239,10 @@ e_gadcon_popup_show(E_Gadcon_Popup *pop)
      _e_gadcon_popup_locked_set(pop, 1);
 }
 
-EAPI void
-e_gadcon_popup_hide(E_Gadcon_Popup *pop)
-{
-   if (!pop) return;
-   E_OBJECT_CHECK(pop);
-   E_OBJECT_TYPE_CHECK(pop, E_GADCON_POPUP_TYPE);
-   if (pop->pinned) return;
-   e_popup_hide(pop->win);
-   if (pop->gadcon_was_locked)
-     _e_gadcon_popup_locked_set(pop, 0);
-}
-
-EAPI void
-e_gadcon_popup_toggle_pinned(E_Gadcon_Popup *pop)
-{
-   if (!pop) return;
-   E_OBJECT_CHECK(pop);
-   E_OBJECT_TYPE_CHECK(pop, E_GADCON_POPUP_TYPE);
-
-   if (pop->pinned)
-     {
-	pop->pinned = 0;
-	edje_object_signal_emit(pop->o_bg, "e,state,unpinned", "e");
-     }
-   else
-     {
-	pop->pinned = 1;
-	edje_object_signal_emit(pop->o_bg, "e,state,pinned", "e");
-     }
-}
-
-EAPI void
-e_gadcon_popup_lock_set(E_Gadcon_Popup *pop, Eina_Bool setting)
-{
-   if (!pop) return;
-   E_OBJECT_CHECK(pop);
-   E_OBJECT_TYPE_CHECK(pop, E_GADCON_POPUP_TYPE);
-
-   setting = !!setting;
-   if (pop->gadcon_lock == setting) return;
-   pop->gadcon_lock = setting;
-
-   if (setting != pop->gadcon_was_locked)
-     _e_gadcon_popup_locked_set(pop, setting);
-}
-
-/* local subsystem functions */
-
-static void
-_e_gadcon_popup_free(E_Gadcon_Popup *pop)
-{
-   if (pop->gadcon_was_locked)
-     _e_gadcon_popup_locked_set(pop, 0);
-   pop->gcc = NULL;
-   e_object_del(E_OBJECT(pop->win));
-   free(pop);
-}
-
 static void
-_e_gadcon_popup_locked_set(E_Gadcon_Popup *pop, Eina_Bool locked)
+_e_gadcon_popup_changed_size_hints_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   if (!pop->gcc)
-     return;
+   E_Gadcon_Popup *pop = data;
 
-   e_gadcon_locked_set(pop->gcc->gadcon, locked);
-   pop->gadcon_was_locked = locked;
+   _e_gadcon_popup_size_recalc(pop, obj);
 }
diff --git a/src/bin/e_gadcon_popup.h b/src/bin/e_gadcon_popup.h
index a40a303..41dc0ad 100644
--- a/src/bin/e_gadcon_popup.h
+++ b/src/bin/e_gadcon_popup.h
@@ -23,11 +23,9 @@ struct _E_Gadcon_Popup
    Eina_Bool            pinned : 1;
    Eina_Bool            gadcon_lock : 1;
    Eina_Bool            gadcon_was_locked : 1;
-
-   void			(*resize_func) (Evas_Object *obj, int *w, int *h);
 };
 
-EAPI E_Gadcon_Popup *e_gadcon_popup_new(E_Gadcon_Client *gcc, void (*resize_func) (Evas_Object *obj, int *w, int *h));
+EAPI E_Gadcon_Popup *e_gadcon_popup_new(E_Gadcon_Client *gcc);
 EAPI void e_gadcon_popup_content_set(E_Gadcon_Popup *pop, Evas_Object *o);
 EAPI void e_gadcon_popup_show(E_Gadcon_Popup *pop);
 EAPI void e_gadcon_popup_hide(E_Gadcon_Popup *pop);
diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index 4d5eefb..e9148c0 100644
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -592,10 +592,7 @@ if (!bd->lock_client_shade)
 /*   
    if (bd->client.e.state.centered)
      {
-	e_border_move(bd,
-		      bd->zone->x + (bd->zone->w - bd->w) / 2,
-		      bd->zone->y + (bd->zone->h - bd->h) / 2);
-		      
+        e_border_center(bd);
      }
  */
    /* Update stacking */
diff --git a/src/bin/e_icon.c b/src/bin/e_icon.c
index b9301de..f6daf44 100644
--- a/src/bin/e_icon.c
+++ b/src/bin/e_icon.c
@@ -27,6 +27,8 @@ static void _e_icon_smart_hide(Evas_Object *obj);
 static void _e_icon_smart_color_set(Evas_Object *obj, int r, int g, int b, int a);
 static void _e_icon_smart_clip_set(Evas_Object *obj, Evas_Object * clip);
 static void _e_icon_smart_clip_unset(Evas_Object *obj);
+static void _e_icon_obj_prepare(Evas_Object *obj, E_Smart_Data *sd);
+static void _e_icon_preloaded(void *data, Evas *e, Evas_Object *obj, void *event_info);
 
 /* local subsystem globals */
 static Evas_Smart *_e_smart = NULL;
@@ -39,6 +41,21 @@ e_icon_add(Evas *evas)
    return evas_object_smart_add(evas, _e_smart);
 }
 
+static void
+_e_icon_obj_prepare(Evas_Object *obj, E_Smart_Data *sd)
+{
+   if (!sd->obj) return;
+   
+   if (!strcmp(evas_object_type_get(sd->obj), "edje"))
+     {
+        evas_object_del(sd->obj);
+        sd->obj = evas_object_image_add(evas_object_evas_get(obj));
+        evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_IMAGE_PRELOADED,
+                                       _e_icon_preloaded, obj);
+        evas_object_smart_member_add(sd->obj, obj);
+     }
+}
+
 EAPI void
 e_icon_file_set(Evas_Object *obj, const char *file)
 {
@@ -47,6 +64,7 @@ e_icon_file_set(Evas_Object *obj, const char *file)
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
    /* smart code here */
+   _e_icon_obj_prepare(obj, sd);
    /* FIXME: 64x64 - unhappy about this. use icon size */
    if (sd->size != 0)
      evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
@@ -63,6 +81,7 @@ 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 */
+   _e_icon_obj_prepare(obj, sd);
    if (sd->size != 0)
      evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
    evas_object_image_file_set(sd->obj, file, key);
diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c
index 73e7d20..a45ec16 100644
--- a/src/bin/e_int_border_menu.c
+++ b/src/bin/e_int_border_menu.c
@@ -178,7 +178,7 @@ e_int_border_menu_create(E_Border *bd)
 	     e_menu_item_callback_set(mi, _e_border_menu_cb_lower, bd);
 	     e_menu_item_icon_edje_set(mi,
 				       e_theme_edje_file_get("base/theme/borders",
-							     "e/widgets/border/default/stack_on_top"),
+							     "e/widgets/border/default/stack_below"),
 				       "e/widgets/border/default/stack_below");
 
 	     mi = e_menu_item_new(m);
diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c
index 69fd5ef..2de32ef 100644
--- a/src/bin/e_int_config_modules.c
+++ b/src/bin/e_int_config_modules.c
@@ -507,12 +507,19 @@ _list_widget_load(Evas_Object *obj, Eina_List *list)
 	char buf[4096];
 
 	if (!mod) continue;
-	if (mod->orig_path)
+	if (mod->icon)
 	  {
-	     path = ecore_file_dir_get(mod->orig_path);
-	     snprintf(buf, sizeof(buf), "%s/%s.edj", path, mod->icon);
-	     ic = e_util_icon_add(buf, evas);
-	     free(path);
+	     ic = e_icon_add(evas);
+	     if (!e_util_icon_theme_set(ic, mod->icon))
+	       {
+		  if (mod->orig_path)
+		    {
+		       path = ecore_file_dir_get(mod->orig_path);
+		       snprintf(buf, sizeof(buf), "%s/%s.edj", path, mod->icon);
+		       e_icon_file_edje_set(ic, buf, "icon");
+		       free(path);
+		    }
+	       }
 	  }
 	if (mod->name)
 	  e_widget_ilist_append(obj, ic, mod->name, NULL, mod, NULL);
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 16a2d3b..5e3769b 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -1327,8 +1327,7 @@ _e_int_menus_lost_clients_item_cb(void *data, E_Menu *m, E_Menu_Item *mi)
    E_OBJECT_CHECK(bd);
    if (bd->iconic) e_border_uniconify(bd);
    if (bd->desk) e_desk_show(bd->desk);
-   e_border_move(bd, bd->zone->x + ((bd->zone->w - bd->w) / 2), 
-		 bd->zone->y + ((bd->zone->h - bd->h) / 2));
+   e_border_center(bd);
    e_border_raise(bd);
    if (!bd->lock_focus_out)
      e_border_focus_set(bd, 1, 1);
diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c
index 031c487..f792d02 100644
--- a/src/bin/e_int_shelf_config.c
+++ b/src/bin/e_int_shelf_config.c
@@ -475,6 +475,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    else if (!cfdata->escfg->autohide && cfdata->es->hidden)
      e_shelf_toggle(cfdata->es, 1);
 
+   e_zone_useful_geometry_dirty(cfdata->es->zone);
    e_config_save_queue();   
    cfdata->es->config_dialog = cfd;
    return 1; /* Apply was OK */
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index ad3c9de..a372fc5 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -864,7 +864,7 @@ main(int argc, char **argv)
 	_e_main_shutdown(-1);
      }
    _e_main_shutdown_push(e_dnd_shutdown);
-   e_init_status_set(_("Setup Grab Input Handing"));
+   e_init_status_set(_("Setup Grab Input Handling"));
    TS("grabinput");
    /* setup input grabbing co-operation system */
    if (!e_grabinput_init())
diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c
index 4203ed7..9b57fd9 100644
--- a/src/bin/e_manager.c
+++ b/src/bin/e_manager.c
@@ -45,6 +45,7 @@ struct _Frame_Extents
 
 static Eina_List *managers = NULL;
 static Eina_Hash *frame_extents = NULL;
+static Ecore_Timer *timer_post_screensaver_lock = NULL;
 
 /* externally accessible functions */
 EAPI int
@@ -69,6 +70,13 @@ e_manager_shutdown(void)
 	eina_hash_free(frame_extents);
 	frame_extents = NULL;
      }
+
+   if (timer_post_screensaver_lock)
+     {
+	ecore_timer_del(timer_post_screensaver_lock);
+	timer_post_screensaver_lock = NULL;
+     }
+
    return 1;
 }
 
@@ -785,18 +793,39 @@ _e_manager_cb_ping(void *data, int ev_type __UNUSED__, void *ev)
 }
 
 static int
-_e_manager_cb_screensaver_notify(void *data, int ev_type __UNUSED__, void *ev)
+_e_manager_cb_timer_post_screensaver_lock(void *data __UNUSED__)
 {
-   E_Manager *man;
-   Ecore_X_Event_Screensaver_Notify *e;
-   
-   man = data;
-   e = ev;
-   
+   e_desklock_show_autolocked();
+   timer_post_screensaver_lock = NULL;
+   return 0;
+}
+
+static int
+_e_manager_cb_screensaver_notify(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
+{
+   Ecore_X_Event_Screensaver_Notify *e = ev;
+
+   if (timer_post_screensaver_lock)
+     {
+	ecore_timer_del(timer_post_screensaver_lock);
+	timer_post_screensaver_lock = NULL;
+     }
+
    if (e->on)
      {
 	if (e_config->desklock_autolock_screensaver)
-	  e_desklock_show();
+	  {
+	     if (e_config->desklock_post_screensaver_time <= 1.0)
+	       {
+		  e_desklock_show_autolocked();
+	       }
+	     else
+	       {
+		  timer_post_screensaver_lock = ecore_timer_add
+		    (e_config->desklock_post_screensaver_time,
+		     _e_manager_cb_timer_post_screensaver_lock, NULL);
+	       }
+	  }
      }
    return 1;
 }
diff --git a/src/bin/e_pan.c b/src/bin/e_pan.c
index d2cedec..86a88ed 100644
--- a/src/bin/e_pan.c
+++ b/src/bin/e_pan.c
@@ -10,10 +10,9 @@ typedef struct _E_Smart_Data E_Smart_Data;
 
 struct _E_Smart_Data
 { 
-   Evas_Object *smart_obj;
-   Evas_Object *child_obj;
-   Evas_Coord   x, y, w, h;
-   Evas_Coord   child_w, child_h, px, py;
+   Evas_Object *smart_obj, *child_obj;
+   Evas_Coord x, y, w, h;
+   Evas_Coord child_w, child_h, px, py;
 }; 
 
 /* local subsystem functions */
@@ -58,20 +57,21 @@ e_pan_child_set(Evas_Object *obj, Evas_Object *child)
      }
    if (child)
      {
-	Evas_Coord w, h;
 	int r, g, b, a;
-	
+
 	sd->child_obj = child;
 	evas_object_smart_member_add(sd->child_obj, sd->smart_obj);
-	evas_object_geometry_get(sd->child_obj, NULL, NULL, &w, &h);
-	sd->child_w = w;
-	sd->child_h = h;
-	evas_object_event_callback_add(child, EVAS_CALLBACK_FREE, _e_smart_child_del_hook, sd);
-	evas_object_event_callback_add(child, EVAS_CALLBACK_RESIZE, _e_smart_child_resize_hook, sd);
+	evas_object_geometry_get(sd->child_obj, NULL, NULL, 
+                                 &sd->child_w, &sd->child_h);
+	evas_object_event_callback_add(child, EVAS_CALLBACK_FREE, 
+                                       _e_smart_child_del_hook, sd);
+	evas_object_event_callback_add(child, EVAS_CALLBACK_RESIZE, 
+                                       _e_smart_child_resize_hook, sd);
 	evas_object_color_get(sd->smart_obj, &r, &g, &b, &a);
 	evas_object_color_set(sd->child_obj, r, g, b, a);
 	evas_object_clip_set(sd->child_obj, evas_object_clip_get(sd->smart_obj));
-	if (evas_object_visible_get(sd->smart_obj)) evas_object_show(sd->child_obj);
+	if (evas_object_visible_get(sd->smart_obj)) 
+          evas_object_show(sd->child_obj);
 	else evas_object_hide(sd->child_obj);
 	_e_smart_reconfigure(sd);
      }
@@ -137,7 +137,7 @@ static void
 _e_smart_child_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    E_Smart_Data *sd;
-   
+
    sd = data;
    sd->child_obj = NULL;
    evas_object_smart_callback_call(sd->smart_obj, "changed", NULL);
@@ -148,7 +148,7 @@ _e_smart_child_resize_hook(void *data, Evas *e, Evas_Object *obj, void *event_in
 {
    E_Smart_Data *sd;
    Evas_Coord w, h;
-   
+
    sd = data;
    evas_object_geometry_get(sd->child_obj, NULL, NULL, &w, &h);
    if ((w != sd->child_w) || (h != sd->child_h))
@@ -170,8 +170,8 @@ static void
 _e_smart_add(Evas_Object *obj)
 {
    E_Smart_Data *sd;
-   
-   sd = calloc(1, sizeof(E_Smart_Data));
+
+   sd = E_NEW(E_Smart_Data, 1);
    if (!sd) return;
    sd->smart_obj = obj;
    sd->x = 0;
@@ -186,7 +186,7 @@ _e_smart_del(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
    e_pan_child_set(obj, NULL);
-   free(sd);
+   E_FREE(sd);
 }
 
 static void
@@ -241,7 +241,7 @@ _e_smart_clip_unset(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
    evas_object_clip_unset(sd->child_obj);
-}  
+}
 
 /* never need to touch this */
 
@@ -271,4 +271,3 @@ _e_smart_init(void)
 	_e_smart = evas_smart_class_new(&sc);
      }
 }
-
diff --git a/src/bin/e_screensaver.c b/src/bin/e_screensaver.c
index 01a61ed..4d241bc 100644
--- a/src/bin/e_screensaver.c
+++ b/src/bin/e_screensaver.c
@@ -2,13 +2,169 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 #include "e.h"
- 
+
+static Ecore_Event_Handler *_e_screensaver_handler_config_mode = NULL;
+static Ecore_Event_Handler *_e_screensaver_handler_screensaver_notify = NULL;
+static E_Dialog *_e_screensaver_ask_presentation_dia = NULL;
+static int _e_screensaver_ask_presentation_count = 0;
+
+static int
+_e_screensaver_handler_config_mode_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+{
+   e_screensaver_init();
+   return 1;
+}
+
+static void
+_e_screensaver_ask_presentation_del(void *data)
+{
+   if (_e_screensaver_ask_presentation_dia == data)
+     _e_screensaver_ask_presentation_dia = NULL;
+}
+
+static void
+_e_screensaver_ask_presentation_yes(void *data __UNUSED__, E_Dialog *dia)
+{
+   e_config->mode.presentation = 1;
+   e_config_mode_changed();
+   e_config_save_queue();
+   e_object_del(E_OBJECT(dia));
+   _e_screensaver_ask_presentation_count = 0;
+}
+
+static void
+_e_screensaver_ask_presentation_no(void *data __UNUSED__, E_Dialog *dia)
+{
+   e_object_del(E_OBJECT(dia));
+   _e_screensaver_ask_presentation_count = 0;
+}
+
+static void
+_e_screensaver_ask_presentation_no_increase(void *data __UNUSED__, E_Dialog *dia)
+{
+   int timeout, interval, blanking, expose;
+
+   _e_screensaver_ask_presentation_count++;
+   timeout = e_config->screensaver_timeout * (1 + _e_screensaver_ask_presentation_count);
+   interval = e_config->screensaver_interval;
+   blanking = e_config->screensaver_blanking;
+   expose = e_config->screensaver_expose;
+
+   ecore_x_screensaver_set(timeout, interval, blanking, expose);
+   e_object_del(E_OBJECT(dia));
+}
+
+static void
+_e_screensaver_ask_presentation_no_forever(void *data __UNUSED__, E_Dialog *dia)
+{
+   e_config->screensaver_ask_presentation = 0;
+   e_config_save_queue();
+   e_object_del(E_OBJECT(dia));
+   _e_screensaver_ask_presentation_count = 0;
+}
+
+static void
+_e_screensaver_ask_presentation_key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event)
+{
+   Evas_Event_Key_Down *ev = event;
+   E_Dialog *dia = data;
+
+   if (strcmp(ev->keyname, "Return") == 0)
+     _e_screensaver_ask_presentation_yes(NULL, dia);
+   else if (strcmp(ev->keyname, "Escape") == 0)
+     _e_screensaver_ask_presentation_no(NULL, dia);
+}
+
+static void
+_e_screensaver_ask_presentation_mode(void)
+{
+   E_Manager *man;
+   E_Container *con;
+   E_Dialog *dia;
+
+   if (_e_screensaver_ask_presentation_dia)
+     return;
+
+   man = e_manager_current_get();
+   if (!man) return;
+   con = e_container_current_get(man);
+   if (!con) return;
+   dia = e_dialog_new(con, "E", "_screensaver_ask_presentation");
+   if (!dia) return;
+
+   e_dialog_title_set(dia, _("Activate Presentation Mode?"));
+   e_dialog_icon_set(dia, "dialog-ask", 64);
+   e_dialog_text_set
+     (dia,
+      _("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?"));
+
+   e_object_del_attach_func_set
+     (E_OBJECT(dia), _e_screensaver_ask_presentation_del);
+   e_dialog_button_add
+     (dia, _("Yes"), NULL, _e_screensaver_ask_presentation_yes, NULL);
+   e_dialog_button_add
+     (dia, _("No"), NULL, _e_screensaver_ask_presentation_no, NULL);
+   e_dialog_button_add
+     (dia, _("No, but increase timeout"), NULL,
+      _e_screensaver_ask_presentation_no_increase, NULL);
+   e_dialog_button_add
+     (dia, _("No, and stop asking"), NULL,
+      _e_screensaver_ask_presentation_no_forever, NULL);
+
+   e_dialog_button_focus_num(dia, 0);
+   e_dialog_resizable_set(dia, 1);
+   e_widget_list_homogeneous_set(dia->box_object, 0);
+   e_util_win_auto_resize_fill(dia->win);
+   e_win_centered_set(dia->win, 1);
+   e_dialog_show(dia);
+
+   evas_object_event_callback_add
+     (dia->bg_object, EVAS_CALLBACK_KEY_DOWN,
+      _e_screensaver_ask_presentation_key_down, dia);
+
+   _e_screensaver_ask_presentation_dia = dia;
+}
+
+static int
+_e_screensaver_handler_screensaver_notify_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   Ecore_X_Event_Screensaver_Notify *e = event;
+   static double last_start = 0.0;
+
+   if (e->on)
+     {
+	last_start = ecore_loop_time_get();
+	_e_screensaver_ask_presentation_count = 0;
+     }
+   else if ((last_start > 0.0) && (e_config->screensaver_ask_presentation))
+     {
+	double current = ecore_loop_time_get();
+	if (last_start + e_config->screensaver_ask_presentation_timeout >= current)
+	  _e_screensaver_ask_presentation_mode();
+	last_start = 0.0;
+     }
+   else if (_e_screensaver_ask_presentation_count)
+     _e_screensaver_ask_presentation_count = 0;
+
+   return 1;
+}
+
 EAPI int
 e_screensaver_init(void)
 {
    int timeout=0, interval=0, blanking=0, expose=0;
-    
-   if (e_config->screensaver_enable)
+
+   if (!_e_screensaver_handler_config_mode)
+     _e_screensaver_handler_config_mode = ecore_event_handler_add
+       (E_EVENT_CONFIG_MODE_CHANGED, _e_screensaver_handler_config_mode_cb, NULL);
+
+   if (!_e_screensaver_handler_screensaver_notify)
+     _e_screensaver_handler_screensaver_notify = ecore_event_handler_add
+       (ECORE_X_EVENT_SCREENSAVER_NOTIFY, _e_screensaver_handler_screensaver_notify_cb, NULL);
+
+   if ((e_config->screensaver_enable) && (!e_config->mode.presentation))
      timeout = e_config->screensaver_timeout;
    
    interval = e_config->screensaver_interval;
diff --git a/src/bin/e_scrollframe.c b/src/bin/e_scrollframe.c
index 8bab2ef..fa5d8b6 100644
--- a/src/bin/e_scrollframe.c
+++ b/src/bin/e_scrollframe.c
@@ -11,7 +11,7 @@ typedef struct _E_Smart_Data E_Smart_Data;
 struct _E_Smart_Data
 { 
    Evas_Coord   x, y, w, h;
-   
+
    Evas_Object *smart_obj;
    Evas_Object *child_obj;
    Evas_Object *pan_obj;
@@ -25,8 +25,8 @@ struct _E_Smart_Data
       Evas_Coord sx, sy;
       Evas_Coord dx, dy;
       struct {
-	 Evas_Coord    x, y;
-	 double        timestamp;
+	 Evas_Coord x, y;
+	 double timestamp;
       } history[20];
       double anim_start;
       Ecore_Animator *momentum_animator;
@@ -37,24 +37,28 @@ struct _E_Smart_Data
       unsigned char dir_y : 1;
       unsigned char locked : 1;
    } down;
-   
-   struct {
-      Evas_Coord w, h;
-   } child;
-   struct {
-      Evas_Coord x, y;
-   } step, page;
 
-   struct {
-      void (*set) (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-      void (*get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
-      void (*max_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
-      void (*child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
-   } pan_func;
-   struct {
-      Evas_Bool forced : 1;
-   } thumbscroll;
-   
+   struct 
+     {
+        Evas_Coord w, h;
+     } child;
+   struct 
+     {
+        Evas_Coord x, y;
+     } step, page;
+
+   struct 
+     {
+        void (*set) (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+        void (*get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
+        void (*max_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
+        void (*child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
+     } pan_func;
+   struct 
+     {
+        Evas_Bool forced : 1;
+     } thumbscroll;
+
    unsigned char hbar_visible : 1;
    unsigned char vbar_visible : 1;
    unsigned char extern_pan : 1;
@@ -105,16 +109,16 @@ e_scrollframe_add(Evas *evas)
 EAPI void
 e_scrollframe_child_set(Evas_Object *obj, Evas_Object *child)
 {
-   Evas_Coord w, h;
    Evas_Object *o;
-   
+
    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);
+	evas_object_event_callback_del(sd->child_obj, EVAS_CALLBACK_FREE, 
+                                       _e_smart_child_del_hook);
      }
-   
+
    sd->child_obj = child;
    if (!child) return;
 
@@ -122,22 +126,23 @@ e_scrollframe_child_set(Evas_Object *obj, Evas_Object *child)
      {
 	o = e_pan_add(evas_object_evas_get(obj));
 	sd->pan_obj = o;
-	evas_object_smart_callback_add(o, "changed", _e_smart_pan_changed_hook, sd);
-	evas_object_smart_callback_add(o, "pan_changed", _e_smart_pan_pan_changed_hook, sd);
+	evas_object_smart_callback_add(o, "changed", 
+                                       _e_smart_pan_changed_hook, sd);
+	evas_object_smart_callback_add(o, "pan_changed", 
+                                       _e_smart_pan_pan_changed_hook, sd);
 	evas_object_show(o);
 	edje_object_part_swallow(sd->edje_obj, "e.swallow.content", o);
      }
-   
+
    sd->pan_func.set = e_pan_set;
    sd->pan_func.get = e_pan_get;
    sd->pan_func.max_get = e_pan_max_get;
    sd->pan_func.child_size_get = e_pan_child_size_get;
-   
-   evas_object_event_callback_add(child, EVAS_CALLBACK_FREE, _e_smart_child_del_hook, sd);
+
+   evas_object_event_callback_add(child, EVAS_CALLBACK_FREE, 
+                                  _e_smart_child_del_hook, sd);
    e_pan_child_set(sd->pan_obj, sd->child_obj);
-   sd->pan_func.child_size_get(sd->pan_obj, &w, &h);
-   sd->child.w = w;
-   sd->child.h = h;
+   sd->pan_func.child_size_get(sd->pan_obj, &sd->child.w, &sd->child.h);
    _e_smart_scrollbar_size_adjust(sd);
    _e_smart_scrollbar_reset(sd);
 }
@@ -150,7 +155,7 @@ e_scrollframe_extern_pan_set(Evas_Object *obj, Evas_Object *pan,
 			     void (*pan_child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y))
 {
    API_ENTRY return;
-   
+
    e_scrollframe_child_set(obj, NULL);
    if (sd->extern_pan)
      {
@@ -180,8 +185,10 @@ e_scrollframe_extern_pan_set(Evas_Object *obj, Evas_Object *pan,
    sd->pan_func.max_get = pan_max_get;
    sd->pan_func.child_size_get = pan_child_size_get;
    sd->extern_pan = 1;
-   evas_object_smart_callback_add(sd->pan_obj, "changed", _e_smart_pan_changed_hook, sd);
-   evas_object_smart_callback_add(sd->pan_obj, "pan_changed", _e_smart_pan_pan_changed_hook, sd);
+   evas_object_smart_callback_add(sd->pan_obj, "changed", 
+                                  _e_smart_pan_changed_hook, sd);
+   evas_object_smart_callback_add(sd->pan_obj, "pan_changed", 
+                                  _e_smart_pan_pan_changed_hook, sd);
    edje_object_part_swallow(sd->edje_obj, "e.swallow.content", sd->pan_obj);
    evas_object_show(sd->pan_obj);
 }
@@ -206,8 +213,7 @@ e_scrollframe_custom_edje_file_set(Evas_Object *obj, char *file, char *group)
 {
    API_ENTRY return 0;
 
-   if (!edje_object_file_set(sd->edje_obj, file, group))
-     return 0;
+   if (!edje_object_file_set(sd->edje_obj, file, group)) return 0;
    if (sd->pan_obj)
      edje_object_part_swallow(sd->edje_obj, "e.swallow.content", sd->pan_obj);
    sd->vbar_visible = !sd->vbar_visible;
@@ -221,7 +227,7 @@ e_scrollframe_child_pos_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 {
    Evas_Coord mx = 0, my = 0;
    double vx, vy;
-   
+
    API_ENTRY return;
    sd->pan_func.max_get(sd->pan_obj, &mx, &my);
    if (mx > 0) vx = (double)x / (double)mx;
@@ -248,12 +254,12 @@ EAPI void
 e_scrollframe_child_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
 {
    Evas_Coord mx = 0, my = 0, cw = 0, ch = 0, px = 0, py = 0, nx, ny;
-   
+
    API_ENTRY 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);
-   
+
    nx = px;
    if (x < px) nx = x;
    else if ((x + w) > (px + (cw - mx)))
@@ -277,7 +283,8 @@ e_scrollframe_child_viewport_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coor
 {
    API_ENTRY return;
    edje_object_calc_force(sd->edje_obj);
-   edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, w, h);
+   edje_object_part_geometry_get(sd->edje_obj, 
+                                 "e.swallow.content", NULL, NULL, w, h);
 }
 
 EAPI void
@@ -367,7 +374,7 @@ static void
 _e_smart_edje_drag_v(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
    E_Smart_Data *sd;
-   
+
    sd = data;
    _e_smart_scrollbar_read(sd);
 }
@@ -376,7 +383,7 @@ static void
 _e_smart_edje_drag_h(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
    E_Smart_Data *sd;
-   
+
    sd = data;
    _e_smart_scrollbar_read(sd);
 }
@@ -385,7 +392,7 @@ static void
 _e_smart_child_del_hook(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    E_Smart_Data *sd;
-   
+
    sd = data;
    sd->child_obj = NULL;
    _e_smart_scrollbar_size_adjust(sd);
@@ -397,7 +404,7 @@ _e_smart_pan_changed_hook(void *data, Evas_Object *obj __UNUSED__, void *event_i
 {
    Evas_Coord w, h;
    E_Smart_Data *sd;
-   
+
    sd = data;
    sd->pan_func.child_size_get(sd->pan_obj, &w, &h);
    if ((w != sd->child.w) || (h != sd->child.h))
@@ -413,7 +420,7 @@ _e_smart_pan_pan_changed_hook(void *data, Evas_Object *obj __UNUSED__, void *eve
 {
    Evas_Coord x, y;
    E_Smart_Data *sd;
-   
+
    sd = data;
    sd->pan_func.get(sd->pan_obj, &x, &y);
    e_scrollframe_child_pos_set(sd->smart_obj, x, y);
@@ -432,7 +439,8 @@ _e_smart_event_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__
 
    if ((sd->vbar_visible) && ((ev->direction % 2 == 0) || (!sd->hbar_visible)))
      y += ev->z * sd->step.y;
-   else if ((sd->hbar_visible) && ((ev->direction % 2 == 1) || (!sd->vbar_visible)))
+   else if ((sd->hbar_visible) && 
+            ((ev->direction % 2 == 1) || (!sd->vbar_visible)))
      x += ev->z * sd->step.x;
 
    e_scrollframe_child_pos_set(sd->smart_obj, x, y);
@@ -443,7 +451,6 @@ _e_smart_event_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
 {
    Evas_Event_Mouse_Down *ev;
    E_Smart_Data *sd;
-   Evas_Coord x = 0, y = 0;
 
    sd = data;
    ev = event_info;
@@ -462,9 +469,8 @@ _e_smart_event_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
 	     sd->down.dir_y = 0;
 	     sd->down.x = ev->canvas.x;
 	     sd->down.y = ev->canvas.y;
-	     e_scrollframe_child_pos_get(sd->smart_obj, &x, &y);
-	     sd->down.sx = x;
-	     sd->down.sy = y;
+	     e_scrollframe_child_pos_get(sd->smart_obj, 
+                                         &sd->down.sx, &sd->down.sy);
 	     sd->down.locked = 0;
 	     memset(&(sd->down.history[0]), 0, sizeof(sd->down.history[0]) * 20);
 	     sd->down.history[0].timestamp = ecore_loop_time_get();
@@ -480,7 +486,7 @@ _e_smart_momentum_animator(void *data)
    E_Smart_Data *sd;
    double t, dt, p;
    Evas_Coord x, y, dx, dy;
-   
+
    sd = data;
    t = ecore_loop_time_get();
    dt = t - sd->down.anim_start;
@@ -523,7 +529,7 @@ _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *
 		  double t, at, dt;
 		  int i;
 		  Evas_Coord ax, ay, dx, dy, vel;
-		  
+
 		  t = ecore_loop_time_get();
 		  ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
 		  ax = ev->canvas.x;
@@ -550,7 +556,8 @@ _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *
 			   (vel > e_config->thumbscroll_momentum_threshhold))
 			 {
 			    if (!sd->down.momentum_animator)
-			      sd->down.momentum_animator = ecore_animator_add(_e_smart_momentum_animator, sd);
+			      sd->down.momentum_animator = 
+                              ecore_animator_add(_e_smart_momentum_animator, sd);
 			    sd->down.dx = ((double)dx / at);
 			    sd->down.dy = ((double)dy / at);
 			    sd->down.anim_start = t;
@@ -585,7 +592,7 @@ _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void
 	     sd->down.history[0].timestamp = ecore_loop_time_get();
 	     sd->down.history[0].x = ev->cur.canvas.x;
 	     sd->down.history[0].y = ev->cur.canvas.y;
-	     
+
 	     x = ev->cur.canvas.x - sd->down.x;
 	     if (x < 0) x = -x;
 	     y = ev->cur.canvas.y - sd->down.y;
@@ -644,7 +651,7 @@ _e_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
    Evas_Event_Key_Down *ev;
    E_Smart_Data *sd;
    Evas_Coord x = 0, y = 0, vw = 0, vh = 0, mx = 0, my = 0;
-   
+
    sd = data;
    ev = event_info;
    e_scrollframe_child_pos_get(sd->smart_obj, &x, &y);
@@ -684,7 +691,7 @@ _e_smart_scrollbar_read(E_Smart_Data *sd)
 {
    Evas_Coord x, y, mx = 0, my = 0;
    double vx, vy;
-   
+
    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);
    sd->pan_func.max_get(sd->pan_obj, &mx, &my);
@@ -713,11 +720,12 @@ static int
 _e_smart_scrollbar_bar_v_visibility_adjust(E_Smart_Data *sd)
 {
    int scroll_v_vis_change = 0;
-   Evas_Coord w, h, vw, vh;
-   
+   Evas_Coord w, h, vh;
+
    w = sd->child.w;
    h = sd->child.h;
-   edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh);
+   edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", 
+                                 NULL, NULL, NULL, &vh);
    if (sd->vbar_visible)
      {
 	if (sd->vbar_flags == E_SCROLLFRAME_POLICY_AUTO)
@@ -777,11 +785,12 @@ static int
 _e_smart_scrollbar_bar_h_visibility_adjust(E_Smart_Data *sd)
 {
    int scroll_h_vis_change = 0;
-   Evas_Coord w, h, vw, vh;
-   
+   Evas_Coord w, h, vw;
+
    w = sd->child.w;
    h = sd->child.h;
-   edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh);
+   edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", 
+                                 NULL, NULL, &vw, NULL);
    if (sd->hbar_visible)
      {
 	if (sd->hbar_flags == E_SCROLLFRAME_POLICY_AUTO)
@@ -841,7 +850,7 @@ static void
 _e_smart_scrollbar_bar_visibility_adjust(E_Smart_Data *sd)
 {
    int changed = 0;
-   
+
    changed |= _e_smart_scrollbar_bar_h_visibility_adjust(sd);
    changed |= _e_smart_scrollbar_bar_v_visibility_adjust(sd);
    if (changed)
@@ -865,50 +874,65 @@ _e_smart_scrollbar_size_adjust(E_Smart_Data *sd)
 	double vx, vy, size;
 
 	edje_object_calc_force(sd->edje_obj);
-	edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh);
+	edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", 
+                                      NULL, NULL, &vw, &vh);
 	w = sd->child.w;
 	if (w < 1) w = 1;
 	size = (double)vw / (double)w;
 	if (size > 1.0)
 	  {
 	     size = 1.0;
-	     edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.hbar", 0.0, 0.0);
+	     edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.hbar", 
+                                             0.0, 0.0);
 	  }
-	edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.hbar", size, 1.0);
-	
+	edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.hbar", 
+                                       size, 1.0);
+
 	h = sd->child.h;
 	if (h < 1) h = 1;
 	size = (double)vh / (double)h;
 	if (size > 1.0)
 	  {
 	     size = 1.0;
-	     edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.vbar", 0.0, 0.0);
+	     edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.vbar", 
+                                             0.0, 0.0);
 	  }
-	edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.vbar", 1.0, size);
+	edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.vbar", 
+                                       1.0, size);
 
-	edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.hbar", &vx, NULL);
-	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);
+	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;
-	
-	edje_object_part_drag_step_set(sd->edje_obj, "e.dragable.hbar", (double)sd->step.x / (double)w, 0.0);
-	edje_object_part_drag_step_set(sd->edje_obj, "e.dragable.vbar", 0.0, (double)sd->step.y / (double)h);
+
+	edje_object_part_drag_step_set(sd->edje_obj, "e.dragable.hbar", 
+                                       (double)sd->step.x / (double)w, 0.0);
+	edje_object_part_drag_step_set(sd->edje_obj, "e.dragable.vbar", 
+                                       0.0, (double)sd->step.y / (double)h);
 	if (sd->page.x > 0)
-	  edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.hbar", (double)sd->page.x / (double)w, 0.0);
+	  edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.hbar", 
+                                         (double)sd->page.x / (double)w, 0.0);
 	else
-	  edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.hbar", -((double)sd->page.x * ((double)vw / (double)w)) / 100.0, 0.0);
+	  edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.hbar", 
+                                         -((double)sd->page.x * ((double)vw / (double)w)) / 100.0, 0.0);
 	if (sd->page.y > 0)
-	  edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.vbar", 0.0, (double)sd->page.y / (double)h);
+	  edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.vbar", 
+                                         0.0, (double)sd->page.y / (double)h);
 	else
-	  edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.vbar", 0.0, -((double)sd->page.y * ((double)vh / (double)h)) / 100.0);
-	
+	  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);
      }
    else
      {
-	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);
+	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);
      }
    _e_smart_scrollbar_bar_visibility_adjust(sd);
@@ -929,11 +953,11 @@ _e_smart_add(Evas_Object *obj)
 {
    E_Smart_Data *sd;
    Evas_Object *o;
-   
-   sd = calloc(1, sizeof(E_Smart_Data));
+
+   sd = E_NEW(E_Smart_Data, 1);
    if (!sd) return;
    evas_object_smart_data_set(obj, sd);
-   
+
    sd->smart_obj = obj;
    sd->x = 0;
    sd->y = 0;
@@ -947,25 +971,32 @@ _e_smart_add(Evas_Object *obj)
    sd->vbar_flags = E_SCROLLFRAME_POLICY_AUTO;
    sd->hbar_visible = 1;
    sd->vbar_visible = 1;
-   
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN, _e_smart_event_key_down, sd);
+
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN, 
+                                  _e_smart_event_key_down, sd);
    evas_object_propagate_events_set(obj, 0);
-   
+
    o = edje_object_add(evas_object_evas_get(obj));
    sd->edje_obj = o;
    e_theme_edje_object_set(o, "base/theme/widgets",
 			   "e/widgets/scrollframe");
-   edje_object_signal_callback_add(o, "drag*", "e.dragable.vbar", _e_smart_edje_drag_v, sd);
-   edje_object_signal_callback_add(o, "drag*", "e.dragable.hbar", _e_smart_edje_drag_h, sd);
+   edje_object_signal_callback_add(o, "drag*", "e.dragable.vbar", 
+                                   _e_smart_edje_drag_v, sd);
+   edje_object_signal_callback_add(o, "drag*", "e.dragable.hbar", 
+                                   _e_smart_edje_drag_h, sd);
    evas_object_smart_member_add(o, obj);
-   
+
    o = evas_object_rectangle_add(evas_object_evas_get(obj));
    sd->event_obj = o;
    evas_object_color_set(o, 0, 0, 0, 0);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL, _e_smart_event_wheel, sd);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_smart_event_mouse_down, sd);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _e_smart_event_mouse_up, sd);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _e_smart_event_mouse_move, sd);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL, 
+                                  _e_smart_event_wheel, sd);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, 
+                                  _e_smart_event_mouse_down, sd);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, 
+                                  _e_smart_event_mouse_up, sd);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, 
+                                  _e_smart_event_mouse_move, sd);
    evas_object_smart_member_add(o, obj);
    evas_object_repeat_events_set(o, 1);
 
@@ -973,7 +1004,7 @@ _e_smart_add(Evas_Object *obj)
    sd->pan_func.get = e_pan_get;
    sd->pan_func.max_get = e_pan_max_get;
    sd->pan_func.child_size_get = e_pan_child_size_get;
-   
+
    _e_smart_scrollbar_reset(sd);
 }
 
@@ -985,8 +1016,9 @@ _e_smart_del(Evas_Object *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) ecore_animator_del(sd->down.momentum_animator);
-   free(sd);
+   if (sd->down.momentum_animator) 
+     ecore_animator_del(sd->down.momentum_animator);
+   E_FREE(sd);
 }
 
 static void
@@ -1066,12 +1098,8 @@ _e_smart_init(void)
 	       _e_smart_color_set,
 	       _e_smart_clip_set,
 	       _e_smart_clip_unset,
-	       NULL,
-	       NULL,
-	       NULL,
-	       NULL
+	       NULL, NULL, NULL, NULL
 	  };
 	_e_smart = evas_smart_class_new(&sc);
      }
 }
-
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index ebdad1c..628800e 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -19,13 +19,13 @@ static void _e_shelf_cb_menu_items_append(void *data, E_Gadcon_Client *gcc, E_Me
 static void _e_shelf_cb_locked_set(void *data, int lock);
 static void _e_shelf_cb_urgent_show(void *data);
 static void _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
-static int  _e_shelf_cb_mouse_in(void *data, int type, void *event);
-static int  _e_shelf_cb_mouse_out(void *data, int type, void *event);
-static int  _e_shelf_cb_id_sort(const void *data1, const void *data2);
-static int  _e_shelf_cb_hide_animator(void *data);
-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 int _e_shelf_cb_mouse_in(void *data, int type, void *event);
+static int _e_shelf_cb_mouse_out(void *data, int type, void *event);
+static int _e_shelf_cb_id_sort(const void *data1, const void *data2);
+static int _e_shelf_cb_hide_animator(void *data);
+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 Eina_List *shelves = NULL;
@@ -70,7 +70,7 @@ e_shelf_config_init(void)
      {
 	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);
@@ -95,16 +95,16 @@ 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];
-   
+
    es = E_OBJECT_ALLOC(E_Shelf, E_SHELF_TYPE, _e_shelf_free);
    if (!es) return NULL;
    es->id = id;
-
    es->x = 0;
    es->y = 0;
    es->w = 32;
    es->h = 32;
    es->zone = zone;
+   e_zone_useful_geometry_dirty(zone);
    if (popup)
      {
 	es->popup = e_popup_new(zone, es->x, es->y, es->w, es->h);
@@ -137,7 +137,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
 	 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_X_EVENT_MOUSE_OUT, _e_shelf_cb_mouse_out, es));
- 
+
    es->o_base = edje_object_add(es->evas);
    es->name = eina_stringshare_add(name);
    snprintf(buf, sizeof(buf), "e/shelf/%s/base", es->style);
@@ -179,8 +179,10 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
    e_gadcon_shelf_set(es->gadcon, es);
    if (popup)
      {
-        if (!winid_shelves) winid_shelves = eina_hash_string_superfast_new(NULL);
-        eina_hash_add(winid_shelves, e_util_winid_str_get(es->popup->evas_win), es);
+        if (!winid_shelves) 
+          winid_shelves = eina_hash_string_superfast_new(NULL);
+        eina_hash_add(winid_shelves, 
+                      e_util_winid_str_get(es->popup->evas_win), es);
 	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);
@@ -198,9 +200,9 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
 			       _e_shelf_cb_locked_set, es);
    e_gadcon_util_urgent_show_func_set(es->gadcon,
 				      _e_shelf_cb_urgent_show, es);
-   
+
    shelves = eina_list_append(shelves, es);
-   
+
    es->hidden = 0;
    es->hide_step = 0;
    es->locked = 0;
@@ -217,7 +219,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
      es->instant_delay = -1.0;
 
    es->hide_origin = -1;
-   
+
    return es;
 }
 
@@ -226,7 +228,7 @@ e_shelf_zone_move_resize_handle(E_Zone *zone)
 {
    Eina_List *l;
    E_Shelf *es;
-   
+
    for (l = shelves; l; l = l->next)
      {
 	es = l->data;
@@ -298,13 +300,15 @@ e_shelf_toggle(E_Shelf *es, int show)
    es->interrupted = -1;
    es->urgent_show = 0;
    if ((show) && (es->hidden))
-     {  
+     {
 	es->hidden = 0;
 	edje_object_signal_emit(es->o_base, "e,state,visible", "e");
 	if (es->instant_delay >= 0.0)
 	  {
 	     _e_shelf_cb_instant_hide_timer(es);
-	     es->hide_timer = ecore_timer_add(es->cfg->hide_timeout, _e_shelf_cb_hide_urgent_timer, es);
+	     es->hide_timer = 
+               ecore_timer_add(es->cfg->hide_timeout, 
+                               _e_shelf_cb_hide_urgent_timer, es);
 	  }
 	else
 	  {
@@ -314,10 +318,12 @@ e_shelf_toggle(E_Shelf *es, int show)
 		  es->hide_timer = NULL;
 	       }
 	     if (!es->hide_animator)
-	       es->hide_animator = ecore_animator_add(_e_shelf_cb_hide_animator, es);
+	       es->hide_animator = 
+               ecore_animator_add(_e_shelf_cb_hide_animator, es);
 	  }
      }
-   else if ((!show) && (!es->hidden) && (!es->gadcon->editing) && (es->cfg->autohide))
+   else if ((!show) && (!es->hidden) && (!es->gadcon->editing) && 
+            (es->cfg->autohide))
      {
 	edje_object_signal_emit(es->o_base, "e,state,hidden", "e");
 	if (es->instant_delay >= 0.0)
@@ -329,7 +335,9 @@ e_shelf_toggle(E_Shelf *es, int show)
                }
 	     es->hidden = 1; 
 	     if (!es->instant_timer)
-	       es->instant_timer = ecore_timer_add(es->instant_delay, _e_shelf_cb_instant_hide_timer, es);
+	       es->instant_timer = 
+               ecore_timer_add(es->instant_delay, 
+                               _e_shelf_cb_instant_hide_timer, es);
 	  }
 	else
 	  {
@@ -340,7 +348,9 @@ e_shelf_toggle(E_Shelf *es, int show)
 	       }
 	     es->hidden = 1; 
 	     if (es->hide_timer) ecore_timer_del(es->hide_timer);
-	     es->hide_timer = ecore_timer_add(es->cfg->hide_timeout, _e_shelf_cb_hide_animator_timer, es);
+	     es->hide_timer = 
+               ecore_timer_add(es->cfg->hide_timeout, 
+                               _e_shelf_cb_hide_animator_timer, es);
 	  }
      }
 }
@@ -375,8 +385,7 @@ e_shelf_resize(E_Shelf *es, int w, int h)
    E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE);
    es->w = w;
    es->h = h;
-   if (es->popup)
-     e_popup_resize(es->popup, es->w, es->h);
+   if (es->popup) e_popup_resize(es->popup, es->w, es->h);
    evas_object_resize(es->o_event, es->w, es->h);
    evas_object_resize(es->o_base, es->w, es->h);
 }
@@ -431,7 +440,7 @@ e_shelf_save(E_Shelf *es)
    else
      {
 	E_Config_Shelf *cf_es;
-	
+
 	cf_es = E_NEW(E_Config_Shelf, 1);
 	cf_es->name = eina_stringshare_add(es->name);
 	cf_es->container = es->zone->container->num;
@@ -470,13 +479,16 @@ EAPI void
 e_shelf_orient(E_Shelf *es, E_Gadcon_Orient orient)
 {
    char buf[PATH_MAX];
+
    E_OBJECT_CHECK(es);
    E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE);
-   
+
    e_gadcon_orient(es->gadcon, orient);
-   snprintf(buf, sizeof(buf), "e,state,orientation,%s", _e_shelf_orient_string_get(es));
+   snprintf(buf, sizeof(buf), "e,state,orientation,%s", 
+            _e_shelf_orient_string_get(es));
    edje_object_signal_emit(es->o_base, buf, "e");
    edje_object_message_signal_process(es->o_base);
+   e_zone_useful_geometry_dirty(es->zone);
 }
 
 EAPI void
@@ -484,7 +496,7 @@ e_shelf_position_calc(E_Shelf *es)
 {
    E_Gadcon_Orient orient = E_GADCON_ORIENT_FLOAT;
    int size = 40;
-   
+
    if (es->cfg)
      {
 	orient = es->cfg->orient;
@@ -592,6 +604,7 @@ e_shelf_position_calc(E_Shelf *es)
 	es->hidden = 0;
 	e_shelf_toggle(es, 0);
      }
+   e_zone_useful_geometry_dirty(es->zone);
 }
 
 EAPI void 
@@ -599,16 +612,14 @@ e_shelf_style_set(E_Shelf *es, const char *style)
 {
    const char *option;
    char buf[1024];
-   
+
    E_OBJECT_CHECK(es);
    E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE);
 
    if (!es->o_base) return;
-
-   if (es->style)
-     eina_stringshare_del(es->style);
+   if (es->style) eina_stringshare_del(es->style);
    es->style = eina_stringshare_add(style);
-   
+
    if (style)
      snprintf(buf, sizeof(buf), "e/shelf/%s/base", style);
    else
@@ -617,7 +628,7 @@ e_shelf_style_set(E_Shelf *es, const char *style)
    if (!e_theme_edje_object_set(es->o_base, "base/theme/shelf", buf))
      e_theme_edje_object_set(es->o_base, "base/theme/shelf", 
 			     "e/shelf/default/base");
-   
+
    option =  edje_object_data_get(es->o_base, "hidden_state_size");
    if (option)
      es->hidden_state_size = atoi(option);
@@ -628,7 +639,7 @@ e_shelf_style_set(E_Shelf *es, const char *style)
      es->instant_delay = atof(option);
    else
      es->instant_delay = -1.0;
-   
+
    e_gadcon_unpopulate(es->gadcon);
    e_gadcon_populate(es->gadcon);
 }
@@ -684,7 +695,7 @@ e_shelf_config_new(E_Zone *zone, E_Config_Shelf *cf_es)
    E_Shelf *es;
 
    es = e_shelf_zone_new(zone, cf_es->name, cf_es->style,
-	 cf_es->popup, cf_es->layer, cf_es->id);
+                         cf_es->popup, cf_es->layer, cf_es->id);
    if (!es) return NULL;
 
    if (!cf_es->hide_timeout) cf_es->hide_timeout = 1.0; 
@@ -726,6 +737,7 @@ e_shelf_config_new(E_Zone *zone, E_Config_Shelf *cf_es)
 static void
 _e_shelf_free(E_Shelf *es)
 {
+   e_zone_useful_geometry_dirty(es->zone);
    E_FREE_LIST(es->handlers, ecore_event_handler_del);
 
    e_object_del(E_OBJECT(es->gadcon));
@@ -760,7 +772,8 @@ _e_shelf_free(E_Shelf *es)
    if (es->popup)
      {
 	e_drop_xdnd_register_set(es->popup->evas_win, 0);
-	eina_hash_del(winid_shelves, e_util_winid_str_get(es->popup->evas_win), es);
+	eina_hash_del(winid_shelves, 
+                      e_util_winid_str_get(es->popup->evas_win), es);
 	if (!eina_hash_population(winid_shelves))
 	  {
 	    eina_hash_free(winid_shelves);
@@ -775,7 +788,7 @@ static const char *
 _e_shelf_orient_string_get(E_Shelf *es)
 {
    const char *sig = "";
-   
+
    switch (es->gadcon->orient)
      {
       case E_GADCON_ORIENT_FLOAT:
@@ -840,7 +853,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
 {
    E_Shelf *es;
    Evas_Coord nx, ny, nw, nh, ww, hh;
-   
+
    es = data;
    nx = es->x;
    ny = es->y;
@@ -999,6 +1012,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
 	break;
      }
    e_shelf_move_resize(es, nx, ny, nw, nh);
+   e_zone_useful_geometry_dirty(es->zone);
 }
 
 static Evas_Object *
@@ -1007,7 +1021,7 @@ _e_shelf_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *styl
    E_Shelf *es;
    Evas_Object *o;
    char buf[4096];
-   
+
    es = data;
    o = edje_object_add(gcc->gadcon->evas);
 
@@ -1024,7 +1038,8 @@ _e_shelf_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *styl
 	     return NULL;
 	  }
      }
-   snprintf(buf, sizeof(buf), "e,state,orientation,%s", _e_shelf_orient_string_get(es));
+   snprintf(buf, sizeof(buf), "e,state,orientation,%s", 
+            _e_shelf_orient_string_get(es));
    edje_object_signal_emit(es->o_base, buf, "e");
    edje_object_message_signal_process(o);
    return o;
@@ -1035,7 +1050,7 @@ _e_shelf_toggle_border_fix(E_Shelf *es)
 {
    Eina_List *l;
 
-   if (es->cfg->overlap || !e_config->border_fix_on_shelf_toggle)
+   if ((es->cfg->overlap) || (!e_config->border_fix_on_shelf_toggle))
      return;
 
    for (l = e_border_client_list(); l; l = l->next)
@@ -1045,12 +1060,10 @@ _e_shelf_toggle_border_fix(E_Shelf *es)
 	bd = l->data;
 	if ((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_NONE)
 	  {
-	     if (bd->lock_client_location)
-	       continue;
+	     if (bd->lock_client_location) continue;
 	     if (es->hidden)
 	       {
-		  if (!bd->shelf_fix.modified)
-		    continue;
+		  if (!bd->shelf_fix.modified) continue;
 		  if (!--bd->shelf_fix.modified)
 		    {
 		       e_border_move(bd, bd->shelf_fix.x, bd->shelf_fix.y);
@@ -1059,7 +1072,7 @@ _e_shelf_toggle_border_fix(E_Shelf *es)
 	       }
 
 	     if (!E_INTERSECTS(bd->x, bd->y, bd->w, bd->h,
-		      es->x, es->y, es->w, es->h))
+                               es->x, es->y, es->w, es->h))
 	       continue;
 
 	     if (!es->hidden)
@@ -1074,27 +1087,27 @@ _e_shelf_toggle_border_fix(E_Shelf *es)
 		case E_GADCON_ORIENT_TOP:
 		case E_GADCON_ORIENT_CORNER_TL:
 		case E_GADCON_ORIENT_CORNER_TR:
-		   if (!es->hidden)
-		     e_border_move(bd, bd->x, bd->y + es->h);
-		   break;
+                  if (!es->hidden)
+                    e_border_move(bd, bd->x, bd->y + es->h);
+                  break;
 		case E_GADCON_ORIENT_BOTTOM:
 		case E_GADCON_ORIENT_CORNER_BL:
 		case E_GADCON_ORIENT_CORNER_BR:
-		   if (!es->hidden)
-		     e_border_move(bd, bd->x, bd->y - es->h);
-		   break;
+                  if (!es->hidden)
+                    e_border_move(bd, bd->x, bd->y - es->h);
+                  break;
 		case E_GADCON_ORIENT_LEFT:
 		case E_GADCON_ORIENT_CORNER_LB:
 		case E_GADCON_ORIENT_CORNER_LT:
-		   if (!es->hidden)
-		     e_border_move(bd, bd->x + es->w, bd->y);
-		   break; 
+                  if (!es->hidden)
+                    e_border_move(bd, bd->x + es->w, bd->y);
+                  break; 
 		case E_GADCON_ORIENT_RIGHT:
 		case E_GADCON_ORIENT_CORNER_RB:
 		case E_GADCON_ORIENT_CORNER_RT:
-		   if (!es->hidden)
-		     e_border_move(bd, bd->x - es->w, bd->y);
-		   break; 
+                  if (!es->hidden)
+                    e_border_move(bd, bd->x - es->w, bd->y);
+                  break; 
 		default:
 		   break;
 	       }
@@ -1102,6 +1115,7 @@ _e_shelf_toggle_border_fix(E_Shelf *es)
 	else
 	  {
 	     E_Maximize max;
+
 	     max = bd->maximized;
 	     e_border_unmaximize(bd, E_MAXIMIZE_BOTH);
 	     e_border_maximize(bd, max);
@@ -1112,7 +1126,9 @@ _e_shelf_toggle_border_fix(E_Shelf *es)
 static void
 _e_shelf_menu_item_free(void *data)
 {
-   E_Shelf *es = e_object_data_get(data);
+   E_Shelf *es;
+
+   es = e_object_data_get(data);
    e_shelf_locked_set(es, 0);
 }
 
@@ -1123,7 +1139,7 @@ _e_shelf_menu_append(E_Shelf *es, E_Menu *mn)
    E_Menu *subm;
    const char *name;
    char buf[256];
-   
+
    name = es->name;
    if (!name) name = _("Shelf #");
    snprintf(buf, sizeof(buf), "%s %i", name, es->id);
@@ -1144,7 +1160,7 @@ static void
 _e_shelf_cb_menu_items_append(void *data, E_Gadcon_Client *gcc, E_Menu *mn)
 {
    E_Shelf *es;
-   
+
    es = data;
    _e_shelf_menu_append(es, mn);
 }
@@ -1153,7 +1169,7 @@ static void
 _e_shelf_cb_locked_set(void *data, int lock)
 {
    E_Shelf *es;
-   
+
    es = data;
    e_shelf_locked_set(es, lock);
 }
@@ -1162,7 +1178,7 @@ static void
 _e_shelf_cb_urgent_show(void *data)
 {
    E_Shelf *es;
-   
+
    es = data;
    e_shelf_urgent_show(es);
 }
@@ -1171,7 +1187,7 @@ static void
 _e_shelf_cb_menu_config(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Shelf *es;
-   
+
    es = data;
    if (!es->config_dialog) e_int_shelf_config(es);
 }
@@ -1180,7 +1196,7 @@ static void
 _e_shelf_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Shelf *es;
-   
+
    es = data;
    if (es->gadcon->editing)
      {
@@ -1198,10 +1214,9 @@ static void
 _e_shelf_cb_menu_contents(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Shelf *es;
-   
+
    es = data;
-   if (!es->gadcon->config_dialog)
-     e_int_gadcon_config_shelf(es->gadcon);
+   if (!es->gadcon->config_dialog) e_int_gadcon_config_shelf(es->gadcon);
 }
 
 static void
@@ -1237,9 +1252,8 @@ _e_shelf_cb_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Shelf *es;
    E_Config_Shelf *cfg;
-  
-   es = data;
 
+   es = data;
    if (e_config->cnfmdlg_disabled) 
      {
 	cfg = es->cfg;
@@ -1249,11 +1263,11 @@ _e_shelf_cb_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi)
 	if (cfg->name) eina_stringshare_del(cfg->name);
 	if (cfg->style) eina_stringshare_del(cfg->style);
 	E_FREE(cfg);
-	
+
 	e_config_save_queue();
 	return;
      }
-   
+
    e_object_ref(E_OBJECT(es));
    e_confirm_dialog_show(_("Are you sure you want to delete this shelf?"), "enlightenment",
 			 _("You requested to delete this shelf.<br>"
@@ -1267,7 +1281,7 @@ static void
 _e_shelf_cb_menu_post(void *data, E_Menu *m)
 {
    E_Shelf *es;
-   
+
    es = data;
    if (!es->menu) return;
    e_object_del(E_OBJECT(es->menu));
@@ -1282,7 +1296,7 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_inf
    E_Menu *mn;
    int cx, cy, cw, ch;
    E_Zone *zone;
-   
+
    es = data;
    ev = event_info;
    switch (ev->button)
@@ -1294,9 +1308,9 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_inf
 	mn = e_menu_new();
 	e_menu_post_deactivate_callback_set(mn, _e_shelf_cb_menu_post, es);
 	es->menu = mn;
-	
+
 	_e_shelf_menu_append(es, mn);
-	
+
         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);
@@ -1312,7 +1326,7 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_inf
 static int
 _e_shelf_cb_mouse_in(void *data, int type, void *event)
 {
-   E_Shelf              *es;
+   E_Shelf *es;
 
    es = data;
    if (es->cfg->autohide_show_action) return 1;
@@ -1320,58 +1334,70 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
    if ((type == E_EVENT_ZONE_EDGE_IN) || (type == E_EVENT_ZONE_EDGE_MOVE))
      {
 	E_Event_Zone_Edge *ev;
-	int                show = 0;
+	int show = 0;
 
 	ev = event;
 	if (es->zone != ev->zone) return 1;
 	switch (es->gadcon->orient)
 	  {
 	   case E_GADCON_ORIENT_LEFT:
-	      if ((ev->edge == E_ZONE_EDGE_LEFT) && (ev->y >= es->y) && (ev->y <= (es->y + es->h)))
-		show = 1;
-	      break;
+             if ((ev->edge == E_ZONE_EDGE_LEFT) && (ev->y >= es->y) && 
+                 (ev->y <= (es->y + es->h)))
+               show = 1;
+             break;
 	   case E_GADCON_ORIENT_RIGHT:
-	      if ((ev->edge == E_ZONE_EDGE_RIGHT) && (ev->y >= es->y) && (ev->y <= (es->y + es->h)))
-		show = 1;
-	      break;
+             if ((ev->edge == E_ZONE_EDGE_RIGHT) && (ev->y >= es->y) && 
+                 (ev->y <= (es->y + es->h)))
+               show = 1;
+             break;
 	   case E_GADCON_ORIENT_TOP:
-	      if ((ev->edge == E_ZONE_EDGE_TOP) && (ev->x >= es->x) && (ev->x <= (es->x + es->w)))
-		show = 1;
-	      break;
+             if ((ev->edge == E_ZONE_EDGE_TOP) && (ev->x >= es->x) && 
+                 (ev->x <= (es->x + es->w)))
+               show = 1;
+             break;
 	   case E_GADCON_ORIENT_BOTTOM:
-	      if ((ev->edge == E_ZONE_EDGE_BOTTOM) && (ev->x >= es->x) && (ev->x <= (es->x + es->w)))
-		show = 1;
-	      break;
+             if ((ev->edge == E_ZONE_EDGE_BOTTOM) && (ev->x >= es->x) && 
+                 (ev->x <= (es->x + es->w)))
+               show = 1;
+             break;
 	   case E_GADCON_ORIENT_CORNER_TL:
 	   case E_GADCON_ORIENT_CORNER_LT:
-	      if ((ev->edge == E_ZONE_EDGE_TOP) && (ev->x >= es->x) && (ev->x <= (es->x + es->w)))
-		show = 1;
-	      else if ((ev->edge == E_ZONE_EDGE_LEFT) && (ev->y >= es->y) && (ev->y <= (es->y + es->h)))
-		show = 1;
-	      break;
+             if ((ev->edge == E_ZONE_EDGE_TOP) && (ev->x >= es->x) && 
+                 (ev->x <= (es->x + es->w)))
+               show = 1;
+             else if ((ev->edge == E_ZONE_EDGE_LEFT) && (ev->y >= es->y) && 
+                      (ev->y <= (es->y + es->h)))
+               show = 1;
+             break;
 	   case E_GADCON_ORIENT_CORNER_TR:
 	   case E_GADCON_ORIENT_CORNER_RT:
-	      if ((ev->edge == E_ZONE_EDGE_TOP) && (ev->x >= es->x) && (ev->x <= (es->x + es->w)))
-		show = 1;
-	      else if ((ev->edge == E_ZONE_EDGE_RIGHT) && (ev->y >= es->y) && (ev->y <= (es->y + es->h)))
-		show = 1;
-	      break;
+             if ((ev->edge == E_ZONE_EDGE_TOP) && (ev->x >= es->x) && 
+                 (ev->x <= (es->x + es->w)))
+               show = 1;
+             else if ((ev->edge == E_ZONE_EDGE_RIGHT) && (ev->y >= es->y) && 
+                      (ev->y <= (es->y + es->h)))
+               show = 1;
+             break;
 	   case E_GADCON_ORIENT_CORNER_BL:
 	   case E_GADCON_ORIENT_CORNER_LB:
-	      if ((ev->edge == E_ZONE_EDGE_BOTTOM) && (ev->x >= es->x) && (ev->x <= (es->x + es->w)))
-		show = 1;
-	      else if ((ev->edge == E_ZONE_EDGE_LEFT) && (ev->y >= es->y) && (ev->y <= (es->y + es->h)))
-		show = 1;
-	      break;
+             if ((ev->edge == E_ZONE_EDGE_BOTTOM) && (ev->x >= es->x) && 
+                 (ev->x <= (es->x + es->w)))
+               show = 1;
+             else if ((ev->edge == E_ZONE_EDGE_LEFT) && (ev->y >= es->y) && 
+                      (ev->y <= (es->y + es->h)))
+               show = 1;
+             break;
 	   case E_GADCON_ORIENT_CORNER_BR:
 	   case E_GADCON_ORIENT_CORNER_RB:
-	      if ((ev->edge == E_ZONE_EDGE_BOTTOM) && (ev->x >= es->x) && (ev->x <= (es->x + es->w)))
-		show = 1;
-	      else if ((ev->edge == E_ZONE_EDGE_RIGHT) && (ev->y >= es->y) && (ev->y <= (es->y + es->h)))
-		show = 1;
-	      break;
+             if ((ev->edge == E_ZONE_EDGE_BOTTOM) && (ev->x >= es->x) && 
+                 (ev->x <= (es->x + es->w)))
+               show = 1;
+             else if ((ev->edge == E_ZONE_EDGE_RIGHT) && (ev->y >= es->y) && 
+                      (ev->y <= (es->y + es->h)))
+               show = 1;
+             break;
 	   default:
-	      break;
+             break;
 	  }
 
 	if (show)
@@ -1404,15 +1430,15 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
 static int
 _e_shelf_cb_mouse_out(void *data, int type, void *event)
 {
-   E_Shelf                 *es;
-   Ecore_X_Window           win;
+   E_Shelf *es;
+   Ecore_X_Window win;
 
    es = data;
-   
+
    if (type == E_EVENT_ZONE_EDGE_OUT)
      {
 	E_Event_Zone_Edge *ev;
-	int                show = 1;
+	int show = 1;
 
 	ev = event;
 	if (es->zone != ev->zone) return 1;
@@ -1421,32 +1447,30 @@ _e_shelf_cb_mouse_out(void *data, int type, void *event)
 	   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;
+             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;
+             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;
+             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;
+             if ((ev->edge == E_ZONE_EDGE_BOTTOM) && (-ev->y > es->h))
+               show = 0;
+             break;
 	   default:
-	      break;
-	      
+             break;
 	  }
-	
 	if (!show) e_shelf_toggle(es, 0);
      }
    else if (type == ECORE_X_EVENT_MOUSE_OUT)
@@ -1492,9 +1516,8 @@ _e_shelf_cb_hide_animator(void *data)
 {
    E_Shelf *es;
    int step, hide_max;
-   
-   es = data;
 
+   es = data;
    switch (es->gadcon->orient)
      {
       case E_GADCON_ORIENT_TOP:
@@ -1503,20 +1526,18 @@ _e_shelf_cb_hide_animator(void *data)
       case E_GADCON_ORIENT_BOTTOM:
       case E_GADCON_ORIENT_CORNER_BL:
       case E_GADCON_ORIENT_CORNER_BR:
-	 hide_max = es->h - es->hidden_state_size;
-	 if (es->hide_origin == -1)
-	   es->hide_origin = es->y;	 
-	 break;
+        hide_max = es->h - es->hidden_state_size;
+        if (es->hide_origin == -1) es->hide_origin = es->y;	 
+        break;
       case E_GADCON_ORIENT_LEFT:
       case E_GADCON_ORIENT_CORNER_LB:
       case E_GADCON_ORIENT_CORNER_LT:
       case E_GADCON_ORIENT_RIGHT:
       case E_GADCON_ORIENT_CORNER_RB:
       case E_GADCON_ORIENT_CORNER_RT:
-	 hide_max = es->w - es->hidden_state_size;
-	 if (es->hide_origin == -1)
-	   es->hide_origin = es->x;
-	 break;
+        hide_max = es->w - es->hidden_state_size;
+        if (es->hide_origin == -1) es->hide_origin = es->x;
+        break;
      }
 
    step = (hide_max / e_config->framerate) / es->cfg->hide_duration;
@@ -1527,13 +1548,9 @@ _e_shelf_cb_hide_animator(void *data)
 	if (es->hide_step < hide_max)
 	  {
 	     if (es->hide_step + step > hide_max)
-	       {
-		  es->hide_step = hide_max;
-	       }
+               es->hide_step = hide_max;
 	     else
-	       {
-		  es->hide_step += step;
-	       }
+               es->hide_step += step;
 	  }
 	else goto end;
      }
@@ -1542,13 +1559,9 @@ _e_shelf_cb_hide_animator(void *data)
 	if (es->hide_step > 0)
 	  {
 	     if (es->hide_step < step)
-	       {
-		  es->hide_step = 0;
-	       }
+               es->hide_step = 0;
 	     else
-	       {
-		  es->hide_step -= step;	       
-	       }
+               es->hide_step -= step;	       
 	  }
 	else goto end;
      }
@@ -1558,28 +1571,28 @@ _e_shelf_cb_hide_animator(void *data)
       case E_GADCON_ORIENT_TOP:
       case E_GADCON_ORIENT_CORNER_TL:
       case E_GADCON_ORIENT_CORNER_TR:
-	 e_shelf_move(es, es->x, es->hide_origin - es->hide_step);
-	 break;
+        e_shelf_move(es, es->x, es->hide_origin - es->hide_step);
+        break;
       case E_GADCON_ORIENT_BOTTOM:
       case E_GADCON_ORIENT_CORNER_BL:
       case E_GADCON_ORIENT_CORNER_BR:
-	 e_shelf_move(es, es->x, es->hide_origin + es->hide_step);
-	 break;
+        e_shelf_move(es, es->x, es->hide_origin + es->hide_step);
+        break;
       case E_GADCON_ORIENT_LEFT:
       case E_GADCON_ORIENT_CORNER_LB:
       case E_GADCON_ORIENT_CORNER_LT:
-	 e_shelf_move(es, es->hide_origin - es->hide_step, es->y);
-	 break;
+        e_shelf_move(es, es->hide_origin - es->hide_step, es->y);
+        break;
       case E_GADCON_ORIENT_RIGHT:
       case E_GADCON_ORIENT_CORNER_RB:
       case E_GADCON_ORIENT_CORNER_RT:
-	 e_shelf_move(es, es->hide_origin + es->hide_step, es->y);
-	 break;
+        e_shelf_move(es, es->hide_origin + es->hide_step, es->y);
+        break;
      }
-   
+
    return 1;
 
- end:
+end:
    es->hide_animator = NULL;
    if (es->interrupted > -1)
      e_shelf_toggle(es, es->interrupted);
@@ -1609,8 +1622,7 @@ _e_shelf_cb_hide_urgent_timer(void *data)
 
    es = data;
    es->hide_timer = NULL;
-   if (es->urgent_show)
-     e_shelf_toggle(es, 0);
+   if (es->urgent_show) e_shelf_toggle(es, 0);
    return 0;
 }
 
@@ -1620,41 +1632,40 @@ _e_shelf_cb_instant_hide_timer(void *data)
    E_Shelf *es;
 
    es = data;
-
    switch (es->gadcon->orient)
      {
       case E_GADCON_ORIENT_TOP:
       case E_GADCON_ORIENT_CORNER_TL:
       case E_GADCON_ORIENT_CORNER_TR:
-	 if (es->hidden)
-	   e_shelf_move(es, es->x, es->y - es->h + es->hidden_state_size);
-	 else
-	   e_shelf_move(es, es->x, es->y + es->h - es->hidden_state_size);
-	 break;
+        if (es->hidden)
+          e_shelf_move(es, es->x, es->y - es->h + es->hidden_state_size);
+        else
+          e_shelf_move(es, es->x, es->y + es->h - es->hidden_state_size);
+        break;
       case E_GADCON_ORIENT_BOTTOM:
       case E_GADCON_ORIENT_CORNER_BL:
       case E_GADCON_ORIENT_CORNER_BR:
-	 if (es->hidden)
-	   e_shelf_move(es, es->x, es->y + es->h - es->hidden_state_size);
-	 else
-	   e_shelf_move(es, es->x, es->y - es->h + es->hidden_state_size);
-	 break;
+        if (es->hidden)
+          e_shelf_move(es, es->x, es->y + es->h - es->hidden_state_size);
+        else
+          e_shelf_move(es, es->x, es->y - es->h + es->hidden_state_size);
+        break;
       case E_GADCON_ORIENT_LEFT:
       case E_GADCON_ORIENT_CORNER_LB:
       case E_GADCON_ORIENT_CORNER_LT:
-	 if (es->hidden)
-	   e_shelf_move(es, es->x - es->w + es->hidden_state_size, es->y);
-	 else
-	   e_shelf_move(es, es->x + es->w - es->hidden_state_size, es->y);
-	 break; 
+        if (es->hidden)
+          e_shelf_move(es, es->x - es->w + es->hidden_state_size, es->y);
+        else
+          e_shelf_move(es, es->x + es->w - es->hidden_state_size, es->y);
+        break; 
       case E_GADCON_ORIENT_RIGHT:
       case E_GADCON_ORIENT_CORNER_RB:
       case E_GADCON_ORIENT_CORNER_RT:
-	 if (es->hidden)
-	   e_shelf_move(es, es->x + es->w - es->hidden_state_size, es->y);
-	 else
-	   e_shelf_move(es, es->x - es->w + es->hidden_state_size, es->y);
-	 break; 
+        if (es->hidden)
+          e_shelf_move(es, es->x + es->w - es->hidden_state_size, es->y);
+        else
+          e_shelf_move(es, es->x - es->w + es->hidden_state_size, es->y);
+        break; 
       default:
 	 break;
      }
@@ -1671,7 +1682,7 @@ _e_shelf_menu_pre_cb(void *data, E_Menu *m)
 
    es = data;
    e_menu_pre_activate_callback_set(m, NULL, NULL);
-   
+
    mi = e_menu_item_new(m);
    if (es->gadcon->editing)
      e_menu_item_label_set(mi, _("Stop Moving/Resizing Items"));
@@ -1687,12 +1698,12 @@ _e_shelf_menu_pre_cb(void *data, E_Menu *m)
    e_menu_item_label_set(mi, _("Shelf Settings"));
    e_util_menu_item_theme_icon_set(mi, "configure");
    e_menu_item_callback_set(mi, _e_shelf_cb_menu_config, es);
-   
+
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Set Shelf Contents"));
    e_util_menu_item_theme_icon_set(mi, "preferences-desktop-shelf");
    e_menu_item_callback_set(mi, _e_shelf_cb_menu_contents, es);
-   
+
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Delete this Shelf"));
    e_util_menu_item_theme_icon_set(mi, "list-remove");
diff --git a/src/bin/e_toolbar.c b/src/bin/e_toolbar.c
index f369360..0355ceb 100644
--- a/src/bin/e_toolbar.c
+++ b/src/bin/e_toolbar.c
@@ -148,6 +148,15 @@ e_toolbar_show(E_Toolbar *tbar)
 }
 
 EAPI void 
+e_toolbar_hide(E_Toolbar *tbar) 
+{
+   E_OBJECT_CHECK(tbar);
+   E_OBJECT_TYPE_CHECK(tbar, E_TOOLBAR_TYPE);
+   evas_object_hide(tbar->o_event);
+   evas_object_hide(tbar->o_base);
+}
+
+EAPI void 
 e_toolbar_move(E_Toolbar *tbar, int x, int y) 
 {
    E_OBJECT_CHECK(tbar);
diff --git a/src/bin/e_toolbar.h b/src/bin/e_toolbar.h
index ac09c71..055d1e5 100644
--- a/src/bin/e_toolbar.h
+++ b/src/bin/e_toolbar.h
@@ -34,6 +34,7 @@ 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);
diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index e5e83ea..177cbfe 100644
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -364,8 +364,8 @@ e_util_edje_icon_check(const char *name)
 }
 
 
-/* WARNING This function is deprecated,. must be made static. 
- * You should use e_util_theme_icon_set instead 
+/* WARNING This function is deprecated,. must be made static.
+ * You should use e_util_icon_theme_set instead
  */
 EAPI int
 e_util_edje_icon_set(Evas_Object *obj, const char *name)
@@ -652,6 +652,7 @@ e_util_filename_escape(const char *filename)
    char *q;
    static char buf[4096];
 
+   if (!filename) return NULL;
    p = filename;
    q = buf;
    while (*p)
@@ -1061,7 +1062,7 @@ e_util_win_auto_resize_fill(E_Win *win)
      {
 	int w, h;
 
-	e_zone_useful_geometry_calc(zone, NULL, NULL, &w, &h);
+	e_zone_useful_geometry_get(zone, NULL, NULL, &w, &h);
 
         w = _win_auto_size_calc(w, win->min_w);
         h = _win_auto_size_calc(h, win->min_h);
diff --git a/src/bin/e_widget_list.c b/src/bin/e_widget_list.c
index 08700ab..5e93f01 100644
--- a/src/bin/e_widget_list.c
+++ b/src/bin/e_widget_list.c
@@ -70,6 +70,13 @@ e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int e
    evas_object_show(sobj);
 }
 
+EAPI void
+e_widget_list_homogeneous_set(Evas_Object *obj, int homogenous)
+{
+   E_Widget_Data *wd = e_widget_data_get(obj);
+   e_box_homogenous_set(wd->o_box, homogenous);
+}
+
 static void
 _e_wid_del_hook(Evas_Object *obj)
 {
diff --git a/src/bin/e_widget_list.h b/src/bin/e_widget_list.h
index 29eb0b8..f30c4da 100644
--- a/src/bin/e_widget_list.h
+++ b/src/bin/e_widget_list.h
@@ -8,7 +8,8 @@
 
 EAPI Evas_Object *e_widget_list_add(Evas *evas, int homogenous, int horiz);
 EAPI void e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int expand, double align);
-    
+EAPI void e_widget_list_homogeneous_set(Evas_Object *obj, int homogenous);
+
 
 #endif
 #endif
diff --git a/src/bin/e_widget_toolbar.c b/src/bin/e_widget_toolbar.c
index e416bab..ac322e6 100644
--- a/src/bin/e_widget_toolbar.c
+++ b/src/bin/e_widget_toolbar.c
@@ -11,6 +11,7 @@ struct _E_Widget_Data
    int icon_w, icon_h;
    Eina_List *items;
    Evas_Bool scrollable : 1;
+   Evas_Bool focus_steal : 1;
 };
 
 struct _Item
@@ -49,6 +50,7 @@ e_widget_toolbar_add(Evas *evas, int icon_w, int icon_h)
    e_widget_data_set(obj, wd);
    wd->icon_w = icon_w;
    wd->icon_h = icon_h;
+   wd->focus_steal = 1;
    
    o = e_scrollframe_add(evas);
    wd->o_base = o;
@@ -133,6 +135,23 @@ e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *la
 }
 
 EAPI void
+e_widget_toolbar_item_remove(Evas_Object *obj, int num)
+{
+   E_Widget_Data *wd;
+   Item *it;
+
+   wd = e_widget_data_get(obj);
+   it = eina_list_nth(wd->items, num);
+   if (it)
+     {
+	evas_object_del(it->o_base);
+	evas_object_del(it->o_icon);
+	wd->items = eina_list_remove(wd->items, it);
+	free(it);
+     }
+}
+
+EAPI void
 e_widget_toolbar_item_select(Evas_Object *obj, int num)
 {
    E_Widget_Data *wd;
@@ -168,6 +187,30 @@ e_widget_toolbar_item_select(Evas_Object *obj, int num)
 }
 
 EAPI void
+e_widget_toolbar_item_label_set(Evas_Object *obj, int num, const char *label)
+{
+   E_Widget_Data *wd;
+   Item *it;
+
+   wd = e_widget_data_get(obj);
+   it = eina_list_nth(wd->items, num);
+   if (it)
+     {
+	int mw, mh;
+
+	edje_object_part_text_set(it->o_base, "e.text.label", label);
+	edje_object_size_min_calc(it->o_base, &mw, &mh);
+	e_box_pack_options_set(it->o_base,
+			       1, 1, /* fill */
+			       0, 0, /* expand */
+			       0.5, 0.5, /* align */
+			       mw, mh, /* min */
+			       9999, 9999 /* max */
+			       );
+     }
+}
+
+EAPI void
 e_widget_toolbar_scrollable_set(Evas_Object *obj, Evas_Bool scrollable)
 {
    E_Widget_Data *wd;
@@ -185,6 +228,29 @@ e_widget_toolbar_scrollable_set(Evas_Object *obj, Evas_Bool scrollable)
      e_widget_min_size_set(obj, mw + (500 - vw), mh + (500 - vh));
 }
 
+EAPI void
+e_widget_toolbar_focus_steal_set(Evas_Object *obj, Evas_Bool steal)
+{
+   E_Widget_Data *wd;
+
+   wd = e_widget_data_get(obj);
+   if (wd->focus_steal == steal) return;
+   if (steal)
+     {
+	evas_object_event_callback_add(e_scrollframe_edje_object_get(wd->o_base), 
+				       EVAS_CALLBACK_MOUSE_DOWN,
+				       _e_wid_focus_steal, obj);
+	wd->focus_steal = 1;
+     }
+   else
+     {
+	evas_object_event_callback_del(e_scrollframe_edje_object_get(wd->o_base), 
+				       EVAS_CALLBACK_MOUSE_DOWN,
+				       _e_wid_focus_steal);
+	wd->focus_steal = 0;
+     }
+}
+
 static void
 _e_wid_del_hook(Evas_Object *obj)
 {
diff --git a/src/bin/e_widget_toolbar.h b/src/bin/e_widget_toolbar.h
index 5595b87..1dfc13d 100644
--- a/src/bin/e_widget_toolbar.h
+++ b/src/bin/e_widget_toolbar.h
@@ -8,8 +8,11 @@
 
 EAPI Evas_Object *e_widget_toolbar_add(Evas *evas, int icon_w, int icon_h);
 EAPI void e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data1, void *data2), const void *data1, const void *data2);
+EAPI void e_widget_toolbar_item_remove(Evas_Object *obj, int num);
 EAPI void e_widget_toolbar_item_select(Evas_Object *obj, int num);
+EAPI void e_widget_toolbar_item_label_set(Evas_Object *obj, int num, const char *label);
 EAPI void e_widget_toolbar_scrollable_set(Evas_Object *obj, Evas_Bool scrollable);
+EAPI void e_widget_toolbar_focus_steal_set(Evas_Object *obj, Evas_Bool steal);
 
 #endif
 #endif
diff --git a/src/bin/e_win.c b/src/bin/e_win.c
index abb9612..685d96f 100644
--- a/src/bin/e_win.c
+++ b/src/bin/e_win.c
@@ -110,43 +110,68 @@ e_win_hide(E_Win *win)
    if (win->border) e_border_hide(win->border, 1);
 }
 
+/**
+ * This will move window to position, automatically accounts border decorations.
+ *
+ * Don't need to account win->border->client_inset, it's done
+ * automatically, so it will work fine with new windows that still
+ * don't have the border.
+ *
+ * @parm x horizontal position to place window.
+ * @parm y vertical position to place window.
+ */
 EAPI void
 e_win_move(E_Win *win, int x, int y)
 {
    E_OBJECT_CHECK(win);
    E_OBJECT_TYPE_CHECK(win, E_WIN_TYPE);
    if (win->border)
-     e_border_move(win->border,
-		   x - win->border->client_inset.l,
-		   y - win->border->client_inset.t);
+     e_border_move_without_border(win->border, x, y);
    else
      ecore_evas_move(win->ecore_evas, x, y);
 }
 
+/**
+ * This will resize window, automatically accounts border decorations.
+ *
+ * Don't need to account win->border->client_inset, it's done
+ * automatically, so it will work fine with new windows that still
+ * don't have the border.
+ *
+ * @parm w horizontal window size.
+ * @parm h vertical window size.
+ */
 EAPI void
 e_win_resize(E_Win *win, int w, int h)
 {
    E_OBJECT_CHECK(win);
    E_OBJECT_TYPE_CHECK(win, E_WIN_TYPE);
    if (win->border)
-     e_border_resize(win->border,
-		     w + win->border->client_inset.l + win->border->client_inset.r, 
-		     h + win->border->client_inset.t + win->border->client_inset.b);
+     e_border_resize_without_border(win->border, w, h);
    else
      ecore_evas_resize(win->ecore_evas, w, h);
 }
 
+/**
+ * This will move and resize window to position, automatically
+ * accounts border decorations.
+ *
+ * Don't need to account win->border->client_inset, it's done
+ * automatically, so it will work fine with new windows that still
+ * don't have the border.
+ *
+ * @parm x horizontal position to place window.
+ * @parm y vertical position to place window.
+ * @parm w horizontal window size.
+ * @parm h vertical window size.
+ */
 EAPI void
 e_win_move_resize(E_Win *win, int x, int y, int w, int h)
 {
    E_OBJECT_CHECK(win);
    E_OBJECT_TYPE_CHECK(win, E_WIN_TYPE);
    if (win->border)
-     e_border_move_resize(win->border,
-			  x - win->border->client_inset.l,
-			  y - win->border->client_inset.t,
-			  w + win->border->client_inset.l + win->border->client_inset.r,
-			  h + win->border->client_inset.t + win->border->client_inset.b);
+     e_border_move_resize_without_border(win->border, x, y, w, h);
    else
      ecore_evas_move_resize(win->ecore_evas, x, y, w, h);
 }
@@ -327,16 +352,7 @@ e_win_centered_set(E_Win *win, int centered)
 	_e_win_state_update(win);
      }
    if ((win->border) && (centered))
-     {
-	int x, y, w, h;
-
-	e_zone_useful_geometry_calc(win->border->zone, &x, &y, &w, &h);
-
-	/* The window is visible, move it to the right spot */
-	e_border_move(win->border,
-		      win->border->zone->x + x + (w - win->border->w) / 2,
-		      win->border->zone->y + y + (h - win->border->h) / 2);
-     }
+     e_border_center(win->border);
 }
 
 EAPI void
diff --git a/src/bin/e_xinerama.c b/src/bin/e_xinerama.c
index b16fea5..67fe361 100644
--- a/src/bin/e_xinerama.c
+++ b/src/bin/e_xinerama.c
@@ -211,7 +211,14 @@ _e_xinerama_cb_screen_sort(const void *data1, const void *data2)
 
    scr = data1;
    scr2 = data2;
-   dif = (scr2->w * scr2->h) - (scr->w * scr->h);
-   if (dif == 0) return scr->screen - scr2->screen;
+   if (scr2->x != scr->x)
+     return scr2->x - scr->x;
+   else if (scr2->y != scr->y)
+     return scr2->y - scr->y;
+   else
+     {
+       dif = (scr2->w * scr2->h) - (scr->w * scr->h);
+       if (dif == 0) return scr->screen - scr2->screen;
+     }
    return dif;
 }
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index c939920..4c0c502 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -77,6 +77,7 @@ e_zone_new(E_Container *con, int num, int id, int x, int y, int w, int h)
    zone->h = h;
    zone->num = num;
    zone->id = id;
+   e_zone_useful_geometry_dirty(zone);
 
    cw = w * E_ZONE_CORNER_RATIO;
    ch = h * E_ZONE_CORNER_RATIO;
@@ -234,6 +235,8 @@ e_zone_move(E_Zone *zone, int x, int y)
    zone->x = x;
    zone->y = y;
    evas_object_move(zone->bg_object, x, y);
+   if (zone->bg_scrollframe)
+     evas_object_move(zone->bg_scrollframe, x, y);
    evas_object_move(zone->bg_event_object, x, y);
    evas_object_move(zone->bg_clip_object, x, y);
 
@@ -286,6 +289,8 @@ e_zone_resize(E_Zone *zone, int w, int h)
    zone->w = w;
    zone->h = h;
    evas_object_resize(zone->bg_object, w, h);
+   if (zone->bg_scrollframe)
+     evas_object_resize(zone->bg_scrollframe, w, h);
    evas_object_resize(zone->bg_event_object, w, h);
    evas_object_resize(zone->bg_clip_object, w, h);
 
@@ -344,9 +349,13 @@ e_zone_move_resize(E_Zone *zone, int x, int y, int w, int h)
    zone->h = h;
 
    evas_object_move(zone->bg_object, x, y);
+   if (zone->bg_scrollframe)
+     evas_object_move(zone->bg_scrollframe, x, y);
    evas_object_move(zone->bg_event_object, x, y);
    evas_object_move(zone->bg_clip_object, x, y);
    evas_object_resize(zone->bg_object, w, h);
+   if (zone->bg_scrollframe)
+     evas_object_resize(zone->bg_scrollframe, w, h);
    evas_object_resize(zone->bg_event_object, w, h);
    evas_object_resize(zone->bg_clip_object, w, h);
 
@@ -826,11 +835,8 @@ e_zone_flip_win_restore(void)
      }
 }
 
-/**
- * Calculate the useful (or free, without any shelves) area.
- */
-EAPI void
-e_zone_useful_geometry_calc(const E_Zone *zone, int *x, int *y, int *w, int *h)
+static void
+_e_zone_useful_geometry_calc(E_Zone *zone)
 {
    const Eina_List *l;
    const E_Shelf *shelf;
@@ -891,10 +897,48 @@ e_zone_useful_geometry_calc(const E_Zone *zone, int *x, int *y, int *w, int *h)
 	  }
      }
 
-   if (x) *x = x0;
-   if (y) *y = y0;
-   if (w) *w = x1 - x0;
-   if (h) *h = y1 - y0;
+   zone->useful_geometry.x = zone->x + x0;
+   zone->useful_geometry.y = zone->y + y0;
+   zone->useful_geometry.w = x1 - x0;
+   zone->useful_geometry.h = y1 - y0;
+   zone->useful_geometry.dirty = 0;
+}
+
+
+/**
+ * Get (or calculate) the useful (or free, without any shelves) area.
+ */
+EAPI void
+e_zone_useful_geometry_get(E_Zone *zone, int *x, int *y, int *w, int *h)
+{
+   E_OBJECT_CHECK(zone);
+   E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
+
+   if (zone->useful_geometry.dirty)
+     _e_zone_useful_geometry_calc(zone);
+
+   if (x) *x = zone->useful_geometry.x;
+   if (y) *y = zone->useful_geometry.y;
+   if (w) *w = zone->useful_geometry.w;
+   if (h) *h = zone->useful_geometry.h;
+}
+
+/**
+ * Mark as dirty so e_zone_useful_geometry_get() will need to recalculate.
+ *
+ * Call this function when shelves are added or important properties changed.
+ */
+EAPI void
+e_zone_useful_geometry_dirty(E_Zone *zone)
+{
+   E_OBJECT_CHECK(zone);
+   E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
+
+   zone->useful_geometry.dirty = 1;
+   zone->useful_geometry.x = -1;
+   zone->useful_geometry.y = -1;
+   zone->useful_geometry.w = -1;
+   zone->useful_geometry.h = -1;
 }
 
 /* local subsystem functions */
@@ -903,6 +947,8 @@ _e_zone_free(E_Zone *zone)
 {
    E_Container *con;
    Eina_List *l;
+   Ecore_Animator *anim;
+   void *data;
    int x, y;
 
    /* Delete the edge windows if they exist */
@@ -952,9 +998,14 @@ _e_zone_free(E_Zone *zone)
    con = zone->container;
    if (zone->name) eina_stringshare_del(zone->name);
    con->zones = eina_list_remove(con->zones, zone);
+   anim = evas_object_data_get(zone->bg_object, "switch_animator");
+   if (anim) ecore_animator_del(anim);
+   data = evas_object_data_get(zone->bg_object, "switch_animator_params");
+   if (data) E_FREE(data);
    evas_object_del(zone->bg_event_object);
    evas_object_del(zone->bg_clip_object);
    evas_object_del(zone->bg_object);
+   evas_object_del(zone->bg_scrollframe);
    if (zone->prev_bg_object) evas_object_del(zone->prev_bg_object);
    if (zone->transition_object) evas_object_del(zone->transition_object);
 
diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h
index 1681855..ba0f0c4 100644
--- a/src/bin/e_zone.h
+++ b/src/bin/e_zone.h
@@ -48,6 +48,7 @@ struct _E_Zone
    Evas_Object         *bg_event_object;
    Evas_Object         *bg_clip_object;
    Evas_Object         *prev_bg_object;
+   Evas_Object	       *bg_scrollframe;
    Evas_Object         *transition_object;
    
    int                  desk_x_count, desk_y_count;
@@ -78,6 +79,11 @@ struct _E_Zone
    Evas                *black_evas;
    Ecore_X_Window       black_win;
    int                  id;
+
+   struct {
+      int x, y, w, h;
+      Eina_Bool dirty : 1;
+   } useful_geometry;
 };
 
 struct _E_Event_Zone_Desk_Count_Set
@@ -138,7 +144,8 @@ 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_useful_geometry_calc(const E_Zone *zone, int *x, int *y, int *w, int *h);
+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);
 
 extern EAPI int E_EVENT_ZONE_DESK_COUNT_SET;
 extern EAPI int E_EVENT_ZONE_MOVE_RESIZE;
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index dcb345a..d3d410e 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -246,7 +246,13 @@ if USE_MODULE_SYSCON
 SUBDIRS += syscon
 endif
 
+if USE_MODULE_EVERYTHING
+SUBDIRS += everything
+endif
 
+if USE_MODULE_SYSTRAY
+SUBDIRS += systray
+endif
 
 
 DIST_SUBDIRS = \
@@ -310,5 +316,6 @@ gadman \
 mixer \
 connman \
 illume \
-syscon
-
+syscon \
+everything \
+systray
diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
index ce21bc5..b980b6b 100644
--- a/src/modules/Makefile.in
+++ b/src/modules/Makefile.in
@@ -92,6 +92,8 @@ host_triplet = @host@
 @USE_MODULE_CONNMAN_TRUE at am__append_59 = connman
 @USE_MODULE_ILLUME_TRUE at am__append_60 = illume
 @USE_MODULE_SYSCON_TRUE at am__append_61 = syscon
+ at USE_MODULE_EVERYTHING_TRUE@am__append_62 = everything
+ at USE_MODULE_SYSTRAY_TRUE@am__append_63 = systray
 subdir = src/modules
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -292,6 +294,7 @@ 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@
@@ -304,6 +307,7 @@ 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@
@@ -402,7 +406,7 @@ SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_52) $(am__append_53) $(am__append_54) \
 	$(am__append_55) $(am__append_56) $(am__append_57) \
 	$(am__append_58) $(am__append_59) $(am__append_60) \
-	$(am__append_61)
+	$(am__append_61) $(am__append_62) $(am__append_63)
 DIST_SUBDIRS = \
 ibar \
 dropshadow \
@@ -464,7 +468,9 @@ gadman \
 mixer \
 connman \
 illume \
-syscon
+syscon \
+everything \
+systray
 
 all: all-recursive
 
diff --git a/src/modules/battery/Makefile.in b/src/modules/battery/Makefile.in
index 6765fb9..6d837cf 100644
--- a/src/modules/battery/Makefile.in
+++ b/src/modules/battery/Makefile.in
@@ -264,6 +264,7 @@ 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@
@@ -276,6 +277,7 @@ 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@
diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index 7127768..566fd9a 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -819,8 +819,7 @@ _battery_warning_popup(Instance *inst, int time, double percent)
 
    if ((!inst) || (inst->warning)) return;
 
-   inst->warning = 
-     e_gadcon_popup_new(inst->gcc, NULL);
+   inst->warning = e_gadcon_popup_new(inst->gcc);
    if (!inst->warning) return;
 
    e = inst->warning->win->evas;
diff --git a/src/modules/clock/Makefile.in b/src/modules/clock/Makefile.in
index 35797d6..a93cba3 100644
--- a/src/modules/clock/Makefile.in
+++ b/src/modules/clock/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf/Makefile.in b/src/modules/conf/Makefile.in
index 5a16df4..fd02afb 100644
--- a/src/modules/conf/Makefile.in
+++ b/src/modules/conf/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c
index ddb1f7d..84367ce 100644
--- a/src/modules/conf/e_conf.c
+++ b/src/modules/conf/e_conf.c
@@ -514,8 +514,8 @@ _e_configure_module_update_cb(void *data, int type, void *event)
 
    if (!(eco = data)) return 1;
    if (!eco->cat_list) return 1;
-   sel = e_widget_ilist_selected_get(eco->cat_list);
+//   sel = e_widget_ilist_selected_get(eco->cat_list);
    _e_configure_fill_cat_list(eco);
-   e_widget_ilist_selected_set(eco->cat_list, sel);
+//   e_widget_ilist_selected_set(eco->cat_list, sel);
    return 1;
 }
diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c
index e2de432..7a05839 100644
--- a/src/modules/conf/e_mod_main.c
+++ b/src/modules/conf/e_mod_main.c
@@ -205,6 +205,55 @@ _e_mod_conf_cb(void *data, E_Menu *m, E_Menu_Item *mi)
    e_configure_show(m->zone->container);
 }
 
+static void
+_e_mod_mode_presentation_toggle(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi)
+{
+   e_config->mode.presentation = !e_config->mode.presentation;
+   e_menu_item_toggle_set(mi, e_config->mode.presentation);
+   e_config_mode_changed();
+   e_config_save_queue();
+}
+
+static void
+_e_mod_mode_offline_toggle(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi)
+{
+   e_config->mode.offline = !e_config->mode.offline;
+   e_menu_item_toggle_set(mi, e_config->mode.offline);
+   e_config_mode_changed();
+   e_config_save_queue();
+}
+
+static void
+_e_mod_submenu_modes_fill(void *data __UNUSED__, E_Menu *m)
+{
+   E_Menu_Item *mi;
+
+   mi = e_menu_item_new(m);
+   e_menu_item_check_set(mi, 1);
+   e_menu_item_toggle_set(mi, e_config->mode.presentation);
+   e_menu_item_label_set(mi, _("Presentation"));
+   e_util_menu_item_theme_icon_set(mi, "preferences-modes-presentation");
+   e_menu_item_callback_set(mi, _e_mod_mode_presentation_toggle, NULL);
+
+   mi = e_menu_item_new(m);
+   e_menu_item_check_set(mi, 1);
+   e_menu_item_toggle_set(mi, e_config->mode.offline);
+   e_menu_item_label_set(mi, _("Offline"));
+   e_util_menu_item_theme_icon_set(mi, "preferences-modes-offline");
+   e_menu_item_callback_set(mi, _e_mod_mode_offline_toggle, NULL);
+
+   e_menu_pre_activate_callback_set(m, NULL, NULL);
+}
+
+static E_Menu *
+_e_mod_submenu_modes_get(void)
+{
+   E_Menu *m = e_menu_new();
+   if (!m) return NULL;
+   e_menu_pre_activate_callback_set(m, _e_mod_submenu_modes_fill, NULL);
+   return m;
+}
+
 /* menu item add hook */
 static void
 _e_mod_menu_add(void *data, E_Menu *m)
@@ -215,4 +264,9 @@ _e_mod_menu_add(void *data, E_Menu *m)
    e_menu_item_label_set(mi, _("Settings Panel"));
    e_util_menu_item_theme_icon_set(mi, "preferences-system");
    e_menu_item_callback_set(mi, _e_mod_conf_cb, NULL);
+
+   mi = e_menu_item_new(m);
+   e_menu_item_label_set(mi, _("Modes"));
+   e_util_menu_item_theme_icon_set(mi, "preferences-modes");
+   e_menu_item_submenu_set(mi, _e_mod_submenu_modes_get());
 }
diff --git a/src/modules/conf_applications/Makefile.in b/src/modules/conf_applications/Makefile.in
index e68a5ad..f9d39c0 100644
--- a/src/modules/conf_applications/Makefile.in
+++ b/src/modules/conf_applications/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_borders/Makefile.in b/src/modules/conf_borders/Makefile.in
index b9d9a95..6cf044d 100644
--- a/src/modules/conf_borders/Makefile.in
+++ b/src/modules/conf_borders/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_clientlist/Makefile.in b/src/modules/conf_clientlist/Makefile.in
index c584297..1f0d442 100644
--- a/src/modules/conf_clientlist/Makefile.in
+++ b/src/modules/conf_clientlist/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_colors/Makefile.in b/src/modules/conf_colors/Makefile.in
index 5c8c92f..b861e13 100644
--- a/src/modules/conf_colors/Makefile.in
+++ b/src/modules/conf_colors/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_desk/Makefile.in b/src/modules/conf_desk/Makefile.in
index 9d0124b..199ca90 100644
--- a/src/modules/conf_desk/Makefile.in
+++ b/src/modules/conf_desk/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_desklock/Makefile.in b/src/modules/conf_desklock/Makefile.in
index 356ecb7..dd8f3b4 100644
--- a/src/modules/conf_desklock/Makefile.in
+++ b/src/modules/conf_desklock/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_desklock/e_int_config_desklock.c b/src/modules/conf_desklock/e_int_config_desklock.c
index cdc8fb7..d5ed026 100644
--- a/src/modules/conf_desklock/e_int_config_desklock.c
+++ b/src/modules/conf_desklock/e_int_config_desklock.c
@@ -26,14 +26,16 @@ static int _zone_count_get(void);
 
 static void _cb_disable_check(void *data, Evas_Object *obj);
 
-struct _E_Config_Dialog_Data 
+static void _cb_ask_presentation_changed(void *data, Evas_Object *obj);
+
+struct _E_Config_Dialog_Data
 {
    E_Config_Dialog *cfd;
    Evas_Object *o_prev;
    Evas_Object *o_fm, *o_sf;
    Evas_Object *o_btn, *o_custom;
    Evas_Object *o_login_slider;
-   
+
    /* Common vars */
    int use_xscreensaver;
    int fmdir;
@@ -44,30 +46,39 @@ struct _E_Config_Dialog_Data
    int auto_lock;
    int screensaver_lock;
    double idle_time;
-   
+   double post_screensaver_time;
+
    /* Adv props */
    int bg_method;
-   char *bg;
+   const char *bg;
    int custom_lock;
    char *custom_lock_cmd;
    int login_zone;
    int zone;
+   int ask_presentation;
+   double ask_presentation_timeout;
 
    struct {
       struct {
 	 Evas_Object *auto_lock_label;
 	 Evas_Object *auto_lock_slider;
+	 Evas_Object *post_screensaver_label;
+	 Evas_Object *post_screensaver_slider;
       } basic;
+      struct {
+	 Evas_Object *ask_presentation_label;
+	 Evas_Object *ask_presentation_slider;
+      } adv;
    } gui;
 };
 
 
 EAPI E_Config_Dialog *
-e_int_config_desklock(E_Container *con, const char *params __UNUSED__) 
+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;
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return NULL;
@@ -81,71 +92,77 @@ e_int_config_desklock(E_Container *con, const char *params __UNUSED__)
    v->advanced.apply_cfdata = _adv_apply;
    v->advanced.check_changed = _adv_check_changed;
    v->override_auto_apply = 1;
-   
-   cfd = e_config_dialog_new(con, _("Screen Lock Settings"), "E", 
+
+   cfd = e_config_dialog_new(con, _("Screen Lock Settings"), "E",
 			     "_config_desklock_dialog", "preferences-desklock",
 			     0, v, NULL);
    return cfd;
 }
 
-static void 
-_fill_data(E_Config_Dialog_Data *cfdata) 
+static void
+_fill_data(E_Config_Dialog_Data *cfdata)
 {
    cfdata->fmdir = 0;
-   if (e_config->desklock_background) 
+   if (e_config->desklock_background)
      {
-	cfdata->bg = strdup(e_config->desklock_background);
+	cfdata->bg = eina_stringshare_ref(e_config->desklock_background);
 	if (!strstr(cfdata->bg, e_user_homedir_get()))
 	  cfdata->fmdir = 1;
      }
-   else 
-     cfdata->bg = strdup("theme_desklock_background");
-	
+   else
+     cfdata->bg = eina_stringshare_add("theme_desklock_background");
+
    if (!strcmp(cfdata->bg, "theme_desklock_background"))
      cfdata->bg_method = 0;
    else if (!strcmp(cfdata->bg, "theme_background"))
      cfdata->bg_method = 1;
-   else
+   else if (!strcmp(cfdata->bg, "user_background"))
      cfdata->bg_method = 2;
+   else
+     cfdata->bg_method = 3;
 
    cfdata->use_xscreensaver = ecore_x_screensaver_event_available_get();
    cfdata->zone_count = _zone_count_get();
-   
+
    cfdata->custom_lock = e_config->desklock_use_custom_desklock;
-   if (e_config->desklock_custom_desklock_cmd) 
+   if (e_config->desklock_custom_desklock_cmd)
      cfdata->custom_lock_cmd = strdup(e_config->desklock_custom_desklock_cmd);
 
    cfdata->start_locked = e_config->desklock_start_locked;
    cfdata->auto_lock = e_config->desklock_autolock_idle;
    cfdata->screensaver_lock = e_config->desklock_autolock_screensaver;
    cfdata->idle_time = e_config->desklock_autolock_idle_timeout / 60;
-   if (e_config->desklock_login_box_zone >= 0) 
+   cfdata->post_screensaver_time = e_config->desklock_post_screensaver_time;
+   if (e_config->desklock_login_box_zone >= 0)
      {
 	cfdata->login_zone = 0;
 	cfdata->zone = e_config->desklock_login_box_zone;
      }
-   else 
+   else
      {
 	cfdata->login_zone = e_config->desklock_login_box_zone;
 	cfdata->zone = 0;
      }
+
+   cfdata->ask_presentation = e_config->desklock_ask_presentation;
+   cfdata->ask_presentation_timeout = e_config->desklock_ask_presentation_timeout;
 }
 
 static void *
-_create_data(E_Config_Dialog *cfd) 
+_create_data(E_Config_Dialog *cfd)
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
    _fill_data(cfdata);
    return cfdata;
 }
 
 static void
-_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    E_FREE(cfdata->custom_lock_cmd);
-   E_FREE(cfdata->bg);
+   eina_stringshare_del(cfdata->bg);
    E_FREE(cfdata);
 }
 
@@ -161,11 +178,23 @@ _basic_auto_lock_cb_changed(void *data, Evas_Object *o)
    e_widget_disabled_set(cfdata->gui.basic.auto_lock_slider, disable);
 }
 
+static void
+_basic_screensaver_lock_cb_changed(void *data, Evas_Object *o)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   int disable;
+
+   disable = ((!cfdata->use_xscreensaver) ||
+	      (!cfdata->screensaver_lock));
+   e_widget_disabled_set(cfdata->gui.basic.post_screensaver_label, disable);
+   e_widget_disabled_set(cfdata->gui.basic.post_screensaver_slider, disable);
+}
+
 static Evas_Object *
-_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *o, *of, *ow;
-   
+
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_framelist_add(evas, _("Automatic Locking"), 0);
    e_widget_disabled_set(of, !cfdata->use_xscreensaver);
@@ -173,11 +202,20 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 			   &cfdata->start_locked);
    e_widget_disabled_set(ow, !cfdata->use_xscreensaver);
    e_widget_framelist_object_append(of, ow);
-   ow = e_widget_check_add(evas, _("Lock when X screensaver activates"), 
+   ow = e_widget_check_add(evas, _("Lock when X screensaver activates"),
 			   &cfdata->screensaver_lock);
+   e_widget_on_change_hook_set(ow, _basic_screensaver_lock_cb_changed, cfdata);
    e_widget_disabled_set(ow, !cfdata->use_xscreensaver);
    e_widget_framelist_object_append(of, ow);
-   ow = e_widget_check_add(evas, _("Lock when idle time exceeded"), 
+   ow = e_widget_label_add(evas, _("Time after screensaver activated"));
+   cfdata->gui.basic.post_screensaver_label = ow;
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), 0.0, 300.0, 10.0, 0,
+			    &(cfdata->post_screensaver_time), NULL, 100);
+   cfdata->gui.basic.post_screensaver_slider = ow;
+   e_widget_disabled_set(ow, !cfdata->use_xscreensaver);
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_check_add(evas, _("Lock when idle time exceeded"),
 			   &cfdata->auto_lock);
    e_widget_on_change_hook_set(ow, _basic_auto_lock_cb_changed, cfdata);
    e_widget_framelist_object_append(of, ow);
@@ -192,16 +230,18 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_widget_list_object_append(o, of, 1, 1, 0.5);
 
    _basic_auto_lock_cb_changed(cfdata, NULL);
+   _basic_screensaver_lock_cb_changed(cfdata, NULL);
 
    return o;
 }
 
 static int
-_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    e_config->desklock_start_locked = cfdata->start_locked;
    e_config->desklock_autolock_idle = cfdata->auto_lock;
    e_config->desklock_autolock_screensaver = cfdata->screensaver_lock;
+   e_config->desklock_post_screensaver_time = cfdata->post_screensaver_time;
    e_config->desklock_autolock_idle_timeout = cfdata->idle_time * 60;
    e_config_save_queue();
    return 1;
@@ -214,11 +254,29 @@ _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      ((e_config->desklock_start_locked != cfdata->start_locked) ||
       (e_config->desklock_autolock_idle != cfdata->auto_lock) ||
       (e_config->desklock_autolock_screensaver != cfdata->screensaver_lock) ||
+      (e_config->desklock_post_screensaver_time != cfdata->post_screensaver_time) ||
       (e_config->desklock_autolock_idle_timeout != cfdata->idle_time * 60));
 }
 
+static const char *
+_user_wallpaper_get(void)
+{
+   const E_Config_Desktop_Background *cdbg;
+   const Eina_List *l;
+
+   if (e_config->desktop_default_background)
+     return e_config->desktop_default_background;
+
+   EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cdbg)
+     if (cdbg->file)
+       return cdbg->file;
+
+   return e_theme_edje_file_get("base/theme/desklock",
+				"e/desklock/background");
+}
+
 static Evas_Object *
-_adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+_adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *mt, *rt, *ft, *ow, *of;
    Evas_Object *custom_screenlock_check;
@@ -228,13 +286,13 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    int screen_count;
    char path[PATH_MAX];
    const char *f;
-   
+
    zone = e_zone_current_get(cfd->con);
    screen_count = ecore_x_xinerama_screen_count_get();
-   
+
    mt = e_widget_table_add(evas, 0);
    ft = e_widget_table_add(evas, 0);
-   
+
    rt = e_widget_table_add(evas, 1);
    rg = e_widget_radio_group_new(&(cfdata->fmdir));
    ow = e_widget_radio_add(evas, _("Personal"), 0, rg);
@@ -244,8 +302,8 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_widget_on_change_hook_set(ow, _cb_radio_change, cfdata);
    e_widget_table_object_append(rt, ow, 1, 0, 1, 1, 1, 1, 0, 0);
    e_widget_table_object_append(ft, rt, 0, 0, 1, 1, 0, 0, 0, 0);
-   cfdata->o_btn = e_widget_button_add(evas, _("Go up a Directory"), 
-				       "go-up", _cb_button_up, 
+   cfdata->o_btn = e_widget_button_add(evas, _("Go up a Directory"),
+				       "go-up", _cb_button_up,
 				       cfdata, NULL);
    e_widget_table_object_append(ft, cfdata->o_btn, 0, 1, 1, 1, 0, 0, 0, 0);
 
@@ -253,7 +311,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
      e_prefix_data_concat_static(path, "data/backgrounds");
    else
      e_user_dir_concat_static(path, "backgrounds");
-   
+
    ow = e_fm2_add(evas);
    cfdata->o_fm = ow;
    memset(&fmc, 0, sizeof(E_Fm2_Config));
@@ -277,15 +335,15 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_fm2_icon_menu_flags_set(ow, E_FM2_MENU_NO_SHOW_HIDDEN);
 
    e_fm2_path_set(ow, path, "/");
-   evas_object_smart_callback_add(ow, "dir_changed", 
+   evas_object_smart_callback_add(ow, "dir_changed",
 				  _cb_fm_dir_change, cfdata);
-   evas_object_smart_callback_add(ow, "selection_change", 
+   evas_object_smart_callback_add(ow, "selection_change",
 				  _cb_fm_sel_change, cfdata);
    evas_object_smart_callback_add(ow, "changed", _cb_fm_change, cfdata);
-   
-   cfdata->o_sf = e_widget_scrollframe_pan_add(evas, ow, e_fm2_pan_set, 
+
+   cfdata->o_sf = e_widget_scrollframe_pan_add(evas, ow, e_fm2_pan_set,
 					       e_fm2_pan_get,
-					       e_fm2_pan_max_get, 
+					       e_fm2_pan_max_get,
 					       e_fm2_pan_child_size_get);
    e_widget_min_size_set(cfdata->o_sf, 100, 100);
    e_widget_table_object_append(ft, cfdata->o_sf, 0, 2, 1, 1, 1, 1, 1, 1);
@@ -295,34 +353,37 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    cfdata->o_prev = ow;
    if (cfdata->bg_method == 0)
      {
-	f = e_theme_edje_file_get("base/theme/desklock", 
+	f = e_theme_edje_file_get("base/theme/desklock",
 				  "e/desklock/background");
 	e_widget_preview_edje_set(cfdata->o_prev, f, "e/desklock/background");
-	E_FREE(cfdata->bg);
-	cfdata->bg = strdup("theme_desklock_background");
+	eina_stringshare_replace(&cfdata->bg, "theme_desklock_background");
      }
-   else if (cfdata->bg_method == 1) 
+   else if (cfdata->bg_method == 1)
      {
-	f = e_theme_edje_file_get("base/theme/backgrounds", 
+	f = e_theme_edje_file_get("base/theme/backgrounds",
 				  "e/desktop/background");
 	e_widget_preview_edje_set(cfdata->o_prev, f, "e/desktop/background");
-	E_FREE(cfdata->bg);
-	cfdata->bg = strdup("theme_background");
+	eina_stringshare_replace(&cfdata->bg, "theme_background");
+     }
+   else if (cfdata->bg_method == 2)
+     {
+	f = _user_wallpaper_get();
+	e_widget_preview_edje_set(cfdata->o_prev, f, "e/desktop/background");
+	eina_stringshare_replace(&cfdata->bg, "user_background");
      }
-   else 
+   else
      {
-	if (cfdata->bg) 
+	if (cfdata->bg)
 	  {
-	     e_widget_preview_edje_set(cfdata->o_prev, cfdata->bg, 
+	     e_widget_preview_edje_set(cfdata->o_prev, cfdata->bg,
 				       "e/desktop/background");
 	  }
-	else 
+	else
 	  {
-	     f = e_theme_edje_file_get("base/theme/backgrounds", 
+	     f = e_theme_edje_file_get("base/theme/backgrounds",
 				       "e/desktop/background");
 	     e_widget_preview_edje_set(cfdata->o_prev, f, "e/desktop/background");
-	     E_FREE(cfdata->bg);
-	     cfdata->bg = strdup("theme_background");
+	     cfdata->bg = eina_stringshare_add("theme_background");
 	  }
      }
    e_widget_table_object_append(mt, ow, 1, 0, 1, 1, 1, 1, 1, 1);
@@ -342,14 +403,14 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_widget_on_change_hook_set(ow, _cb_login_change, cfdata);
    e_widget_disabled_set(ow, (screen_count <= 0));
    e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0);
-   cfdata->o_login_slider = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0.0, 
-						(cfdata->zone_count -1), 1.0, 
+   cfdata->o_login_slider = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0.0,
+						(cfdata->zone_count -1), 1.0,
 						0, NULL, &(cfdata->zone), 100);
    e_widget_disabled_set(cfdata->o_login_slider, (screen_count <= 0));
-   e_widget_frametable_object_append(of, cfdata->o_login_slider, 0, 3, 1, 1, 
+   e_widget_frametable_object_append(of, cfdata->o_login_slider, 0, 3, 1, 1,
 				     1, 0, 1, 0);
    e_widget_table_object_append(mt, of, 2, 0, 1, 1, 1, 1, 1, 1);
-   
+
    of = e_widget_frametable_add(evas, _("Wallpaper Mode"), 0);
    rg = e_widget_radio_group_new(&(cfdata->bg_method));
    ow = e_widget_radio_add(evas, _("Theme Defined"), 0, rg);
@@ -358,47 +419,71 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    ow = e_widget_radio_add(evas, _("Theme Wallpaper"), 1, rg);
    evas_object_smart_callback_add(ow, "changed", _cb_method_change, cfdata);
    e_widget_frametable_object_append(of, ow, 0, 1, 1, 1, 1, 0, 1, 0);
-   cfdata->o_custom = e_widget_radio_add(evas, _("Custom"), 2, rg);
-   evas_object_smart_callback_add(cfdata->o_custom, "changed", 
+   ow = e_widget_radio_add(evas, _("User Wallpaper"), 2, rg);
+   evas_object_smart_callback_add(ow, "changed", _cb_method_change, cfdata);
+   e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0);
+   cfdata->o_custom = e_widget_radio_add(evas, _("Custom"), 3, rg);
+   evas_object_smart_callback_add(cfdata->o_custom, "changed",
 				  _cb_method_change, cfdata);
-   e_widget_frametable_object_append(of, cfdata->o_custom, 0, 2, 1, 1, 
+   e_widget_frametable_object_append(of, cfdata->o_custom, 0, 3, 1, 1,
 				     1, 0, 1, 0);
    e_widget_table_object_append(mt, of, 1, 1, 1, 1, 1, 1, 1, 1);
 
+
+   of = e_widget_framelist_add(evas, _("Enter Presentation Mode"), 0);
+
+   ow = e_widget_check_add(evas, _("Suggest entering presentation mode"), &(cfdata->ask_presentation));
+   e_widget_on_change_hook_set(ow, _cb_ask_presentation_changed, cfdata);
+   e_widget_framelist_object_append(of, ow);
+
+   ow = e_widget_label_add(evas, _("If deactivated before"));
+   cfdata->gui.adv.ask_presentation_label = ow;
+   e_widget_framelist_object_append(of, ow);
+
+   ow = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"),
+			    1.0, 300.0, 10.0, 0,
+			    &(cfdata->ask_presentation_timeout), NULL, 100);
+   cfdata->gui.adv.ask_presentation_slider = ow;
+   e_widget_framelist_object_append(of, ow);
+
+   _cb_ask_presentation_changed(cfdata, NULL);
+
+   e_widget_table_object_append(mt, of, 1, 2, 1, 1, 1, 1, 1, 1);
+
+
    ow = _basic_create(cfd, evas, cfdata);
-   e_widget_table_object_append(mt, ow, 2, 1, 1, 1, 1, 1, 1, 1);
+   e_widget_table_object_append(mt, ow, 2, 1, 1, 2, 1, 1, 1, 1);
 
    of = e_widget_framelist_add(evas, _("Custom Screenlock"), 0);
-   custom_screenlock_check = e_widget_check_add(evas, _("Use custom screenlock"), 
+   custom_screenlock_check = e_widget_check_add(evas, _("Use custom screenlock"),
 			   &(cfdata->custom_lock));
    e_widget_framelist_object_append(of, custom_screenlock_check);
    ow = e_widget_entry_add(evas, &(cfdata->custom_lock_cmd), NULL, NULL, NULL);
    e_widget_disabled_set(ow, !cfdata->custom_lock); // set state from saved config
    e_widget_framelist_object_append(of, ow);
-   e_widget_table_object_append(mt, of, 1, 2, 2, 1, 1, 1, 1, 1);
+   e_widget_table_object_append(mt, of, 1, 3, 2, 1, 1, 1, 1, 1);
 
    // handler for enable/disable widget array
    e_widget_on_change_hook_set(custom_screenlock_check, _cb_disable_check, ow);
-   
+
    return mt;
 }
 
 static int
-_adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+_adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    e_config->desklock_start_locked = cfdata->start_locked;
    e_config->desklock_autolock_idle = cfdata->auto_lock;
    e_config->desklock_autolock_screensaver = cfdata->screensaver_lock;
    e_config->desklock_autolock_idle_timeout = cfdata->idle_time * 60;
+   e_config->desklock_ask_presentation = cfdata->ask_presentation;
+   e_config->desklock_ask_presentation_timeout = cfdata->ask_presentation_timeout;
 
-   if (cfdata->bg) 
+   if (cfdata->bg)
      {
-	if (e_config->desklock_background) 
-	  {
-	     e_filereg_deregister(e_config->desklock_background);
-	     eina_stringshare_del(e_config->desklock_background);
-	  }
-	e_config->desklock_background = eina_stringshare_add(cfdata->bg);
+	if (e_config->desklock_background)
+	  e_filereg_deregister(e_config->desklock_background);
+	eina_stringshare_replace(&e_config->desklock_background, cfdata->bg);
 	e_filereg_register(e_config->desklock_background);
      }
 
@@ -410,14 +495,14 @@ _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      e_config->desklock_login_box_zone = cfdata->zone;
 
    e_config->desklock_use_custom_desklock = cfdata->custom_lock;
-   if (cfdata->custom_lock_cmd) 
+   if (cfdata->custom_lock_cmd)
      {
 	if (e_config->desklock_custom_desklock_cmd)
 	  eina_stringshare_del(e_config->desklock_custom_desklock_cmd);
-	e_config->desklock_custom_desklock_cmd = 
+	e_config->desklock_custom_desklock_cmd =
 	  eina_stringshare_add(cfdata->custom_lock_cmd);
      }
-   
+
    e_config_save_queue();
    return 1;
 }
@@ -428,12 +513,7 @@ _adv_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    if (_basic_check_changed(cfd, cfdata))
      return 1;
 
-   if (e_config->desklock_background && cfdata->bg)
-     {
-	if (strcmp(e_config->desklock_background, cfdata->bg) != 0)
-	  return 1;
-     }
-   else if (e_config->desklock_background != cfdata->bg)
+   if (e_config->desklock_background != cfdata->bg)
      return 1;
 
    if (cfdata->login_zone < 0)
@@ -458,36 +538,41 @@ _adv_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    else if (e_config->desklock_custom_desklock_cmd != cfdata->custom_lock_cmd)
      return 1;
 
-   return 0;
+   return ((e_config->desklock_ask_presentation != cfdata->ask_presentation) ||
+	   (e_config->desklock_ask_presentation_timeout != cfdata->ask_presentation_timeout));
 }
 
-static void 
-_cb_method_change(void *data, Evas_Object *obj, void *event_info) 
+static void
+_cb_method_change(void *data, Evas_Object *obj, void *event_info)
 {
    E_Config_Dialog_Data *cfdata;
    Eina_List *sel;
    E_Fm2_Icon_Info *ic;
    char path[PATH_MAX];
    const char *f;
-   
+
    cfdata = data;
    if (cfdata->bg_method == 0)
      {
-	f = e_theme_edje_file_get("base/theme/desklock", 
+	f = e_theme_edje_file_get("base/theme/desklock",
 				  "e/desklock/background");
 	e_widget_preview_edje_set(cfdata->o_prev, f, "e/desklock/background");
-	E_FREE(cfdata->bg);
-	cfdata->bg = strdup("theme_desklock_background");
+	eina_stringshare_replace(&cfdata->bg, "theme_desklock_background");
      }
-   else if (cfdata->bg_method == 1) 
+   else if (cfdata->bg_method == 1)
      {
-	f = e_theme_edje_file_get("base/theme/backgrounds", 
+	f = e_theme_edje_file_get("base/theme/backgrounds",
 				  "e/desktop/background");
 	e_widget_preview_edje_set(cfdata->o_prev, f, "e/desktop/background");
-	E_FREE(cfdata->bg);
-	cfdata->bg = strdup("theme_background");
+	eina_stringshare_replace(&cfdata->bg, "theme_background");
+     }
+   else if (cfdata->bg_method == 2)
+     {
+	f = _user_wallpaper_get();
+	e_widget_preview_edje_set(cfdata->o_prev, f, "e/desktop/background");
+	eina_stringshare_replace(&cfdata->bg, "user_background");
      }
-   else 
+   else
      {
 	sel = e_fm2_selected_list_get(cfdata->o_fm);
 	if (!sel) sel = e_fm2_all_list_get(cfdata->o_fm);
@@ -503,19 +588,18 @@ _cb_method_change(void *data, Evas_Object *obj, void *event_info)
 	  e_prefix_data_snprintf(path, sizeof(path), "data/backgrounds/%s",
 				 ic->file);
 	if (ecore_file_is_dir(path)) return;
-	E_FREE(cfdata->bg);
-	cfdata->bg = strdup(path);
-	e_widget_preview_edje_set(cfdata->o_prev, path, 
+	eina_stringshare_replace(&cfdata->bg, path);
+	e_widget_preview_edje_set(cfdata->o_prev, path,
 				  "e/desktop/background");
      }
 }
 
-static void 
-_cb_radio_change(void *data, Evas_Object *obj) 
+static void
+_cb_radio_change(void *data, Evas_Object *obj)
 {
    E_Config_Dialog_Data *cfdata;
    char path[4096];
-   
+
    cfdata = data;
    if (!cfdata->o_fm) return;
    if (cfdata->fmdir == 0)
@@ -525,78 +609,77 @@ _cb_radio_change(void *data, Evas_Object *obj)
    e_fm2_path_set(cfdata->o_fm, path, "/");
 }
 
-static void 
-_cb_login_change(void *data, Evas_Object *obj) 
+static void
+_cb_login_change(void *data, Evas_Object *obj)
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = data;
-   if (cfdata->login_zone < 0) 
+   if (cfdata->login_zone < 0)
      e_widget_disabled_set(cfdata->o_login_slider, 1);
-   else 
+   else
      e_widget_disabled_set(cfdata->o_login_slider, 0);
 }
 
-static void 
-_cb_button_up(void *data1, void *data2) 
+static void
+_cb_button_up(void *data1, void *data2)
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = data1;
    if (!cfdata->o_fm) return;
    e_fm2_parent_go(cfdata->o_fm);
    e_widget_scrollframe_child_pos_set(cfdata->o_sf, 0, 0);
 }
 
-static void 
-_cb_fm_dir_change(void *data, Evas_Object *obj, void *event_info) 
+static void
+_cb_fm_dir_change(void *data, Evas_Object *obj, void *event_info)
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = data;
    if (!cfdata->o_fm) return;
-   if (!e_fm2_has_parent_get(cfdata->o_fm)) 
+   if (!e_fm2_has_parent_get(cfdata->o_fm))
      e_widget_disabled_set(cfdata->o_btn, 1);
    else
      e_widget_disabled_set(cfdata->o_btn, 0);
    e_widget_scrollframe_child_pos_set(cfdata->o_sf, 0, 0);
 }
 
-static void 
-_cb_fm_sel_change(void *data, Evas_Object *obj, void *event_info) 
+static void
+_cb_fm_sel_change(void *data, Evas_Object *obj, void *event_info)
 {
    E_Config_Dialog_Data *cfdata;
    Eina_List *sel;
    E_Fm2_Icon_Info *ic;
    char path[PATH_MAX];
-   
+
    cfdata = data;
    if (!cfdata->o_fm) return;
    sel = e_fm2_selected_list_get(cfdata->o_fm);
    if (!sel) return;
    ic = sel->data;
    eina_list_free(sel);
-   
-   if (cfdata->fmdir == 0) 
+
+   if (cfdata->fmdir == 0)
      {
 	e_user_dir_snprintf(path, sizeof(path), "backgrounds/%s",
 			    ic->file);
      }
-   else 
+   else
      {
 	e_prefix_data_snprintf(path, sizeof(path), "data/backgrounds/%s",
 			       ic->file);
      }
    if (ecore_file_is_dir(path)) return;
-   E_FREE(cfdata->bg);
-   cfdata->bg = strdup(path);
+   eina_stringshare_replace(&cfdata->bg, path);
    e_widget_preview_edje_set(cfdata->o_prev, path, "e/desktop/background");
    e_widget_change(cfdata->o_sf);
    e_widget_radio_toggle_set(cfdata->o_custom, 1);
 }
 
-static void 
-_cb_fm_change(void *data, Evas_Object *obj, void *event_info) 
+static void
+_cb_fm_change(void *data, Evas_Object *obj, void *event_info)
 {
    E_Config_Dialog_Data *cfdata;
    const char *p;
@@ -607,11 +690,11 @@ _cb_fm_change(void *data, Evas_Object *obj, void *event_info)
    if (!cfdata->bg) return;
    if (!cfdata->o_fm) return;
    p = e_fm2_real_path_get(cfdata->o_fm);
-   if (p) 
+   if (p)
      {
 	if (strncmp(p, cfdata->bg, strlen(p))) return;
      }
-   else 
+   else
      return;
 
    len = e_user_dir_concat_static(path, "backgrounds");
@@ -629,22 +712,22 @@ _cb_fm_change(void *data, Evas_Object *obj, void *event_info)
    e_fm2_file_show(cfdata->o_fm, p);
 }
 
-static int 
-_zone_count_get(void) 
+static int
+_zone_count_get(void)
 {
    int num = 0;
    Eina_List *m, *c;
-   
-   for (m = e_manager_list(); m; m = m->next) 
+
+   for (m = e_manager_list(); m; m = m->next)
      {
 	E_Manager *man;
-	
+
 	man = m->data;
 	if (!man) continue;
-	for (c = man->containers; c; c = c->next) 
+	for (c = man->containers; c; c = c->next)
 	  {
 	     E_Container *con;
-	     
+
 	     con = c->data;
 	     if (!con) continue;
 	     num += eina_list_count(con->zones);
@@ -660,6 +743,18 @@ _zone_count_get(void)
 static void
 _cb_disable_check(void *data, Evas_Object *obj)
 {
-   e_widget_disabled_set((Evas_Object *) data, 
+   e_widget_disabled_set((Evas_Object *) data,
                          !e_widget_check_checked_get(obj));
 }
+
+static void
+_cb_ask_presentation_changed(void *data, Evas_Object *obj __UNUSED__)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   Eina_Bool disable;
+
+   disable = (!cfdata->ask_presentation);
+
+   e_widget_disabled_set(cfdata->gui.adv.ask_presentation_label, disable);
+   e_widget_disabled_set(cfdata->gui.adv.ask_presentation_slider, disable);
+}
diff --git a/src/modules/conf_desks/Makefile.in b/src/modules/conf_desks/Makefile.in
index d6b12c7..ecb1419 100644
--- a/src/modules/conf_desks/Makefile.in
+++ b/src/modules/conf_desks/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_desks/e_int_config_desks.c b/src/modules/conf_desks/e_int_config_desks.c
index ebcfd23..2177b6d 100644
--- a/src/modules/conf_desks/e_int_config_desks.c
+++ b/src/modules/conf_desks/e_int_config_desks.c
@@ -13,6 +13,7 @@ static int _advanced_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *c
 static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, 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_slider_change(void *data, Evas_Object *obj);
+static void _cb_disable_flip_anim(void *data, Evas_Object *obj);
 
 /* Actual config data we will be playing with whil the dialog is active */
 struct _E_Config_Dialog_Data
@@ -27,10 +28,14 @@ struct _E_Config_Dialog_Data
    int flip_wrap;
    int flip_mode;
    int flip_interp;
+   int flip_pan_bg;
    double flip_speed;
+   double x_axis_pan;
+   double y_axis_pan;
 
    /*- GUI -*/
    Evas_Object *preview;
+   Eina_List *flip_anim_list;
 };
 
 /* a nice easy setup function that does the dirty work */
@@ -71,7 +76,10 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    cfdata->flip_wrap = e_config->desk_flip_wrap;
    cfdata->flip_mode = e_config->desk_flip_animate_mode;
    cfdata->flip_interp = e_config->desk_flip_animate_interpolation;
+   cfdata->flip_pan_bg = e_config->desk_flip_pan_bg;
    cfdata->flip_speed = e_config->desk_flip_animate_time;
+   cfdata->x_axis_pan = e_config->desk_flip_pan_x_axis_factor;
+   cfdata->y_axis_pan = e_config->desk_flip_pan_y_axis_factor;
 }
 
 static void *
@@ -91,6 +99,7 @@ _create_data(E_Config_Dialog *cdd)
 static void
 _free_data(E_Config_Dialog *cdd, E_Config_Dialog_Data *cfdata)
 {
+   eina_list_free(cfdata->flip_anim_list);
    E_FREE(cfdata);
 }
 
@@ -178,7 +187,10 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 
    e_config->desk_flip_animate_mode = cfdata->flip_mode;
    e_config->desk_flip_animate_interpolation = cfdata->flip_interp;
+   e_config->desk_flip_pan_bg = cfdata->flip_pan_bg;
    e_config->desk_flip_animate_time = cfdata->flip_speed;
+   e_config->desk_flip_pan_x_axis_factor = cfdata->x_axis_pan;
+   e_config->desk_flip_pan_y_axis_factor = cfdata->y_axis_pan;
    
    e_config->edge_flip_dragging = cfdata->edge_flip_dragging;
    e_config->desk_flip_wrap = cfdata->flip_wrap;
@@ -207,7 +219,10 @@ _advanced_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 
    return ((e_config->desk_flip_animate_mode != cfdata->flip_mode) ||
 	   (e_config->desk_flip_animate_interpolation != cfdata->flip_interp) ||
+	   (e_config->desk_flip_pan_bg != cfdata->flip_pan_bg) ||
 	   (e_config->desk_flip_animate_time != cfdata->flip_speed) ||
+	   (e_config->desk_flip_pan_x_axis_factor != cfdata->x_axis_pan) ||
+	   (e_config->desk_flip_pan_y_axis_factor != cfdata->y_axis_pan) ||
 	   (e_config->edge_flip_dragging != cfdata->edge_flip_dragging) ||
 	   (e_config->desk_flip_wrap != cfdata->flip_wrap));
 }
@@ -288,12 +303,30 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    rg = e_widget_radio_group_new(&(cfdata->flip_mode));
    ob = e_widget_radio_add(evas, _("Off"), 0, rg);
    e_widget_framelist_object_append(of, ob);
+   e_widget_on_change_hook_set(ob, _cb_disable_flip_anim, cfdata);
    ob = e_widget_radio_add(evas, _("Pane"), 1, rg);
    e_widget_framelist_object_append(of, ob);
+   e_widget_on_change_hook_set(ob, _cb_disable_flip_anim, cfdata);
    ob = e_widget_radio_add(evas, _("Zoom"), 2, rg);
    e_widget_framelist_object_append(of, ob);
+   e_widget_on_change_hook_set(ob, _cb_disable_flip_anim, cfdata);
    ob = e_widget_slider_add(evas, 1, 0, _("%1.1f sec"), 0.0, 5.0, 0.05, 0, &(cfdata->flip_speed), NULL, 200);
+   e_widget_disabled_set(ob, !cfdata->flip_mode);
+   cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
    e_widget_framelist_object_append(of, ob);
+   ob = e_widget_check_add(evas, _("Background panning"), &(cfdata->flip_pan_bg));
+   e_widget_disabled_set(ob, !cfdata->flip_mode);
+   cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_slider_add(evas, 1, 0, _("%.2f X-axis pan factor"), 0.0, 1.0, 0.01, 0, &(cfdata->x_axis_pan), NULL, 200);
+   e_widget_disabled_set(ob, !cfdata->flip_mode);
+   cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_slider_add(evas, 1, 0, _("%.2f Y-axis pan factor"), 0.0, 1.0, 0.01, 0, &(cfdata->y_axis_pan), NULL, 200);
+   e_widget_disabled_set(ob, !cfdata->flip_mode);
+   cfdata->flip_anim_list = eina_list_append(cfdata->flip_anim_list, ob);
+   e_widget_framelist_object_append(of, ob);
+
    e_widget_table_object_append(ott, of, 1, 1, 1, 1, 1, 1, 1, 1);
   
    e_widget_list_object_append(o, ott, 1, 1, 0.5);
@@ -308,3 +341,15 @@ _cb_slider_change(void *data, Evas_Object *obj)
 
    e_widget_desk_preview_num_desks_set(cfdata->preview, cfdata->x, cfdata->y);
 }
+
+static void
+_cb_disable_flip_anim(void *data, Evas_Object *obj)
+{
+   E_Config_Dialog_Data *cfdata = (E_Config_Dialog_Data*) data;
+   Eina_List *list = cfdata->flip_anim_list;
+   Eina_List *l;
+   Evas_Object *o;
+
+   EINA_LIST_FOREACH(list, l, o)
+      e_widget_disabled_set(o, !cfdata->flip_mode);
+}
diff --git a/src/modules/conf_dialogs/Makefile.in b/src/modules/conf_dialogs/Makefile.in
index 86c902c..2a1bf3c 100644
--- a/src/modules/conf_dialogs/Makefile.in
+++ b/src/modules/conf_dialogs/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_display/Makefile.in b/src/modules/conf_display/Makefile.in
index 72143be..3dbe14a 100644
--- a/src/modules/conf_display/Makefile.in
+++ b/src/modules/conf_display/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_dpms/Makefile.in b/src/modules/conf_dpms/Makefile.in
index bce9885..982592c 100644
--- a/src/modules/conf_dpms/Makefile.in
+++ b/src/modules/conf_dpms/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_dpms/e_int_config_dpms.c b/src/modules/conf_dpms/e_int_config_dpms.c
index 4a56f9e..ba43967 100644
--- a/src/modules/conf_dpms/e_int_config_dpms.c
+++ b/src/modules/conf_dpms/e_int_config_dpms.c
@@ -18,11 +18,11 @@ static void _cb_disable_check_list(void *data, Evas_Object *obj);
 struct _E_Config_Dialog_Data
 {
    E_Config_Dialog *cfd;
-   
+
    Evas_Object *standby_slider;
    Evas_Object *suspend_slider;
    Evas_Object *off_slider;
-   
+
    int enable_dpms;
    int enable_standby;
    int enable_suspend;
@@ -31,14 +31,14 @@ struct _E_Config_Dialog_Data
    /*
     * The following timeouts are represented as minutes
     * while the underlying e_config variables are in seconds
-    */ 
-   double standby_timeout;  
+    */
+   double standby_timeout;
    double suspend_timeout;
    double off_timeout;
+   Eina_List *dpms_list;
 };
 
 static E_Dialog *dpms_dialog = NULL;
-Eina_List *dpms_list = NULL;
 
 static void
 _cb_dpms_dialog_ok(void *data, E_Dialog *dia)
@@ -51,9 +51,9 @@ static int
 _e_int_config_dpms_capable(void)
 {
    if (ecore_x_dpms_capable_get()) return 1;
-   
+
    if (dpms_dialog) e_object_del(E_OBJECT(dpms_dialog));
-   dpms_dialog = e_dialog_new(e_container_current_get(e_manager_current_get()), 
+   dpms_dialog = e_dialog_new(e_container_current_get(e_manager_current_get()),
 			      "E", "_dpms_capable_dialog");
    if (!dpms_dialog) return 0;
 
@@ -72,9 +72,9 @@ static int
 _e_int_config_dpms_available(void)
 {
    if (ecore_x_dpms_query()) return 1;
-   
+
    if (dpms_dialog) e_object_del(E_OBJECT(dpms_dialog));
-   dpms_dialog = e_dialog_new(e_container_current_get(e_manager_current_get()), 
+   dpms_dialog = e_dialog_new(e_container_current_get(e_manager_current_get()),
 			      "E", "_dpms_available_dialog");
    if (!dpms_dialog) return 0;
 
@@ -94,23 +94,23 @@ 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")) ||
-       (!_e_int_config_dpms_available()) || 		   
+       (!_e_int_config_dpms_available()) ||
        (!_e_int_config_dpms_capable()))
      return NULL;
 
    v = E_NEW(E_Config_Dialog_View, 1);
-   
+
    v->create_cfdata = _create_data;
    v->free_cfdata = _free_data;
    v->basic.apply_cfdata = _advanced_apply_data;
    v->basic.create_widgets = _advanced_create_widgets;
    v->basic.check_changed = _advanced_check_changed;
    v->override_auto_apply = 1;
-   
-   cfd = e_config_dialog_new(con, _("Display Power Management Settings"), "E", 
-			     "_config_dpms_dialog", "preferences-system-power-management", 
+
+   cfd = e_config_dialog_new(con, _("Display Power Management Settings"), "E",
+			     "_config_dpms_dialog", "preferences-system-power-management",
 			     0, v, NULL);
    return cfd;
 }
@@ -134,11 +134,11 @@ _create_data(E_Config_Dialog *cfd)
 
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
    cfdata->cfd = cfd;
-   
+
    cfdata->standby_slider = NULL;
    cfdata->suspend_slider = NULL;
    cfdata->off_slider = NULL;
-   
+
    _fill_data(cfdata);
    return cfdata;
 }
@@ -146,8 +146,7 @@ _create_data(E_Config_Dialog *cfd)
 static void
 _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
-  dpms_list = eina_list_free(dpms_list);
-
+  eina_list_free(cfdata->dpms_list);
   E_FREE(cfdata);
 }
 
@@ -157,7 +156,7 @@ _apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    e_config->dpms_enable = cfdata->enable_dpms;
    e_config->dpms_standby_enable = cfdata->enable_standby;
    e_config->dpms_suspend_enable = cfdata->enable_suspend;
-   e_config->dpms_off_enable = cfdata->enable_off;   
+   e_config->dpms_off_enable = cfdata->enable_off;
 
    e_config->dpms_standby_timeout = cfdata->standby_timeout * 60;
    e_config->dpms_suspend_timeout = cfdata->suspend_timeout * 60;
@@ -196,53 +195,53 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
 
    o = e_widget_list_add(evas, 0, 0);
 
-   dpms_check = e_widget_check_add(evas, _("Enable Display Power Management"), 
+   dpms_check = e_widget_check_add(evas, _("Enable Display Power Management"),
 			   &(cfdata->enable_dpms));
-   e_widget_list_object_append(o, dpms_check, 1, 1, 0);   
-   
+   e_widget_list_object_append(o, dpms_check, 1, 1, 0);
+
    of = e_widget_framelist_add(evas, _("Timers"), 0);
 
    ob = e_widget_check_add(evas, _("Standby time"), &(cfdata->enable_standby));
    e_widget_framelist_object_append(of, ob);
-   dpms_list = eina_list_append (dpms_list, ob);
+   cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob);
    e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0, 
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0,
 			    &(cfdata->standby_timeout), NULL, 200);
-   e_widget_on_change_hook_set(ob, _cb_standby_slider_change, cfdata);   
+   e_widget_on_change_hook_set(ob, _cb_standby_slider_change, cfdata);
    cfdata->standby_slider = ob;
-   dpms_list = eina_list_append (dpms_list, ob);
+   cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob);
    e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config
    e_widget_framelist_object_append(of, ob);
-   
+
    ob = e_widget_check_add(evas, _("Suspend time"), &(cfdata->enable_suspend));
    e_widget_framelist_object_append(of, ob);
-   dpms_list = eina_list_append (dpms_list, ob);
+   cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob);
    e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0, 
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0,
 			    &(cfdata->suspend_timeout), NULL, 200);
    e_widget_on_change_hook_set(ob, _cb_suspend_slider_change, cfdata);
    cfdata->suspend_slider = ob;
-   dpms_list = eina_list_append (dpms_list, ob);
+   cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob);
    e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config
    e_widget_framelist_object_append(of, ob);
 
    ob = e_widget_check_add(evas, _("Off time"), &(cfdata->enable_off));
    e_widget_framelist_object_append(of, ob);
-   dpms_list = eina_list_append (dpms_list, ob);
+   cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob);
    e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0, 
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0,
 			    &(cfdata->off_timeout), NULL, 200);
    e_widget_on_change_hook_set(ob, _cb_off_slider_change, cfdata);
    cfdata->off_slider = ob;
-   dpms_list = eina_list_append (dpms_list, ob);
+   cfdata->dpms_list = eina_list_append(cfdata->dpms_list, ob);
    e_widget_disabled_set(ob, !cfdata->enable_standby); // set state from saved config
    e_widget_framelist_object_append(of, ob);
 
    // handler for enable/disable widget array
-   e_widget_on_change_hook_set(dpms_check, _cb_disable_check_list, dpms_list);
+   e_widget_on_change_hook_set(dpms_check, _cb_disable_check_list, cfdata->dpms_list);
 
    e_widget_list_object_append(o, of, 1, 1, 0.5);
-   return o;   
+   return o;
 }
 
 /* general functionality/callbacks */
@@ -256,14 +255,14 @@ _cb_standby_slider_change(void *data, Evas_Object *obj)
      {
 	cfdata->suspend_timeout = cfdata->standby_timeout;
 	if (cfdata->suspend_slider)
-	  e_widget_slider_value_double_set(cfdata->suspend_slider, 
+	  e_widget_slider_value_double_set(cfdata->suspend_slider,
 					   cfdata->suspend_timeout);
-	
+
 	if (cfdata->suspend_timeout > cfdata->off_timeout)
 	  {
 	     cfdata->off_timeout = cfdata->suspend_timeout;
 	     if (cfdata->off_slider)
-	       e_widget_slider_value_double_set(cfdata->off_slider, 
+	       e_widget_slider_value_double_set(cfdata->off_slider,
 						cfdata->off_timeout);
 	  }
      }
@@ -279,14 +278,14 @@ _cb_suspend_slider_change(void *data, Evas_Object *obj)
      {
 	cfdata->off_timeout = cfdata->suspend_timeout;
 	if (cfdata->off_slider)
-	  e_widget_slider_value_double_set(cfdata->off_slider, 
+	  e_widget_slider_value_double_set(cfdata->off_slider,
 					   cfdata->off_timeout);
      }
    if (cfdata->suspend_timeout < cfdata->standby_timeout)
-     {   
+     {
 	cfdata->standby_timeout = cfdata->suspend_timeout;
 	if (cfdata->standby_slider)
-	  e_widget_slider_value_double_set(cfdata->standby_slider, 
+	  e_widget_slider_value_double_set(cfdata->standby_slider,
 					   cfdata->standby_timeout);
      }
 }
@@ -301,14 +300,14 @@ _cb_off_slider_change(void *data, Evas_Object *obj)
      {
 	cfdata->suspend_timeout = cfdata->off_timeout;
 	if (cfdata->suspend_slider)
-	  e_widget_slider_value_double_set(cfdata->suspend_slider, 
+	  e_widget_slider_value_double_set(cfdata->suspend_slider,
 					   cfdata->suspend_timeout);
-	
+
 	if (cfdata->suspend_timeout < cfdata->standby_timeout)
-	  {   
+	  {
 	     cfdata->standby_timeout = cfdata->suspend_timeout;
 	     if (cfdata->standby_slider)
-	       e_widget_slider_value_double_set(cfdata->standby_slider, 
+	       e_widget_slider_value_double_set(cfdata->standby_slider,
 						cfdata->standby_timeout);
 	  }
      }
diff --git a/src/modules/conf_edgebindings/Makefile.in b/src/modules/conf_edgebindings/Makefile.in
index e6b79ad..69ad237 100644
--- a/src/modules/conf_edgebindings/Makefile.in
+++ b/src/modules/conf_edgebindings/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_edgebindings/module.desktop b/src/modules/conf_edgebindings/module.desktop
index bf167a4..a32f171 100644
--- a/src/modules/conf_edgebindings/module.desktop
+++ b/src/modules/conf_edgebindings/module.desktop
@@ -1,10 +1,12 @@
 [Desktop Entry]
 Type=Link
 Name=Settings - Edge Bindings
+Name[eo]=Agordo - Fulmklavoj de ekranrandoj
 Name[fr]=Configuration - Raccourcis des bords de l'écran
 Name[it]=Configurazione - Associazioni a confini schermo
 Icon=e-module-conf_edgebindings
 Comment=<title>E17 Settings Applet</title><br>Configure your edgebindings here.
+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.
 X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_edgebindings/module.desktop.in b/src/modules/conf_edgebindings/module.desktop.in
index bf167a4..a32f171 100644
--- a/src/modules/conf_edgebindings/module.desktop.in
+++ b/src/modules/conf_edgebindings/module.desktop.in
@@ -1,10 +1,12 @@
 [Desktop Entry]
 Type=Link
 Name=Settings - Edge Bindings
+Name[eo]=Agordo - Fulmklavoj de ekranrandoj
 Name[fr]=Configuration - Raccourcis des bords de l'écran
 Name[it]=Configurazione - Associazioni a confini schermo
 Icon=e-module-conf_edgebindings
 Comment=<title>E17 Settings Applet</title><br>Configure your edgebindings here.
+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.
 X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_engine/Makefile.in b/src/modules/conf_engine/Makefile.in
index 1758b34..967e192 100644
--- a/src/modules/conf_engine/Makefile.in
+++ b/src/modules/conf_engine/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_exebuf/Makefile.in b/src/modules/conf_exebuf/Makefile.in
index 45a0894..18ab231 100644
--- a/src/modules/conf_exebuf/Makefile.in
+++ b/src/modules/conf_exebuf/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_fonts/Makefile.in b/src/modules/conf_fonts/Makefile.in
index 6782e5e..cbf0ca7 100644
--- a/src/modules/conf_fonts/Makefile.in
+++ b/src/modules/conf_fonts/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_icon_theme/Makefile.in b/src/modules/conf_icon_theme/Makefile.in
index 08122ca..33552d4 100644
--- a/src/modules/conf_icon_theme/Makefile.in
+++ b/src/modules/conf_icon_theme/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_imc/Makefile.in b/src/modules/conf_imc/Makefile.in
index 07068e1..ee9e837 100644
--- a/src/modules/conf_imc/Makefile.in
+++ b/src/modules/conf_imc/Makefile.in
@@ -254,6 +254,7 @@ 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@
@@ -266,6 +267,7 @@ 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@
diff --git a/src/modules/conf_interaction/Makefile.in b/src/modules/conf_interaction/Makefile.in
index 58026a2..4b874cf 100644
--- a/src/modules/conf_interaction/Makefile.in
+++ b/src/modules/conf_interaction/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_interaction/e_int_config_interaction.c b/src/modules/conf_interaction/e_int_config_interaction.c
index 729dbe1..44db4b8 100644
--- a/src/modules/conf_interaction/e_int_config_interaction.c
+++ b/src/modules/conf_interaction/e_int_config_interaction.c
@@ -104,7 +104,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    e_widget_framelist_object_append(of, ob);
    cfdata->sl1 = ob;
    
-   ob = e_widget_label_add(evas, _("Threshold for for applying drag momentum"));
+   ob = e_widget_label_add(evas, _("Threshold for applying drag momentum"));
    e_widget_framelist_object_append(of, ob);
    cfdata->l2 = ob;
    ob = e_widget_slider_add(evas, 1, 0, _("%1.0f pixels/sec"), 0, 2000, 20, 0, &(cfdata->thumbscroll_momentum_threshhold), NULL, 200);
diff --git a/src/modules/conf_interaction/module.desktop b/src/modules/conf_interaction/module.desktop
index f2fe3db..04e6722 100644
--- a/src/modules/conf_interaction/module.desktop
+++ b/src/modules/conf_interaction/module.desktop
@@ -3,6 +3,7 @@ Type=Link
 Name=Settings - Interaction
 Name[cs]=Nastavení - interakce
 Name[de]=
+Name[eo]=Agordo - Interagoj
 Name[es]=
 Name[fr]=Configuration - Interaction
 Name[hu]=Beállítások - Kölcsönhatások
@@ -16,6 +17,7 @@ Icon=e-module-conf_interaction
 Comment=<title>E17 Settings Applet</title><br>Configure default user interaction settings.
 Comment[cs]=<title>E17 applet nastavení</title><br>Nastavte výchozí volby interakce s uživatelem.
 Comment[de]=
+Comment[eo]=<title>Aplikaĵeto de agordo de E17</title><br>Agordas defaŭltajn uzantajn interagojn.
 Comment[es]=
 Comment[fr]=<title>Appliquette de configuration pour E17</title><br>Paramétrage par défaut de l'interaction au niveau utilisateur.
 Comment[hu]=<title>E17 beállító alkalmazás</title><br>Alapértelmezett felhasználói kölcsönhatás beállítása.
diff --git a/src/modules/conf_interaction/module.desktop.in b/src/modules/conf_interaction/module.desktop.in
index f2fe3db..04e6722 100644
--- a/src/modules/conf_interaction/module.desktop.in
+++ b/src/modules/conf_interaction/module.desktop.in
@@ -3,6 +3,7 @@ Type=Link
 Name=Settings - Interaction
 Name[cs]=Nastavení - interakce
 Name[de]=
+Name[eo]=Agordo - Interagoj
 Name[es]=
 Name[fr]=Configuration - Interaction
 Name[hu]=Beállítások - Kölcsönhatások
@@ -16,6 +17,7 @@ Icon=e-module-conf_interaction
 Comment=<title>E17 Settings Applet</title><br>Configure default user interaction settings.
 Comment[cs]=<title>E17 applet nastavení</title><br>Nastavte výchozí volby interakce s uživatelem.
 Comment[de]=
+Comment[eo]=<title>Aplikaĵeto de agordo de E17</title><br>Agordas defaŭltajn uzantajn interagojn.
 Comment[es]=
 Comment[fr]=<title>Appliquette de configuration pour E17</title><br>Paramétrage par défaut de l'interaction au niveau utilisateur.
 Comment[hu]=<title>E17 beállító alkalmazás</title><br>Alapértelmezett felhasználói kölcsönhatás beállítása.
diff --git a/src/modules/conf_intl/Makefile.in b/src/modules/conf_intl/Makefile.in
index 32e0d17..68985cf 100644
--- a/src/modules/conf_intl/Makefile.in
+++ b/src/modules/conf_intl/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_keybindings/Makefile.in b/src/modules/conf_keybindings/Makefile.in
index 5c79652..6adecd3 100644
--- a/src/modules/conf_keybindings/Makefile.in
+++ b/src/modules/conf_keybindings/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_menus/Makefile.in b/src/modules/conf_menus/Makefile.in
index 4cb233f..7338f5f 100644
--- a/src/modules/conf_menus/Makefile.in
+++ b/src/modules/conf_menus/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_mime/Makefile.in b/src/modules/conf_mime/Makefile.in
index 3dbbb60..2a2b288 100644
--- a/src/modules/conf_mime/Makefile.in
+++ b/src/modules/conf_mime/Makefile.in
@@ -254,6 +254,7 @@ 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@
@@ -266,6 +267,7 @@ 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@
diff --git a/src/modules/conf_mouse/Makefile.in b/src/modules/conf_mouse/Makefile.in
index 41b623c..831df9f 100644
--- a/src/modules/conf_mouse/Makefile.in
+++ b/src/modules/conf_mouse/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_mouse_cursor/Makefile.in b/src/modules/conf_mouse_cursor/Makefile.in
index 18cc6c4..82bf2bd 100644
--- a/src/modules/conf_mouse_cursor/Makefile.in
+++ b/src/modules/conf_mouse_cursor/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_mousebindings/Makefile.in b/src/modules/conf_mousebindings/Makefile.in
index 60bcd03..befbca8 100644
--- a/src/modules/conf_mousebindings/Makefile.in
+++ b/src/modules/conf_mousebindings/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_paths/Makefile.in b/src/modules/conf_paths/Makefile.in
index 348bf55..cec6862 100644
--- a/src/modules/conf_paths/Makefile.in
+++ b/src/modules/conf_paths/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_performance/Makefile.in b/src/modules/conf_performance/Makefile.in
index 200e815..71beefd 100644
--- a/src/modules/conf_performance/Makefile.in
+++ b/src/modules/conf_performance/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_profiles/Makefile.in b/src/modules/conf_profiles/Makefile.in
index 07f4792..a69180b 100644
--- a/src/modules/conf_profiles/Makefile.in
+++ b/src/modules/conf_profiles/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_scale/Makefile.in b/src/modules/conf_scale/Makefile.in
index 13ef179..9e53974 100644
--- a/src/modules/conf_scale/Makefile.in
+++ b/src/modules/conf_scale/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_scale/module.desktop b/src/modules/conf_scale/module.desktop
index 3017d4b..5189dca 100644
--- a/src/modules/conf_scale/module.desktop
+++ b/src/modules/conf_scale/module.desktop
@@ -3,7 +3,7 @@ Type=Link
 Name=Settings - Scaling
 Name[cs]=Nastavení - škálování
 Name[de]=
-Name[eo]=
+Name[eo]=Agordo - Skalado
 Name[es]=
 Name[fr]=Configuration - Mise à l'échelle
 Name[hu]=Kalibrálás
@@ -17,7 +17,7 @@ Icon=e-module-conf_scale
 Comment=<title>E17 Settings Applet</title><br>Used to configure certain 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]=
+Comment[eo]=<title>Aplikaĵeto de agordo de E17</title><br>Permesas agordi la skaladon.
 Comment[es]=
 Comment[fr]=<title>Appliquette de configuration pour E17</title><br>Permet de paramétrer la mise à l'échelle.
 Comment[hu]=<title>E17 Beállító modul</title><br>A képernyő kalibrálására, DPI meghatározására szolgál.
diff --git a/src/modules/conf_scale/module.desktop.in b/src/modules/conf_scale/module.desktop.in
index 3017d4b..5189dca 100644
--- a/src/modules/conf_scale/module.desktop.in
+++ b/src/modules/conf_scale/module.desktop.in
@@ -3,7 +3,7 @@ Type=Link
 Name=Settings - Scaling
 Name[cs]=Nastavení - škálování
 Name[de]=
-Name[eo]=
+Name[eo]=Agordo - Skalado
 Name[es]=
 Name[fr]=Configuration - Mise à l'échelle
 Name[hu]=Kalibrálás
@@ -17,7 +17,7 @@ Icon=e-module-conf_scale
 Comment=<title>E17 Settings Applet</title><br>Used to configure certain 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]=
+Comment[eo]=<title>Aplikaĵeto de agordo de E17</title><br>Permesas agordi la skaladon.
 Comment[es]=
 Comment[fr]=<title>Appliquette de configuration pour E17</title><br>Permet de paramétrer la mise à l'échelle.
 Comment[hu]=<title>E17 Beállító modul</title><br>A képernyő kalibrálására, DPI meghatározására szolgál.
diff --git a/src/modules/conf_screensaver/Makefile.in b/src/modules/conf_screensaver/Makefile.in
index 09f8817..b56eedf 100644
--- a/src/modules/conf_screensaver/Makefile.in
+++ b/src/modules/conf_screensaver/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_screensaver/e_int_config_screensaver.c b/src/modules/conf_screensaver/e_int_config_screensaver.c
index ddb8186..946720e 100644
--- a/src/modules/conf_screensaver/e_int_config_screensaver.c
+++ b/src/modules/conf_screensaver/e_int_config_screensaver.c
@@ -16,40 +16,54 @@ static Evas_Object  *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
 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_list(void *data, Evas_Object *obj);
+static void _cb_disable_basic(void *data, Evas_Object *obj);
+static void _cb_disable_adv(void *data, Evas_Object *obj);
+static void _cb_ask_presentation_changed(void *data, Evas_Object *obj);
 
 struct _E_Config_Dialog_Data
 {
    E_Config_Dialog *cfd;
-   
+
    int enable_screensaver;
    double timeout;
    double interval;
    int blanking;
    int exposures;
-};
+   int ask_presentation;
+   double ask_presentation_timeout;
 
-Eina_List *xscreensaver_list = NULL;
+   Eina_List *disable_list;
+
+   struct {
+      struct {
+	 Evas_Object *label;
+	 Evas_Object *slider;
+      } basic;
+      struct {
+	 Evas_Object *ask_presentation_label;
+	 Evas_Object *ask_presentation_slider;
+      } adv;
+   } gui;
+};
 
 EAPI E_Config_Dialog *
 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;
    v = E_NEW(E_Config_Dialog_View, 1);
-   
+
    v->create_cfdata = _create_data;
    v->free_cfdata = _free_data;
    v->basic.apply_cfdata = _basic_apply_data;
    v->basic.create_widgets = _basic_create_widgets;
    v->advanced.apply_cfdata = _advanced_apply_data;
    v->advanced.create_widgets = _advanced_create_widgets;
-   
+
    v->override_auto_apply = 1;
-   
+
    cfd = e_config_dialog_new(con,_("Screen Saver Settings"),
 			     "E", "_config_screensaver_dialog",
 			     "preferences-desktop-screensaver", 0, v, NULL);
@@ -64,6 +78,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    cfdata->interval = e_config->screensaver_interval;
    cfdata->blanking = e_config->screensaver_blanking;
    cfdata->exposures = e_config->screensaver_expose;
+   cfdata->ask_presentation = e_config->screensaver_ask_presentation;
+   cfdata->ask_presentation_timeout = e_config->screensaver_ask_presentation_timeout;
 }
 
 static void *
@@ -80,19 +96,20 @@ _create_data(E_Config_Dialog *cfd)
 static void
 _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
-   xscreensaver_list = eina_list_free(xscreensaver_list);
-
+   eina_list_free(cfdata->disable_list);
    E_FREE(cfdata);
 }
 
 static int
 _apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
-{   
+{
    e_config->screensaver_enable = cfdata->enable_screensaver;
    e_config->screensaver_timeout = cfdata->timeout * 60;
    e_config->screensaver_interval = cfdata->interval;
    e_config->screensaver_blanking = cfdata->blanking;
    e_config->screensaver_expose = cfdata->exposures;
+   e_config->screensaver_ask_presentation = cfdata->ask_presentation;
+   e_config->screensaver_ask_presentation_timeout = cfdata->ask_presentation_timeout;
 
    /* Apply settings */
    e_screensaver_init();
@@ -103,7 +120,7 @@ static int
 _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
   _apply_data(cfd, cfdata);
-   
+
   e_config_save_queue();
   return 1;
 }
@@ -116,20 +133,21 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    o = e_widget_list_add(evas, 0, 0);
 
    xscreensaver_check = e_widget_check_add(evas, _("Enable X screensaver"), &(cfdata->enable_screensaver));
-   e_widget_list_object_append(o, xscreensaver_check, 1, 1, 0);   
-   
+   e_widget_list_object_append(o, xscreensaver_check, 1, 1, 0);
+
    of = e_widget_framelist_add(evas, _("Screensaver Timer(s)"), 0);
 
    ob = e_widget_label_add(evas, _("Time until X screensaver starts"));
+   cfdata->gui.basic.label = ob;
    e_widget_framelist_object_append(of, ob);
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0, 
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0,
 			    &(cfdata->timeout), NULL, 100);
-   e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
+   cfdata->gui.basic.slider = ob;
    e_widget_framelist_object_append(of, ob);
 
-   // handler for enable/disable widget
-   e_widget_on_change_hook_set(xscreensaver_check, _cb_disable_check, ob);
-   
+   e_widget_on_change_hook_set(xscreensaver_check, _cb_disable_basic, cfdata);
+   _cb_disable_basic(cfdata, NULL);
+
    e_widget_list_object_append(o, of, 1, 1, 0.5);
    return o;
 }
@@ -153,87 +171,112 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    o = e_widget_list_add(evas, 0, 0);
 
    xscreensaver_check = e_widget_check_add(evas, _("Enable X screensaver"), &(cfdata->enable_screensaver));
-   e_widget_list_object_append(o, xscreensaver_check, 1, 1, 0);   
-   
+   e_widget_list_object_append(o, xscreensaver_check, 1, 1, 0);
+
    of = e_widget_framelist_add(evas, _("Screensaver Timer(s)"), 0);
 
    ob = e_widget_label_add(evas, _("Time until X screensaver starts"));
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ob);
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"),
 			    1.0, 90.0, 1.0, 0, &(cfdata->timeout), NULL, 200);
-   xscreensaver_list = eina_list_append (xscreensaver_list, ob);
-   e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ob);
    e_widget_framelist_object_append(of, ob);
-   
+
    ob = e_widget_label_add(evas, _("Time until X screensaver alternates"));
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ob);
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"),
 			    1.0, 300.0, 1.0, 0, &(cfdata->interval), NULL, 200);
-   xscreensaver_list = eina_list_append (xscreensaver_list, ob);
-   e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ob);
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
-   
+
+   of = e_widget_framelist_add(evas, _("Enter Presentation Mode"), 0);
+
+   ob = e_widget_check_add(evas, _("Suggest entering presentation mode"), &(cfdata->ask_presentation));
+   e_widget_on_change_hook_set(ob, _cb_ask_presentation_changed, cfdata);
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ob);
+   e_widget_framelist_object_append(of, ob);
+
+   ob = e_widget_label_add(evas, _("If deactivated before"));
+   cfdata->gui.adv.ask_presentation_label = ob;
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ob);
+   e_widget_framelist_object_append(of, ob);
+
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"),
+			    1.0, 300.0, 10.0, 0,
+			    &(cfdata->ask_presentation_timeout), NULL, 200);
+   cfdata->gui.adv.ask_presentation_slider = ob;
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ob);
+   e_widget_framelist_object_append(of, ob);
+
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
+
    of = e_widget_framelist_add(evas, _("Blanking"), 0);
    rg = e_widget_radio_group_new(&(cfdata->blanking));
    ob = e_widget_radio_add(evas, _("Default"), E_CONFIG_BLANKING_DEFAULT, rg);
-   e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
-   xscreensaver_list = eina_list_append (xscreensaver_list, ob);
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ob);
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_radio_add(evas, _("Preferred"), E_CONFIG_BLANKING_PREFERRED, rg);
-   e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
-   xscreensaver_list = eina_list_append (xscreensaver_list, ob);
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ob);
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_radio_add(evas, _("Not Preferred"), E_CONFIG_BLANKING_NOT_PREFERRED, rg);
-   e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
-   xscreensaver_list = eina_list_append (xscreensaver_list, ob);
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ob);
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
-   
+
    of = e_widget_framelist_add(evas, _("Exposure Events"), 0);
    rg = e_widget_radio_group_new(&(cfdata->exposures));
    ob = e_widget_radio_add(evas, _("Default"), E_CONFIG_EXPOSURES_DEFAULT, rg);
-   e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
-   xscreensaver_list = eina_list_append (xscreensaver_list, ob);
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ob);
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_radio_add(evas, _("Allow"), E_CONFIG_EXPOSURES_ALLOWED, rg);
-   e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
-   xscreensaver_list = eina_list_append (xscreensaver_list, ob);
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ob);
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_radio_add(evas, _("Don't Allow"), E_CONFIG_EXPOSURES_NOT_ALLOWED, rg);
-   e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
-   xscreensaver_list = eina_list_append (xscreensaver_list, ob);
+   cfdata->disable_list = eina_list_append(cfdata->disable_list, ob);
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
 
    // handler for enable/disable widget array
-   e_widget_on_change_hook_set(xscreensaver_check, _cb_disable_check_list, xscreensaver_list);
-   
-   return o;   
+   e_widget_on_change_hook_set(xscreensaver_check, _cb_disable_adv, cfdata);
+   _cb_disable_adv(cfdata, NULL);
+
+   return o;
 }
 
-/*!
- * @param data A Evas_Object to chain together with the checkbox
- * @param obj A Evas_Object checkbox created with e_widget_check_add()
- */
 static void
-_cb_disable_check(void *data, Evas_Object *obj)
+_cb_disable_basic(void *data, Evas_Object *obj)
 {
-   e_widget_disabled_set((Evas_Object *) data, 
-                         !e_widget_check_checked_get(obj));
+   E_Config_Dialog_Data *cfdata = data;
+   Eina_Bool disable = !cfdata->enable_screensaver;
+
+   e_widget_disabled_set(cfdata->gui.basic.label, disable);
+   e_widget_disabled_set(cfdata->gui.basic.slider, disable);
 }
 
-/*!
- * @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()
- */
 static void
-_cb_disable_check_list(void *data, Evas_Object *obj)
+_cb_disable_adv(void *data, Evas_Object *obj __UNUSED__)
 {
-   Eina_List *list = (Eina_List*) data;
-   Eina_List *l;
+   E_Config_Dialog_Data *cfdata = data;
+   const Eina_List *l;
    Evas_Object *o;
 
-   EINA_LIST_FOREACH(list, l, o)
-      e_widget_disabled_set(o, !e_widget_check_checked_get(obj));
+   EINA_LIST_FOREACH(cfdata->disable_list, l, o)
+      e_widget_disabled_set(o, !cfdata->enable_screensaver);
+
+   _cb_ask_presentation_changed(cfdata, NULL);
+}
+
+static void
+_cb_ask_presentation_changed(void *data, Evas_Object *obj __UNUSED__)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   Eina_Bool disable;
+
+   disable = ((!cfdata->enable_screensaver) || (!cfdata->ask_presentation));
+
+   e_widget_disabled_set(cfdata->gui.adv.ask_presentation_label, disable);
+   e_widget_disabled_set(cfdata->gui.adv.ask_presentation_slider, disable);
 }
diff --git a/src/modules/conf_shelves/Makefile.in b/src/modules/conf_shelves/Makefile.in
index fe8b2a4..7644fa5 100644
--- a/src/modules/conf_shelves/Makefile.in
+++ b/src/modules/conf_shelves/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_startup/Makefile.in b/src/modules/conf_startup/Makefile.in
index ded84e6..b5713aa 100644
--- a/src/modules/conf_startup/Makefile.in
+++ b/src/modules/conf_startup/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_theme/Makefile.in b/src/modules/conf_theme/Makefile.in
index 7c0a482..52668c7 100644
--- a/src/modules/conf_theme/Makefile.in
+++ b/src/modules/conf_theme/Makefile.in
@@ -254,6 +254,7 @@ 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@
@@ -266,6 +267,7 @@ 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@
diff --git a/src/modules/conf_transitions/Makefile.in b/src/modules/conf_transitions/Makefile.in
index 9913c6a..bb4621d 100644
--- a/src/modules/conf_transitions/Makefile.in
+++ b/src/modules/conf_transitions/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_wallpaper/Makefile.in b/src/modules/conf_wallpaper/Makefile.in
index ffe9d15..070a20e 100644
--- a/src/modules/conf_wallpaper/Makefile.in
+++ b/src/modules/conf_wallpaper/Makefile.in
@@ -255,6 +255,7 @@ 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@
@@ -267,6 +268,7 @@ 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@
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 4ed08a7..87c188f 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
@@ -490,7 +490,7 @@ _import_edj_gen(Import *import)
 		"parts {\n"
 		"part { name: \"bg\"; mouse_events: 0;\n"
 		"description { state: \"default\" 0.0;\n"
-		"image { normal: \"%s\"; }\n"
+		"image { normal: \"%s\"; scale_hint: STATIC; }\n"
 		"} } } } }\n"
 		, fstrip, enc, w, h, fstrip);
 	break;
@@ -547,7 +547,7 @@ _import_edj_gen(Import *import)
 		"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\"; }\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);
@@ -565,7 +565,7 @@ _import_edj_gen(Import *import)
 		"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\"; }\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);
diff --git a/src/modules/conf_wallpaper2/Makefile.in b/src/modules/conf_wallpaper2/Makefile.in
index c22453b..e6e8093 100644
--- a/src/modules/conf_wallpaper2/Makefile.in
+++ b/src/modules/conf_wallpaper2/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c
index a8ac205..4d372aa 100644
--- a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c
+++ b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c
@@ -14,6 +14,11 @@
 //   need indicator that sort is pending
 //   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
+//   need to show busy info while loading files / generating thumbs
+//   need to delete/create objects as neede (not just hide/show)
+//   need to be able to "type name to search/filter
 
 typedef struct _Info Info;
 typedef struct _Smart_Data Smart_Data;
@@ -66,6 +71,7 @@ struct _Item
    Evas_Bool do_thumb : 1;
    Evas_Bool remote : 1;
    Evas_Bool theme : 1;
+   Evas_Bool visible : 1;
 };
 
 static Info *global_info = NULL;
@@ -120,6 +126,9 @@ _pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
 
 static void _e_smart_reconfigure(Evas_Object *obj);
 static void _thumb_gen(void *data, Evas_Object *obj, void *event_info);
+static void _item_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _item_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static int _sort_cb(const void *d1, const void *d2);
 
 static int
 _e_smart_reconfigure_do(void *data)
@@ -129,8 +138,10 @@ _e_smart_reconfigure_do(void *data)
    Eina_List *l;
    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;
-   
+
+   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;
@@ -197,7 +208,12 @@ _e_smart_reconfigure_do(void *data)
              sd->cy = 0;
              redo = 1;
           }
-        if (redo) _e_smart_reconfigure_do(obj);
+        if (redo)
+	  {
+	     recursion = 1;
+	     _e_smart_reconfigure_do(obj);
+	     recursion = 0;
+	  }
         changed = 1;
      }
    
@@ -284,10 +300,6 @@ _e_smart_reconfigure_do(void *data)
           }
         xx = sd->x - sd->cx + it->x + ox;
         yy = sd->y - sd->cy + it->y + oy;
-        evas_object_move(it->frame, 
-                         xx + dx,
-                         yy + dy);
-        evas_object_resize(it->frame, it->w, it->h);
         evas_output_viewport_get(evas_object_evas_get(obj), NULL, NULL, &vw, &vh);
         if (E_INTERSECTS(xx, yy, it->w, it->h, 0, 0, vw, vh))
           {
@@ -299,6 +311,50 @@ _e_smart_reconfigure_do(void *data)
                        it->do_thumb = 1;
                     }
                }
+             else
+               {
+                  if (!it->frame)
+                    {
+                       it->frame = edje_object_add(evas_object_evas_get(obj));
+                       if (it->theme)
+                         e_theme_edje_object_set(it->frame, "base/theme/widgets",
+                                                 "e/conf/wallpaper/main/mini-theme");
+                       else if (it->remote)
+                         e_theme_edje_object_set(it->frame, "base/theme/widgets",
+                                                 "e/conf/wallpaper/main/mini-remote");
+                       else
+                         e_theme_edje_object_set(it->frame, "base/theme/widgets",
+                                                 "e/conf/wallpaper/main/mini");
+                       evas_object_event_callback_add(it->frame, EVAS_CALLBACK_MOUSE_DOWN,
+                                                      _item_down, it);
+                       evas_object_event_callback_add(it->frame, EVAS_CALLBACK_MOUSE_UP,
+                                                      _item_up, it);
+                       
+                       evas_object_smart_member_add(it->frame, obj);
+                       evas_object_clip_set(it->frame, evas_object_clip_get(obj));
+                       it->image = e_thumb_icon_add(evas_object_evas_get(obj));
+                       edje_object_part_swallow(it->frame, "e.swallow.content", it->image);
+                       evas_object_smart_callback_add(it->image, "e_thumb_gen", _thumb_gen, it);
+                       if (it->theme)
+                         {
+                            const char *f = e_theme_edje_file_get("base/theme/backgrounds",
+                                                                  "e/desktop/background");
+                            e_thumb_icon_file_set(it->image, f, "e/desktop/background");
+                         }
+                       else
+                         e_thumb_icon_file_set(it->image, it->file, "e/desktop/background");
+                       e_thumb_icon_size_set(it->image, sd->info->iw, sd->info->ih);
+                       evas_object_show(it->image);
+                       
+                       e_thumb_icon_begin(it->image);
+                    }
+               }
+             evas_object_move(it->frame, 
+                              xx + dx,
+                              yy + dy);
+             evas_object_resize(it->frame, it->w, it->h);
+             evas_object_show(it->frame);
+             it->visible = 1;
           }
         else
           {
@@ -310,6 +366,20 @@ _e_smart_reconfigure_do(void *data)
                        it->do_thumb = 0;
                     }
                   evas_object_del(it->image);
+                  it->image = NULL;
+                  evas_object_del(it->frame);
+                  it->frame = NULL;
+               }
+             it->visible = 0;
+/*             
+             if (it->have_thumb)
+               {
+                  if (it->do_thumb)
+                    {
+                       e_thumb_icon_end(it->image);
+                       it->do_thumb = 0;
+                    }
+                  evas_object_del(it->image);
                   it->have_thumb = 0;
                   it->image = e_thumb_icon_add(evas_object_evas_get(obj));
                   edje_object_part_swallow(it->frame, "e.swallow.content", it->image);
@@ -337,12 +407,13 @@ _e_smart_reconfigure_do(void *data)
                          }
                     }
                }
+ */
           }
      }
    
    if (changed)
      evas_object_smart_callback_call(obj, "changed", NULL);
-   sd->idle_enter = NULL;
+   if (recursion == 0) sd->idle_enter = NULL;
    return 0;
 }
 
@@ -386,6 +457,7 @@ _e_smart_del(Evas_Object *obj)
         free(it);
      }
    free(sd);
+   evas_object_smart_data_set(obj, NULL);
 }
 
 static void
@@ -652,6 +724,18 @@ _thumb_gen(void *data, Evas_Object *obj, void *event_info)
           }
      }
    it->have_thumb = 1;
+   if (!it->visible)
+     {
+        if (it->do_thumb)
+          {
+             e_thumb_icon_end(it->image);
+             it->do_thumb = 0;
+          }
+        evas_object_del(it->image);
+        it->image = NULL;
+        evas_object_del(it->frame);
+        it->frame = NULL;
+     }
 }
 
 static void         
@@ -911,8 +995,8 @@ wp_browser_new(E_Container *con)
         info->use_theme_bg = 1;
      }
    
-   info->iw = 256;
-   info->ih = (zone->h * 256) / (zone->w);
+   info->iw = 120 * e_scale;
+   info->ih = (zone->h * info->iw) / (zone->w);
    
    win = e_win_new(con);
    if (!win)
diff --git a/src/modules/conf_window_display/Makefile.in b/src/modules/conf_window_display/Makefile.in
index d04390a..8316926 100644
--- a/src/modules/conf_window_display/Makefile.in
+++ b/src/modules/conf_window_display/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_window_focus/Makefile.in b/src/modules/conf_window_focus/Makefile.in
index 79baa35..6c7a611 100644
--- a/src/modules/conf_window_focus/Makefile.in
+++ b/src/modules/conf_window_focus/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_window_manipulation/Makefile.in b/src/modules/conf_window_manipulation/Makefile.in
index c001c4b..7aeb704 100644
--- a/src/modules/conf_window_manipulation/Makefile.in
+++ b/src/modules/conf_window_manipulation/Makefile.in
@@ -255,6 +255,7 @@ 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@
@@ -267,6 +268,7 @@ 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@
diff --git a/src/modules/conf_window_remembers/Makefile.in b/src/modules/conf_window_remembers/Makefile.in
index e03e0f4..79d36be 100644
--- a/src/modules/conf_window_remembers/Makefile.in
+++ b/src/modules/conf_window_remembers/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/conf_window_remembers/module.desktop b/src/modules/conf_window_remembers/module.desktop
index 8f89297..ab219c3 100644
--- a/src/modules/conf_window_remembers/module.desktop
+++ b/src/modules/conf_window_remembers/module.desktop
@@ -2,12 +2,14 @@
 Type=Link
 Name=Settings - Window Remembers
 Name[cs]=Nastavení - paměť
+Name[eo]=Agordo - Fesnestraj memoroj
 Name[it]=Configurazione - Ricordi finestre
 Name[hu]=Beállítások - Ablak emlékek
 Name[fr]=Configuration - Mémorisations propres à la fenêtre
 Icon=e-module-conf_window_remembers
 Comment=<title>E17 Settings Applet</title><br>Delete existing window remembers.
 Comment[cs]=<title>E17 applet nastavení</title><br>K vymazání existujících zapamatovaných vlastností oken.
+Comment[eo]=<title>Aplikaĵeto de agordo de E17</title><br>Forviŝas fenestrajn memorojn.
 Comment[it]=<title>Applet configurazione di E17</title><br>Rimuove le impostazioni da ricordare esistenti delle finestre.
 Comment[hu]=<title>E17 beállító kisalkalmazás</title><br>Meglévő ablak emlékek törlése.
 Comment[fr]=<title>Appliquette de configuration pour E17</title><br>Permet d'effacer les mémorisations.
diff --git a/src/modules/conf_window_remembers/module.desktop.in b/src/modules/conf_window_remembers/module.desktop.in
index 8f89297..ab219c3 100644
--- a/src/modules/conf_window_remembers/module.desktop.in
+++ b/src/modules/conf_window_remembers/module.desktop.in
@@ -2,12 +2,14 @@
 Type=Link
 Name=Settings - Window Remembers
 Name[cs]=Nastavení - paměť
+Name[eo]=Agordo - Fesnestraj memoroj
 Name[it]=Configurazione - Ricordi finestre
 Name[hu]=Beállítások - Ablak emlékek
 Name[fr]=Configuration - Mémorisations propres à la fenêtre
 Icon=e-module-conf_window_remembers
 Comment=<title>E17 Settings Applet</title><br>Delete existing window remembers.
 Comment[cs]=<title>E17 applet nastavení</title><br>K vymazání existujících zapamatovaných vlastností oken.
+Comment[eo]=<title>Aplikaĵeto de agordo de E17</title><br>Forviŝas fenestrajn memorojn.
 Comment[it]=<title>Applet configurazione di E17</title><br>Rimuove le impostazioni da ricordare esistenti delle finestre.
 Comment[hu]=<title>E17 beállító kisalkalmazás</title><br>Meglévő ablak emlékek törlése.
 Comment[fr]=<title>Appliquette de configuration pour E17</title><br>Permet d'effacer les mémorisations.
diff --git a/src/modules/conf_winlist/Makefile.in b/src/modules/conf_winlist/Makefile.in
index 515b0d4..6495792 100644
--- a/src/modules/conf_winlist/Makefile.in
+++ b/src/modules/conf_winlist/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/connman/Makefile.in b/src/modules/connman/Makefile.in
index 32b9112..33353ea 100644
--- a/src/modules/connman/Makefile.in
+++ b/src/modules/connman/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c
index 75f184c..d526f58 100644
--- a/src/modules/connman/e_mod_main.c
+++ b/src/modules/connman/e_mod_main.c
@@ -811,20 +811,6 @@ popup_cb_setup(void *data, void *data2)
 }
 
 static void
-popup_cb_resize(Evas_Object *obj, int *w, int *h)
-{
-   int mw, mh;
-
-   e_widget_min_size_get(obj, &mw, &mh);
-
-   if (mh < 180) mh = 180;
-   if (mw < 160) mw = 160;
-
-   if (*w) *w = (mw + 8);
-   if (*h) *h = (mh + 8);
-}
-
-static void
 popup_ifnet_icon_adjust(Evas_Object *icon, Interface_Network *ifnet)
 {
    Edje_Message_Int_Set *msg;
@@ -1058,7 +1044,7 @@ popup_show(Instance *inst)
    Evas *evas;
    Evas_Coord mw, mh;
 
-   inst->popup = e_gadcon_popup_new(inst->gcc, popup_cb_resize);
+   inst->popup = e_gadcon_popup_new(inst->gcc);
    evas = inst->popup->win->evas;
 
    edje_freeze();
@@ -1092,6 +1078,11 @@ 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);
+   if (mh < 188) mh = 188;
+   if (mw < 168) mw = 168;
+   e_widget_min_size_set(base, mw, mh);
+
    edje_thaw();
 
    e_gadcon_popup_content_set(inst->popup, base);
diff --git a/src/modules/connman/module.desktop b/src/modules/connman/module.desktop
index 8d34858..644bd2d 100644
--- a/src/modules/connman/module.desktop
+++ b/src/modules/connman/module.desktop
@@ -4,11 +4,13 @@ Name=Connection Manager
 Name[cs]=Správce připojení
 Name[it]=Gestore connessioni
 Name[hu]=Hálózati kapcsolatok
+Name[eo]=Administrilo de konekto
 Name[fr]=Gestionnaire de connexion
 Icon=e-module-connman
 Comment=<title>Network Connection Manager Gadget</title><br>Control Wifi and wired networks as a user.
 Comment[cs]=<title>Gadget síťového připojení</title><br>Nastavení wifi a drátových sítí jako uživatel.
 Comment[it]=<title>Gadget gestione connessioni di rete</title><br>Controlla le reti wireless e cablate come utente.
 Comment[hu]=<title>Hálózati kapcsolat kezelő modul</title><br>Wifi és vezetékes hálózatok kezelését teszi lehetővé.
+Comment[eo]=<title>Akcesoraĵo de administrilo de retkonekto</title><br>Por kontroli sendratajn kaj dratajn retojn kiel uzanto.
 Comment[fr]=<title>Gadget Gestionnaire de connexion</title><br>Permet de contrôler les réseaux Wifi et câblés en tant qu'utilisateur.
-X-Enlightenment-ModuleType=system
+X-Enlightenment-ModuleType=system
\ No newline at end of file
diff --git a/src/modules/connman/module.desktop.in b/src/modules/connman/module.desktop.in
index 8d34858..644bd2d 100644
--- a/src/modules/connman/module.desktop.in
+++ b/src/modules/connman/module.desktop.in
@@ -4,11 +4,13 @@ Name=Connection Manager
 Name[cs]=Správce připojení
 Name[it]=Gestore connessioni
 Name[hu]=Hálózati kapcsolatok
+Name[eo]=Administrilo de konekto
 Name[fr]=Gestionnaire de connexion
 Icon=e-module-connman
 Comment=<title>Network Connection Manager Gadget</title><br>Control Wifi and wired networks as a user.
 Comment[cs]=<title>Gadget síťového připojení</title><br>Nastavení wifi a drátových sítí jako uživatel.
 Comment[it]=<title>Gadget gestione connessioni di rete</title><br>Controlla le reti wireless e cablate come utente.
 Comment[hu]=<title>Hálózati kapcsolat kezelő modul</title><br>Wifi és vezetékes hálózatok kezelését teszi lehetővé.
+Comment[eo]=<title>Akcesoraĵo de administrilo de retkonekto</title><br>Por kontroli sendratajn kaj dratajn retojn kiel uzanto.
 Comment[fr]=<title>Gadget Gestionnaire de connexion</title><br>Permet de contrôler les réseaux Wifi et câblés en tant qu'utilisateur.
-X-Enlightenment-ModuleType=system
+X-Enlightenment-ModuleType=system
\ No newline at end of file
diff --git a/src/modules/cpufreq/Makefile.in b/src/modules/cpufreq/Makefile.in
index 998b72c..9a8d489 100644
--- a/src/modules/cpufreq/Makefile.in
+++ b/src/modules/cpufreq/Makefile.in
@@ -261,6 +261,7 @@ 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@
@@ -273,6 +274,7 @@ 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@
diff --git a/src/modules/dropshadow/Makefile.in b/src/modules/dropshadow/Makefile.in
index bbc4a9b..ff3dc8c 100644
--- a/src/modules/dropshadow/Makefile.in
+++ b/src/modules/dropshadow/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/everything/Makefile.am b/src/modules/everything/Makefile.am
new file mode 100644
index 0000000..4c79f40
--- /dev/null
+++ b/src/modules/everything/Makefile.am
@@ -0,0 +1,34 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = everything
+
+# 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 \
+			 evry.c \
+                         evry.h \
+			 evry_plug_apps.c \
+			 evry_plug_border.c \
+			 evry_plug_config.c
+
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/everything/Makefile.in b/src/modules/everything/Makefile.in
new file mode 100644
index 0000000..a34c506
--- /dev/null
+++ b/src/modules/everything/Makefile.in
@@ -0,0 +1,686 @@
+# Makefile.in generated by automake 1.10.1 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
+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 evry.lo evry_plug_apps.lo \
+	evry_plug_border.lo evry_plug_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_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = everything
+
+# 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 \
+			 evry.c \
+                         evry.h \
+			 evry_plug_apps.c \
+			 evry_plug_border.c \
+			 evry_plug_config.c
+
+module_la_LIBADD = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/modules/everything/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/modules/everything/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_main.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry.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_config.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; nonemtpy = 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/conf_applications/e-module-conf_applications.edj b/src/modules/everything/e-module-everything.edj
similarity index 100%
copy from src/modules/conf_applications/e-module-conf_applications.edj
copy to src/modules/everything/e-module-everything.edj
diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c
new file mode 100644
index 0000000..ac82a35
--- /dev/null
+++ b/src/modules/everything/e_mod_main.c
@@ -0,0 +1,178 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/* actual module specifics */
+static 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 E_Module *conf_module = NULL;
+static E_Action *act = NULL;
+static E_Int_Menu_Augmentation *maug = NULL;
+
+static E_Config_DD *conf_edd = NULL;
+static E_Config_DD *conf_item_edd = NULL;
+Config *evry_conf;
+
+/* module setup */
+EAPI E_Module_Api e_modapi =
+  {
+    E_MODULE_API_VERSION,
+    "Everything"
+  };
+
+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);
+
+   conf_item_edd = E_CONFIG_DD_NEW("Source_Config", Source_Config);
+#undef T
+#undef D
+#define T Source_Config
+#define D conf_item_edd
+   E_CONFIG_VAL(D, T, name, STR);
+   E_CONFIG_VAL(D, T, min_query, 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, sources, conf_item_edd);
+#undef T
+#undef D
+   evry_conf = e_config_domain_load("module.everything", conf_edd);
+
+   if (!evry_conf)
+     {
+	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.5;
+     }
+   
+   conf_module = m;
+   evry_init();
+
+   evry_plug_border_init();
+   evry_plug_apps_init();
+   evry_plug_config_init();
+
+   /* 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);
+     }
+
+   maug = e_int_menus_menu_augmentation_add("main/1", _e_mod_menu_add, NULL, NULL, NULL);
+
+   e_module_delayed_set(m, 1);
+
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   /* remove module-supplied menu additions */
+   if (maug)
+     {
+   	e_int_menus_menu_augmentation_del("main/1", maug);
+   	maug = NULL;
+     }
+   /* remove module-supplied action */
+   if (act)
+     {
+	e_action_predef_name_del(_("Launch"), _("Run Everything Dialog"));
+	e_action_del("everything");
+	act = NULL;
+     }
+
+   evry_plug_border_shutdown();
+   evry_plug_apps_shutdown();
+   evry_plug_config_shutdown();
+
+   evry_shutdown();
+   conf_module = NULL;
+
+   /* Clean EET */
+   E_CONFIG_DD_FREE(conf_item_edd);
+   E_CONFIG_DD_FREE(conf_edd);
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   e_config_domain_save("module.everything", conf_edd, evry_conf);
+   return 1;
+}
+
+/* action callback */
+static void
+_e_mod_action_exebuf_cb(E_Object *obj, const char *params)
+{
+   E_Zone *zone = NULL;
+
+   if (obj)
+     {
+	if (obj->type == E_MANAGER_TYPE)
+	  zone = e_util_zone_current_get((E_Manager *)obj);
+	else if (obj->type == E_CONTAINER_TYPE)
+	  zone = e_util_zone_current_get(((E_Container *)obj)->manager);
+	else if (obj->type == E_ZONE_TYPE)
+	  zone = e_util_zone_current_get(((E_Zone *)obj)->container->manager);
+	else
+	  zone = e_util_zone_current_get(e_manager_current_get());
+     }
+   if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
+   if (zone) evry_show(zone);
+}
+
+/* menu item callback(s) */
+static int
+_e_mod_run_defer_cb(void *data)
+{
+   E_Zone *zone;
+
+   zone = data;
+   if (zone) evry_show(zone);
+   return 0;
+}
+
+static void
+_e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+   ecore_idle_enterer_add(_e_mod_run_defer_cb, m->zone);
+}
+
+/* menu item add hook */
+static void
+_e_mod_menu_add(void *data, E_Menu *m)
+{
+   E_Menu_Item *mi;
+
+   mi = e_menu_item_new(m);
+   e_menu_item_label_set(mi, _("Run Everything"));
+   e_util_menu_item_theme_icon_set(mi, "system-run");
+   e_menu_item_callback_set(mi, _e_mod_run_cb, NULL);
+}
diff --git a/src/modules/everything/e_mod_main.h b/src/modules/everything/e_mod_main.h
new file mode 100644
index 0000000..bc9ee38
--- /dev/null
+++ b/src/modules/everything/e_mod_main.h
@@ -0,0 +1,57 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "evry.h"
+
+#undef E_TYPEDEFS
+#include "evry.h"
+
+typedef struct _Config Config;
+typedef struct _Source_Config Source_Config;
+
+struct _Config
+{
+  /* position */
+  double rel_x, rel_y;
+  /* size */
+  int width, height;
+
+  /* generic plugin config */
+  Eina_List *sources;
+
+  int scroll_animate;
+  double scroll_speed;
+};
+
+struct _Source_Config
+{
+  const char *name;
+
+  /* minimum input chars to query this source */
+  int min_query;
+};
+
+  
+
+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 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_config_init(void);
+EAPI int  evry_plug_config_shutdown(void);
+
+extern Config *evry_conf;
+
+#endif
diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c
new file mode 100644
index 0000000..f952504
--- /dev/null
+++ b/src/modules/everything/evry.c
@@ -0,0 +1,851 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "evry.h"
+
+#define INPUTLEN 40
+#define MATCH_LAG 0.33
+
+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_matches_clear(void);
+static void _evry_list_clear(void);
+static void _evry_show_candidates(Evry_Plugin *plugin);
+static int  _evry_update_timer(void *data);
+static void _evry_matches_update(void);
+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_item_desel(Evry_Item *it);
+static void _evry_item_sel(Evry_Item *it);
+static void _evry_item_remove(Evry_Item *it);
+static void _evry_action(int finished);
+static void _evry_cb_plugin_sel(void *data1, void *data2);
+static int  _evry_animator(void *data);
+static int  _evry_scroll_timer(void *data);
+
+
+/* local subsystem globals */
+static E_Popup     *popup = NULL;
+static Ecore_X_Window input_window = 0;
+static Evas_Object *o_list = NULL;
+static Evas_Object *o_main = NULL;
+static Evas_Object *icon_object = NULL;
+static Evas_Object *o_toolbar = NULL;
+static char        *cmd_buf = NULL;
+static Eina_List   *handlers = NULL;
+static Ecore_Timer *update_timer = NULL;
+
+static Eina_List   *sources = NULL;
+static Eina_List   *cur_sources = NULL;
+static Evry_Plugin *cur_source;
+
+static Evry_Item   *item_selected = NULL;
+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 int ev_last_is_mouse;
+
+
+/* externally accessible functions */
+EAPI int
+evry_init(void)
+{
+   return 1;
+}
+
+EAPI int
+evry_shutdown(void)
+{
+   evry_hide();
+   return 1;
+}
+
+EAPI void
+evry_plugin_add(Evry_Plugin *plugin)
+{
+   sources = eina_list_append(sources, plugin);
+   /* TODO sorting, initialization, etc */
+}
+
+EAPI void
+evry_plugin_remove(Evry_Plugin *plugin)
+{
+   sources = eina_list_remove(sources, plugin);
+   /* cleanup */
+}
+
+EAPI int
+evry_show(E_Zone *zone)
+{
+   Evas_Object *o;
+   int x, y;
+
+   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);
+   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;
+     }
+
+   x = zone->x + (zone->w / 2) - (evry_conf->width / 2);
+   y = zone->y + (zone->h / 2) - (evry_conf->height / 2);
+
+   popup = e_popup_new(zone, x, y, evry_conf->width, evry_conf->height);
+   if (!popup) return 0;
+
+   cmd_buf = malloc(INPUTLEN);
+   if (!cmd_buf)
+     {
+	e_object_del(E_OBJECT(popup));
+	return 0;
+     }
+
+   ecore_x_netwm_window_type_set(popup->evas_win, ECORE_X_WINDOW_TYPE_UTILITY);
+
+   cmd_buf[0] = 0;
+   
+   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");
+   edje_object_part_text_set(o, "e.text.label", cmd_buf);
+
+   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);
+
+   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);
+
+   o = e_widget_toolbar_add(popup->evas, 48 * e_scale, 48 * e_scale);
+   e_widget_toolbar_scrollable_set(o, 0);
+   edje_object_part_swallow(o_main, "e.swallow.bar", o);
+   evas_object_show(o);
+   o_toolbar = o;
+
+   evas_event_thaw(popup->evas);
+
+   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_matches_update();
+
+   ev_last_is_mouse = 0;
+   item_mouseover = NULL;
+   item_selected = NULL;
+   
+   e_popup_show(popup);
+   return 1;
+}
+
+EAPI void
+evry_hide(void)
+{
+   Ecore_Event *ev;
+   char *str;
+   Evry_Plugin *plugin;
+   Eina_List *l;
+
+   if (!popup) return;
+
+   if (update_timer)
+     {
+	ecore_timer_del(update_timer);
+	update_timer = NULL;
+     }
+   if (scroll_timer)
+     {
+	ecore_timer_del(scroll_timer);
+	scroll_timer = NULL;
+     }
+   if (scroll_animator)
+     {
+	ecore_animator_del(scroll_animator);
+	scroll_animator = NULL;
+     }
+   
+   evas_event_freeze(popup->evas);
+   _evry_matches_clear();
+   e_popup_hide(popup);
+
+   e_box_freeze(o_list);
+   EINA_LIST_FOREACH(sources, l, plugin)
+     {
+	plugin->cleanup();
+     }
+   e_box_thaw(o_list);
+
+   evas_object_del(o_list);
+   o_list = NULL;
+
+   evas_object_del(o_toolbar);
+   o_toolbar = NULL;
+
+   evas_object_del(o_main);
+   o_main = NULL;
+
+   evas_event_thaw(popup->evas);
+   e_object_del(E_OBJECT(popup));
+   popup = NULL;
+
+   EINA_LIST_FREE(handlers, ev)
+     ecore_event_handler_del(ev);
+
+   ecore_x_window_free(input_window);
+   e_grabinput_release(input_window, input_window);
+   input_window = 0;
+   free(cmd_buf);
+   cmd_buf = NULL;
+
+   cur_source = NULL;
+   item_selected = NULL;
+   item_mouseover = NULL;
+}
+
+/* local subsystem functions */
+static int
+_evry_cb_key_down(void *data, int type, void *event)
+{
+   Ecore_Event_Key *ev;
+
+   ev_last_is_mouse = 0;
+
+   ev = event;
+   if (ev->event_window != input_window) return 1;
+
+   if      (!strcmp(ev->key, "Up"))
+     _evry_item_prev();
+   else if (!strcmp(ev->key, "Down"))
+     _evry_item_next();
+   else if (!strcmp(ev->key, "Right"))
+     _evry_plugin_next();
+   else if (!strcmp(ev->key, "Left"))
+     _evry_plugin_prev();
+   else if (!strcmp(ev->key, "Return") &&
+	    (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL))
+     _evry_action(0);
+   else if (!strcmp(ev->key, "Return"))
+     _evry_action(1);
+   /* else if (!strcmp(ev->key, "Tab"))
+    *   _evry_complete(); */
+   else if (!strcmp(ev->key, "u") &&
+	    (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL))
+     _evry_clear();
+   else  if (!strcmp(ev->key, "Escape"))
+     evry_hide();
+   else if (!strcmp(ev->key, "BackSpace"))
+     _evry_backspace();
+   else if (!strcmp(ev->key, "Delete"))
+     _evry_backspace();
+   else
+     {
+   	if (ev->compose)
+   	  {
+   	     if ((strlen(cmd_buf) < (INPUTLEN - strlen(ev->compose))))
+   	       {
+   		  strcat(cmd_buf, ev->compose);
+   		  _evry_update();
+   	       }
+   	  }
+     }
+   return 1;
+}
+
+static int
+_evry_cb_mouse_down(void *data, int type, void *event)
+{
+   Ecore_Event_Mouse_Button *ev;
+   
+   ev = event;
+   if (ev->event_window != input_window) return 1;
+
+   if (item_mouseover)
+     {
+	if (item_selected != item_mouseover)
+	  {
+	     if (item_selected) _evry_item_desel(item_selected);
+	     item_selected = item_mouseover;
+	     _evry_item_sel(item_selected); 
+	  }   
+     }
+   else
+     {
+	evas_event_feed_mouse_up(popup->evas, ev->buttons, 0, ev->timestamp, NULL);
+     }
+
+   return 1;
+}
+
+static int
+_evry_cb_mouse_up(void *data, int type, void *event)
+{
+   Ecore_Event_Mouse_Button *ev;
+   
+   ev = event;
+   if (ev->event_window != input_window) return 1;
+
+   if (item_mouseover)
+     {
+	if (ev->buttons == 1) 
+	  _evry_action(1);
+	else if (ev->buttons == 3) 
+	  _evry_action(0);
+     }
+   else
+     {
+	evas_event_feed_mouse_up(popup->evas, ev->buttons, 0, ev->timestamp, NULL);
+     }
+   
+   return 1;
+}
+
+static int 
+_evry_cb_mouse_move(void *data, int type, void *event)
+{
+   Ecore_Event_Mouse_Move *ev;
+
+   ev = event;
+   if (ev->event_window != input_window) return 1;
+
+   if (!ev_last_is_mouse)
+     {
+        ev_last_is_mouse = 1;
+        if (item_mouseover)
+          {
+             if (item_selected && (item_selected != item_mouseover))
+               _evry_item_desel(item_selected);
+             if (!item_selected || (item_selected != item_mouseover))
+               {
+                  item_selected = item_mouseover;
+                  _evry_item_sel(item_selected); 
+               }
+          }
+     }
+
+   evas_event_feed_mouse_move(popup->evas, ev->x - popup->x,
+			      ev->y - popup->y, ev->timestamp, NULL);
+
+   return 1;
+}
+
+static int
+_evry_cb_mouse_wheel(void *data, int type, void *event)
+{
+   Ecore_Event_Mouse_Wheel *ev;
+   
+   ev = event;
+   if (ev->event_window != input_window) return 1;
+
+   ev_last_is_mouse = 0;
+
+   if (ev->z < 0) /* up */
+     {
+	int i;
+	
+	for (i = ev->z; i < 0; i++) _evry_item_prev();
+     }
+   else if (ev->z > 0) /* down */
+     {
+	int i;
+	
+	for (i = ev->z; i > 0; i--) _evry_item_next();
+     }
+   return 1;
+}
+
+static void 
+_evry_cb_item_mouse_in(void *data, Evas *evas, Evas_Object *obj, 
+			   void *event_info)
+{
+   item_mouseover = data;
+   if (!ev_last_is_mouse) return;
+
+   if (item_selected) _evry_item_desel(item_selected);
+   if (!(item_selected = data)) return;
+   _evry_item_sel(item_selected);
+}
+
+static void 
+_evry_cb_item_mouse_out(void *data, Evas *evas, Evas_Object *obj, 
+			void *event_info)
+{
+   item_mouseover = NULL;
+}
+
+
+static void
+_evry_cb_plugin_sel(void *data1, void *data2)
+{
+   if (cur_source == data1) return;
+   
+   _evry_show_candidates(data1);
+}
+
+static void
+_evry_backspace(void)
+{
+   int len, val, pos;
+
+   len = strlen(cmd_buf);
+   if (len > 0)
+     {
+	pos = evas_string_char_prev_get(cmd_buf, len, &val);
+	if ((pos < len) && (pos >= 0))
+	  {
+	     cmd_buf[pos] = 0;
+	     _evry_update();
+	  }
+     }
+}
+
+static void
+_evry_update(void)
+{
+   Efreet_Desktop *desktop;
+   Evas_Object *o;
+
+   edje_object_part_text_set(o_main, "e.text.label", cmd_buf);
+
+   if (icon_object) evas_object_del(icon_object);
+   icon_object = NULL;
+
+   if (update_timer) ecore_timer_del(update_timer);
+   update_timer = ecore_timer_add(MATCH_LAG, _evry_update_timer, NULL);
+}
+
+static void
+_evry_action(int finished)
+{
+   if (cur_source && item_selected)
+     {
+	cur_source->action(item_selected);
+     }
+   else
+     e_exec(popup->zone, NULL, cmd_buf, NULL, "everything");
+
+   if (finished)
+     evry_hide();
+}
+
+static void
+_evry_clear(void)
+{
+   if (cmd_buf[0] != 0)
+     {
+	cmd_buf[0] = 0;
+	_evry_update();
+	if (!update_timer)
+	  update_timer = ecore_timer_add(MATCH_LAG, _evry_update_timer, NULL);
+     }
+}
+
+static void
+_evry_show_candidates(Evry_Plugin *plugin)
+{
+   Evry_Item *it;
+   Eina_List *l;
+   int mw, mh, h;
+   Evas_Object *o;
+   int i = 0;
+
+   _evry_list_clear();
+   cur_source = plugin;
+   
+   e_box_freeze(o_list);
+
+   EINA_LIST_FOREACH(cur_source->candidates, l, it)
+     {
+	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);
+
+	cur_source->icon_get(it, popup->evas);
+	if (edje_object_part_exists(o, "e.swallow.icons") && it->o_icon)
+	  {
+	     edje_object_part_swallow(o, "e.swallow.icons", it->o_icon);
+	     evas_object_show(it->o_icon);
+	  }
+	edje_object_size_min_calc(o, &mw, &mh);
+	e_box_pack_end(o_list, o);
+	e_box_pack_options_set(o,
+			       1, 1, /* fill */
+			       1, 0, /* expand */
+			       0.5, 0.5, /* align */
+			       mw, mh, /* min */
+			       9999, mh /* max */
+			       );
+     }
+   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);
+
+   EINA_LIST_FOREACH(cur_sources, l, plugin)
+     if (plugin == cur_source)
+       break;
+     else i++;
+
+   e_widget_toolbar_item_select(o_toolbar, i);
+   
+   evas_event_thaw(popup->evas);
+}
+
+static void
+_evry_matches_update()
+{
+   Evry_Plugin *plugin;
+   Eina_List *l;
+   char buf[64];
+   int candidates;
+   int plugin_count = 0;
+   
+   _evry_matches_clear();
+
+   eina_list_free(cur_sources);
+   cur_sources = NULL;
+   
+   EINA_LIST_FOREACH(sources, l, plugin)
+     {
+	if (strlen(cmd_buf) == 0)
+	  {
+	     candidates = !plugin->need_query ? plugin->fetch(NULL) : 0;
+	  }
+	else
+	  {
+	     candidates = plugin->fetch(cmd_buf);
+	  }
+	if (candidates)
+	  {
+	     snprintf(buf, 64, "%s (%d)", plugin->name,
+		      eina_list_count(plugin->candidates));
+
+	     e_widget_toolbar_item_append(o_toolbar, NULL, buf,
+					  _evry_cb_plugin_sel, plugin, NULL);
+
+	     cur_sources = eina_list_append(cur_sources, plugin);
+	     plugin_count++;
+	  }
+     }
+
+   if ((!cur_source || !eina_list_data_find(cur_sources, cur_source)) &&
+       (plugin_count > 0))
+     {
+	_evry_show_candidates(cur_sources->data);
+     }
+
+   else if (cur_source)
+     {
+	_evry_show_candidates(cur_source);
+     }
+}
+
+static void
+_evry_item_remove(Evry_Item *it)
+{
+   evas_object_del(it->o_bg);
+   if (it->o_icon) evas_object_del(it->o_icon);
+   it->o_icon = NULL;
+}
+
+static void
+_evry_matches_clear(void)
+{
+   Evry_Plugin *plugin;
+   Eina_List *l;
+
+   // FIXME add toolbar item remove method or use sth different
+   evas_object_del(o_toolbar);
+   Evas_Object *o = e_widget_toolbar_add(popup->evas,
+					 48 * e_scale,
+					 48 * e_scale);
+   e_widget_toolbar_scrollable_set(o, 0);
+   edje_object_part_swallow(o_main, "e.swallow.bar", o);
+   evas_object_show(o);
+   o_toolbar = o;
+
+   _evry_list_clear();
+
+   EINA_LIST_FOREACH(sources, l, plugin)
+     plugin->cleanup();
+}
+
+static void
+_evry_list_clear(void)
+{
+   Evry_Item *it;
+   Eina_List *l;
+
+   if (cur_source)
+     {
+	evas_event_freeze(popup->evas);
+	e_box_freeze(o_list);
+	EINA_LIST_FOREACH(cur_source->candidates, l, it)
+	  _evry_item_remove(it);
+	e_box_thaw(o_list);
+	evas_event_thaw(popup->evas);
+     }
+
+   item_selected = NULL;
+}
+
+static void
+_evry_scroll_to(int i)
+{
+   int n, h, mh;
+
+   n = eina_list_count(cur_source->candidates);
+
+   e_box_min_size_get(o_list, NULL, &mh);
+   evas_object_geometry_get(o_list, NULL, NULL, NULL, &h);
+
+   if (mh <= h) return;
+
+   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);
+	  }
+     }
+   else
+     e_box_align_set(o_list, 0.5, 1.0);
+}
+
+static void
+_evry_item_desel(Evry_Item *it)
+{
+   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");
+}
+
+static void
+_evry_item_sel(Evry_Item *it)
+{
+   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");
+}
+
+static int
+_evry_update_timer(void *data)
+{
+   _evry_matches_update();
+   update_timer = NULL;
+   return 0;
+}
+
+static void
+_evry_item_next(void)
+{
+   Eina_List *l;
+   int i;
+   
+   if (item_selected)
+     {
+	for (i = 0, l = cur_source->candidates; l; l = l->next, i++)
+	  {
+	     if (l->data == item_selected)
+	       {
+		  if (l->next)
+		    {
+		       _evry_item_desel(item_selected);
+		       item_selected = l->next->data;
+		       _evry_item_sel(item_selected);
+		       _evry_scroll_to(i + 1);
+		    }
+		  break;
+	       }
+	  }
+     }
+   else if (cur_source->candidates)
+     {
+	item_selected = cur_source->candidates->data;
+	_evry_item_sel(item_selected);
+	_evry_scroll_to(0);
+     }
+
+   /* if (item_selected)
+    *   edje_object_part_text_set(o_main, "e.text.label", item_selected->label); */
+}
+
+static void
+_evry_item_prev(void)
+{
+   Eina_List *l;
+   int i;
+   
+   if (item_selected)
+     {
+	_evry_item_desel(item_selected);
+
+	for (i = 0, l = cur_source->candidates; l; l = l->next, i++)
+	  {
+	     if (l->data == item_selected)
+	       {
+		  if (l->prev)
+		    {
+		       item_selected = l->prev->data;
+		       _evry_item_sel(item_selected);
+		       _evry_scroll_to(i - 1);
+		    }
+		  else
+		    item_selected = NULL;
+		  break;
+	       }
+	  }
+     }
+   /* if (item_selected)
+    *   edje_object_part_text_set(o_main, "e.text.label", item_selected->label);
+    * else
+    *   edje_object_part_text_set(o_main, "e.text.label", cmd_buf); */
+}
+
+static void
+_evry_plugin_next(void)
+{
+   Eina_List *l;
+   Evry_Plugin *plugin;
+
+   if (!cur_source) return;
+
+   l = eina_list_data_find_list(cur_sources, cur_source);
+
+   if (l && l->next)
+     {
+	_evry_show_candidates(l->next->data);
+     }
+   else if (cur_source != cur_sources->data)
+     {
+	_evry_show_candidates(cur_sources->data);
+     }
+}
+
+
+static void
+_evry_plugin_prev(void)
+{
+   Eina_List *l;
+   Evry_Plugin *plugin;
+
+   if (!cur_source) return;
+
+   l = eina_list_data_find_list(cur_sources, cur_source);
+
+   if (l && l->prev)
+     {
+	_evry_show_candidates(l->prev->data);
+     }
+   else
+     {	
+	l = eina_list_last(cur_sources);
+	
+	if (cur_source != l->data)
+	  {
+	     _evry_show_candidates(l->data);
+	  }
+     }
+}
+
+static int
+_evry_scroll_timer(void *data)
+{
+   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;
+}
+
+static int
+_evry_animator(void *data)
+{
+   double da;
+   int scroll_to = 1;
+   
+   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;
+}
+
diff --git a/src/modules/everything/evry.h b/src/modules/everything/evry.h
new file mode 100644
index 0000000..fe0a957
--- /dev/null
+++ b/src/modules/everything/evry.h
@@ -0,0 +1,121 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifdef E_TYPEDEFS
+
+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;
+
+/* typedef enum _Evry_Plugin_Type
+ *   {
+ *     EVRY_SYNC,
+ *     EVRY_ASYNC,
+ *   } Evry_Plugin_Type; */
+
+/* typedef enum _Evry_Plugin_State
+ * {
+ *   EVRY_STATE_NO_CANDIDATES,
+ *   EVRY_STATE_PENDING,
+ *   EVRY_STATE_FINISHED,
+ * } Evry_Plugin_State; */
+
+#else
+#ifndef EVRY_H
+#define EVRY_H
+
+struct _Evry_Item
+{
+  const char *label;
+  Evas_Object *o_icon;
+  unsigned int type;  /* TODO */
+
+  /* used by 'everything' for display */
+  Evas_Object *o_bg;  
+  
+  /* 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;
+  int priority;
+};
+
+struct _Evry_Plugin
+{
+  const char *name;
+  const char *type;
+  Evas_Object *o_icon;
+  
+  /* sync/async ?*/
+  unsigned int async_query;
+
+  /* whether candidates can be shown without input: e.g. borders, history */
+  /* if 0 fetch MUST provide all candidates when string is NULL */
+  // TODO better use 'need_query_length' ?
+  unsigned int need_query; 
+
+  /* run when 'everything' is shown */
+  void (*begin) (void);
+
+  /* get candidates matching string, fills 'candidates' list */
+  int  (*fetch)  (char *string);
+
+  /* run action with a given candidate - TODO register actions per
+     candidate type */
+  int  (*action) (Evry_Item *item);
+
+  /* run before new query and when hiding 'everything' */
+  void (*cleanup) (void);
+
+  void (*icon_get) (Evry_Item *it, Evas *e);  
+  /* provide more information for a candidate */
+  /* int (*candidate_info) (Evas *evas, Evry_Item *item); */
+
+  Evas_Object *(*config_page) (void);
+  void (*config_apply) (void);
+  
+  /* Evry_Plugin_State state; */
+  Eina_List *candidates;
+};
+
+struct _Evry_Action
+{
+  const char *name;
+  const char *type;
+  int  (*func) (Evry_Item *item);
+};
+  
+
+struct _Evry_Config
+{
+  Eina_List *plugin_order;
+  
+};
+
+
+struct _Evry_App
+{
+  const char *file;
+  Efreet_Desktop *desktop;
+};
+
+
+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_add(Evry_Plugin *plugin);
+EAPI void evry_plugin_remove(Evry_Plugin *plugin);
+EAPI void evry_action_add(Evry_Action *action);
+EAPI void evry_action_remove(Evry_Action *action);
+
+/* EAPI void evry_plugin_async_update(Evry_Plugin *plugin, int state); */
+
+EAPI Evas* evry_evas_get(void);
+#endif
+#endif
+
diff --git a/src/modules/everything/evry_plug_apps.c b/src/modules/everything/evry_plug_apps.c
new file mode 100644
index 0000000..474031e
--- /dev/null
+++ b/src/modules/everything/evry_plug_apps.c
@@ -0,0 +1,211 @@
+#include "e.h"
+#include "e_mod_main.h"
+
+static Eina_Hash *added = NULL;
+static Evry_Plugin plugin;
+
+static int  _evry_plug_apps_fetch(char *string);
+static int  _evry_plug_apps_action(Evry_Item *item);
+static void _evry_plug_apps_cleanup(void);
+static void _evry_plug_apps_item_add(Efreet_Desktop *desktop, char *file, int prio);
+static int  _evry_plug_apps_cb_sort(const void *data1, const void *data2);
+static void _evry_plug_apps_item_icon_get(Evry_Item *it, Evas *e);
+
+
+EAPI int
+evry_plug_apps_init(void)
+{
+   plugin.name = "Applications";
+   plugin.type = "APPLICATION";
+   plugin.need_query = 0;
+   plugin.fetch  = &_evry_plug_apps_fetch;
+   plugin.action = &_evry_plug_apps_action;
+   plugin.cleanup = &_evry_plug_apps_cleanup;
+   plugin.icon_get = &_evry_plug_apps_item_icon_get;
+   plugin.candidates = NULL;   
+
+   evry_plugin_add(&plugin);
+   
+   return 1;
+}
+
+EAPI int
+evry_plug_apps_shutdown(void)
+{
+   evry_plugin_remove(&plugin);
+   
+   return 1;
+}
+
+static int
+_evry_plug_apps_action(Evry_Item *item)
+{
+   E_Zone *zone;
+   Evry_App *app;
+
+   app = item->data;
+   zone = e_util_zone_current_get(e_manager_current_get());
+
+   if (app->desktop)
+     e_exec(zone, app->desktop, NULL, NULL, "everything");
+   else
+     e_exec(zone, NULL, app->file, NULL, "everything");
+
+   return 1;
+}
+
+static void
+_evry_plug_apps_cleanup(void)
+{
+   Evry_Item *it;
+   Evry_App *app;
+   
+   EINA_LIST_FREE(plugin.candidates, it)
+     {
+	if (it->label) eina_stringshare_del(it->label);
+	if (it->o_icon) evas_object_del(it->o_icon);
+	app = it->data;
+	free(app);
+	free(it);
+     }
+}
+
+static int
+_evry_plug_apps_fetch(char *string)
+{
+   char buf[4096];
+   Eina_List *list;
+   Efreet_Desktop *desktop;
+   char *file;
+   
+   _evry_plug_apps_cleanup(); 
+
+   if (string)
+     {
+	snprintf(buf, sizeof(buf), "%s*", string);
+	list = efreet_util_desktop_exec_glob_list(buf);
+	EINA_LIST_FREE(list, desktop)
+	  _evry_plug_apps_item_add(desktop, NULL, 1);
+   
+	snprintf(buf, sizeof(buf), "*%s*", string);
+	list = efreet_util_desktop_name_glob_list(buf);
+	EINA_LIST_FREE(list, desktop)
+	  _evry_plug_apps_item_add(desktop, NULL, 2); 
+
+	// TODO make these optional/configurable
+	snprintf(buf, sizeof(buf), "*%s*", string);
+	list = efreet_util_desktop_generic_name_glob_list(buf);
+	EINA_LIST_FREE(list, desktop)
+	  _evry_plug_apps_item_add(desktop, NULL, 3); 
+
+	snprintf(buf, sizeof(buf), "*%s*", string);
+	list = efreet_util_desktop_comment_glob_list(buf);
+	EINA_LIST_FREE(list, desktop)
+	  _evry_plug_apps_item_add(desktop, NULL, 3);
+     }
+   else
+     {
+	// TODO option for popular/recent
+	list = e_exehist_list_get();
+	EINA_LIST_FREE(list, file)
+	  _evry_plug_apps_item_add(NULL, file, 1);
+     }
+   
+   if (added)
+     {
+	eina_hash_free(added);
+	added = NULL;
+
+	if (string)
+	  plugin.candidates =
+	    eina_list_sort(plugin.candidates,
+			   eina_list_count(plugin.candidates),
+			   _evry_plug_apps_cb_sort);
+	return 1;
+     }
+    
+   return 0;
+}
+
+static void
+_evry_plug_apps_item_add(Efreet_Desktop *desktop, char *file, int prio)
+{
+   Evry_Item *it;
+   Evry_App *app;
+
+   if (desktop)
+     file = ecore_file_app_exe_get(desktop->exec);
+
+   if (!file) return;
+   
+   if (eina_hash_find(added, file))
+     {
+	if (desktop) free(file);
+	return;
+     }
+   
+   if (!added)
+     added = eina_hash_string_superfast_new(NULL);
+
+   eina_hash_add(added, file, file);
+
+   if (desktop)
+     {
+	free(file);
+	file = NULL;
+     }
+   else 
+     {
+	desktop = efreet_util_desktop_exec_find(file);
+	if (desktop) file = NULL;
+     }
+   
+   it = calloc(1, sizeof(Evry_Item));
+   app = calloc(1, sizeof(Evry_App));
+   app->desktop = desktop;
+   app->file = file;
+   it->data = app;
+   it->priority = prio;
+   if (desktop)
+     it->label = eina_stringshare_add(desktop->name);
+   else
+     it->label = eina_stringshare_add(file);
+   it->o_icon = NULL;
+
+   plugin.candidates = eina_list_append(plugin.candidates, it);
+}
+
+static void
+_evry_plug_apps_item_icon_get(Evry_Item *it, Evas *e)
+{
+   Evry_App *app = it->data;
+   
+   if (app->desktop)
+     it->o_icon = e_util_desktop_icon_add(app->desktop, 24, e);
+}
+
+static int
+_evry_plug_apps_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;
+   app2 = it2->data;
+   e1 = efreet_util_path_to_file_id(app1->desktop->orig_path);
+   e2 = efreet_util_path_to_file_id(app2->desktop->orig_path);
+   t1 = e_exehist_newest_run_get(e1);
+   t2 = e_exehist_newest_run_get(e2);
+
+   if ((int)(t1 - t2))
+     return (int)(t1 - t2);
+   else if (it1->priority - it2->priority)
+     return (it1->priority - it2->priority);
+   // TODO compare exe strings?
+   else return 0;
+   
+}
diff --git a/src/modules/everything/evry_plug_border.c b/src/modules/everything/evry_plug_border.c
new file mode 100644
index 0000000..0123fb3
--- /dev/null
+++ b/src/modules/everything/evry_plug_border.c
@@ -0,0 +1,168 @@
+#include "e.h"
+#include "e_mod_main.h"
+
+static Evry_Plugin plugin;
+static Evry_Action act_close;
+
+static int  _evry_plug_border_fetch(char *string);
+static int  _evry_plug_border_action(Evry_Item *item);
+static void _evry_plug_border_cleanup(void);
+static void _evry_plug_border_item_add(E_Border *bd, int prio);
+static int  _evry_plug_border_cb_sort(const void *data1, const void *data2);
+static void _evry_plug_border_item_icon_get(Evry_Item *it, Evas *e);
+
+EAPI int
+evry_plug_border_init(void)
+{
+   plugin.name = "Windows";
+   plugin.type = "BORDER";
+   plugin.need_query = 0;
+   plugin.fetch  = &_evry_plug_border_fetch;
+   plugin.action = &_evry_plug_border_action;
+   plugin.cleanup = &_evry_plug_border_cleanup;
+   plugin.icon_get = &_evry_plug_border_item_icon_get;
+   plugin.candidates = NULL;   
+   evry_plugin_add(&plugin);
+
+   /* act_close.name = "Close";
+    * act_close.type = "BORDER";
+    * evry_action_add(&act_close); */
+   
+   return 1;
+}
+
+EAPI int
+evry_plug_border_shutdown(void)
+{
+   evry_plugin_remove(&plugin);
+   /* evry_action_remove(&act_close); */
+   
+   return 1;
+}
+
+static int
+_evry_plug_border_action(Evry_Item *item)
+{
+   E_Border *bd;
+   E_Zone *zone;
+   
+   bd = (E_Border *)item->data;
+   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 1;
+}
+
+static void
+_evry_plug_border_cleanup(void)
+{
+   Evry_Item *it;
+
+   EINA_LIST_FREE(plugin.candidates, it)
+     {
+	if (it->data) e_object_unref(E_OBJECT(it->data));
+	if (it->label) eina_stringshare_del(it->label);
+	if (it->o_icon) evas_object_del(it->o_icon);
+	free(it);
+     }
+}
+
+static int
+_evry_plug_border_fetch(char *string)
+{
+   E_Manager *man;
+   E_Zone *zone;
+   
+   char match1[4096];
+   char match2[4096];
+   Eina_List *list;
+   E_Border *bd;
+   E_Border_List *bl;
+
+   _evry_plug_border_cleanup(); 
+
+   man = e_manager_current_get();
+   zone = e_util_zone_current_get(man);
+   
+   if (string)
+     {
+	snprintf(match1, sizeof(match1), "%s*", string);
+	snprintf(match2, sizeof(match2), "*%s*", string);
+     }
+   
+   bl = e_container_border_list_first(e_container_current_get(man));
+   while ((bd = e_container_border_list_next(bl)))
+     {
+	if (zone == bd->zone)
+	  {
+	     if (!string)
+	       _evry_plug_border_item_add(bd, 1);
+	     else if (bd->client.icccm.name && e_util_glob_case_match(bd->client.icccm.name, match1))
+	       _evry_plug_border_item_add(bd, 1);
+	     else  if (e_util_glob_case_match(e_border_name_get(bd), match1))
+	       _evry_plug_border_item_add(bd, 1);
+	     else if (bd->client.icccm.name && e_util_glob_case_match(bd->client.icccm.name, match2))
+	       _evry_plug_border_item_add(bd, 2);
+	     else if (e_util_glob_case_match(e_border_name_get(bd), match2))
+	       _evry_plug_border_item_add(bd, 2);
+	  }
+     }
+   e_container_border_list_free(bl);
+
+   if (eina_list_count(plugin.candidates) > 0)
+     {
+	plugin.candidates = eina_list_sort(plugin.candidates,
+					   eina_list_count(plugin.candidates),
+					   _evry_plug_border_cb_sort);
+	return 1;
+     }
+
+   return 0;
+}
+
+static void
+_evry_plug_border_item_icon_get( Evry_Item *it, Evas *e)
+{ 
+   it->o_icon = e_border_icon_add(((E_Border *)it->data), e); 
+}
+
+static void
+_evry_plug_border_item_add(E_Border *bd, int prio)
+{
+   Evry_Item *it;   
+
+   it = calloc(1, sizeof(Evry_Item));
+   e_object_ref(E_OBJECT(bd));
+   it->data = bd;
+   it->priority = prio;
+   it->label = eina_stringshare_add(e_border_name_get(bd));
+   it->o_icon = NULL; //e_border_icon_add(bd, evry_evas_get()); 
+	     
+   plugin.candidates = eina_list_append(plugin.candidates, it);
+}
+
+
+// TODO sort by focus history and name?
+static int
+_evry_plug_border_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_config.c b/src/modules/everything/evry_plug_config.c
new file mode 100644
index 0000000..2cd1194
--- /dev/null
+++ b/src/modules/everything/evry_plug_config.c
@@ -0,0 +1,180 @@
+#include "e.h"
+#include "e_mod_main.h"
+
+static Evry_Plugin plugin;
+
+static int  _evry_plug_config_fetch(char *string);
+static int  _evry_plug_config_action(Evry_Item *item);
+static void _evry_plug_config_cleanup(void);
+static void _evry_plug_config_item_add(E_Configure_It *eci, int prio);
+static int  _evry_plug_config_cb_sort(const void *data1, const void *data2);
+static void _evry_plug_config_item_icon_get(Evry_Item *it, Evas *e);
+
+EAPI int
+evry_plug_config_init(void)
+{
+   plugin.name = "Settings";
+   plugin.fetch  = &_evry_plug_config_fetch;
+   plugin.action = &_evry_plug_config_action;
+   plugin.cleanup = &_evry_plug_config_cleanup;
+   plugin.icon_get = &_evry_plug_config_item_icon_get;
+   plugin.candidates = NULL;   
+   evry_plugin_add(&plugin);
+   
+   return 1;
+}
+
+EAPI int
+evry_plug_config_shutdown(void)
+{
+   evry_plugin_remove(&plugin);
+   
+   return 1;
+}
+
+static int
+_evry_plug_config_action(Evry_Item *item)
+{
+   E_Configure_It *eci, *eci2;
+   E_Container *con;
+   E_Configure_Cat *ecat;
+   Eina_List *l, *ll;
+   char buf[1024];
+   int found = 0;
+   
+   eci = item->data;
+   con = e_container_current_get(e_manager_current_get());
+
+   for (l = e_configure_registry; l; l = l->next)
+     {
+	ecat = l->data;
+	for (ll = ecat->items; ll; 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 1;
+}
+
+static void
+_evry_plug_config_cleanup(void)
+{
+   Evry_Item *it;
+
+   EINA_LIST_FREE(plugin.candidates, it)
+     {
+	/* if (it->data)  */
+	if (it->label) eina_stringshare_del(it->label);
+	if (it->o_icon) evas_object_del(it->o_icon);
+	free(it);
+     }
+}
+
+static int
+_evry_plug_config_fetch(char *string)
+{
+   E_Manager *man;
+   E_Zone *zone;
+   
+   char match1[4096];
+   char match2[4096];
+   Eina_List *l, *ll;
+   E_Configure_Cat *ecat;
+   E_Configure_It *eci;
+   
+   _evry_plug_config_cleanup(); 
+
+   snprintf(match1, sizeof(match1), "%s*", string);
+   snprintf(match2, sizeof(match2), "*%s*", string);
+
+   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))
+			 _evry_plug_config_item_add(eci, 1);
+		       else if (e_util_glob_case_match(eci->label, match2))
+			 _evry_plug_config_item_add(eci, 2);
+		       else if (e_util_glob_case_match(ecat->label, match1))
+			 _evry_plug_config_item_add(eci, 3);
+		       else if (e_util_glob_case_match(ecat->label, match2))
+			 _evry_plug_config_item_add(eci, 4);
+		    }
+	       }
+	  }
+     }
+   
+   if (eina_list_count(plugin.candidates) > 0)
+     {
+	plugin.candidates =
+	  eina_list_sort(plugin.candidates,
+			 eina_list_count(plugin.candidates),
+			 _evry_plug_config_cb_sort);
+	return 1;
+     }
+
+   return 0;
+}
+
+static void
+_evry_plug_config_item_icon_get(Evry_Item *it, Evas *e)
+{
+   E_Configure_It *eci = it->data;
+   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
+_evry_plug_config_item_add(E_Configure_It *eci, int prio)
+{
+   Evry_Item *it;   
+
+   it = calloc(1, sizeof(Evry_Item));
+   it->data = eci;
+   it->priority = prio;
+   it->label = eina_stringshare_add(eci->label);
+   it->o_icon = NULL; 
+	     
+   plugin.candidates = eina_list_append(plugin.candidates, it);
+}
+
+
+// TODO sort name?
+static int
+_evry_plug_config_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/module.desktop b/src/modules/everything/module.desktop
new file mode 100644
index 0000000..5de7205
--- /dev/null
+++ b/src/modules/everything/module.desktop
@@ -0,0 +1,30 @@
+[Desktop Entry]
+Type=Link
+Name=Run Everything
+Name[cs]=Dialog Spustit
+Name[de]=
+Name[eo]=Lanĉi komandojn
+Name[es]=Ejecutar comando
+Name[fr]=Tout exécuter
+Name[hu]=Parancs futtatása
+Name[it]=Lancia applicazioni
+Name[ja]=
+Name[pt]=
+Name[pt_BR]=
+Name[zh_CN]=
+Name[zh_TW]=
+Icon=e-module-everything
+Comment=<title>Run Command Module</title><br>The run command module provides an application launcher dialog.
+Comment[cs]=<title>Modul dialogu Spustit</title><br>Poskytuje dialog pro spuštění aplikací.
+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[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 lancia applicazioni</title><br>Questo modulo fornisce una finestra di dialogo per l'esecuzione di applicazioni.
+Comment[ja]=
+Comment[pt]=
+Comment[pt_BR]=
+Comment[zh_CN]=
+Comment[zh_TW]=
+X-Enlightenment-ModuleType=system
diff --git a/src/modules/everything/module.desktop.in b/src/modules/everything/module.desktop.in
new file mode 100644
index 0000000..5de7205
--- /dev/null
+++ b/src/modules/everything/module.desktop.in
@@ -0,0 +1,30 @@
+[Desktop Entry]
+Type=Link
+Name=Run Everything
+Name[cs]=Dialog Spustit
+Name[de]=
+Name[eo]=Lanĉi komandojn
+Name[es]=Ejecutar comando
+Name[fr]=Tout exécuter
+Name[hu]=Parancs futtatása
+Name[it]=Lancia applicazioni
+Name[ja]=
+Name[pt]=
+Name[pt_BR]=
+Name[zh_CN]=
+Name[zh_TW]=
+Icon=e-module-everything
+Comment=<title>Run Command Module</title><br>The run command module provides an application launcher dialog.
+Comment[cs]=<title>Modul dialogu Spustit</title><br>Poskytuje dialog pro spuštění aplikací.
+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[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 lancia applicazioni</title><br>Questo modulo fornisce una finestra di dialogo per l'esecuzione di applicazioni.
+Comment[ja]=
+Comment[pt]=
+Comment[pt_BR]=
+Comment[zh_CN]=
+Comment[zh_TW]=
+X-Enlightenment-ModuleType=system
diff --git a/src/modules/exebuf/Makefile.in b/src/modules/exebuf/Makefile.in
index 8617233..0abb466 100644
--- a/src/modules/exebuf/Makefile.in
+++ b/src/modules/exebuf/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/exebuf/e_exebuf.c b/src/modules/exebuf/e_exebuf.c
index 7d22570..0108e2b 100644
--- a/src/modules/exebuf/e_exebuf.c
+++ b/src/modules/exebuf/e_exebuf.c
@@ -4,7 +4,7 @@
 #include "e.h"
 #include "e_mod_main.h"
 
-/* currently default bind is alt+esc buf alt+space has been suggested */
+/* currently default bind is alt+esc but alt+space has been suggested */
 
 /* local subsystem functions */
 typedef struct _E_Exebuf_Exe E_Exebuf_Exe;
@@ -426,7 +426,7 @@ _e_exebuf_exec(void)
 {
    if (exe_sel)
      {
-	if (exe_sel->desktop)
+	if (exe_sel->desktop && which_list != EXE_LIST)
 	  e_exec(exebuf->zone, exe_sel->desktop, NULL, NULL, "exebuf");
 	else
 	  e_exec(exebuf->zone, NULL, exe_sel->file, NULL, "exebuf");
diff --git a/src/modules/fileman/Makefile.in b/src/modules/fileman/Makefile.in
index 96a57ac..b75fd5c 100644
--- a/src/modules/fileman/Makefile.in
+++ b/src/modules/fileman/Makefile.in
@@ -254,6 +254,7 @@ 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@
@@ -266,6 +267,7 @@ 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@
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 142f114..07c9f2c 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -15,6 +15,7 @@
  */
 
 typedef struct _E_Fwin E_Fwin;
+typedef struct _E_Fwin_Page E_Fwin_Page;
 typedef struct _E_Fwin_Apps_Dialog E_Fwin_Apps_Dialog;
 
 #define E_FWIN_TYPE 0xE0b0101f
@@ -25,30 +26,44 @@ struct _E_Fwin
 
    E_Win               *win;
    E_Zone              *zone;
-   Evas_Object         *scrollframe_obj;
-   Evas_Object         *fm_obj;
+   Evas_Object	       *tb_obj;
    Evas_Object         *bg_obj;
    E_Fwin_Apps_Dialog  *fad;
 
+   Eina_List	       *pages;
+   E_Fwin_Page	       *cur_page;
+   int                  page_index;
+
    Evas_Object         *under_obj;
    Evas_Object         *over_obj;
-   struct {
-      Evas_Coord        x, y, max_x, max_y, w, h;
-   } fm_pan, fm_pan_last;
 
    const char         *wallpaper_file;
    const char         *overlay_file;
    const char         *scrollframe_file;
    const char         *theme_file;
 
-   E_Toolbar          *tbar;
    Ecore_Event_Handler *zone_handler;
    Ecore_Event_Handler *zone_del_handler;
-   Ecore_Event_Handler *fm_op_entry_add_handler;
 
    unsigned char        geom_save_ready : 1;
 };
 
+struct _E_Fwin_Page
+{
+   E_Fwin	       *fwin;
+   Ecore_Event_Handler *fm_op_entry_add_handler;
+
+   Evas_Object         *scrollframe_obj;
+   Evas_Object         *fm_obj;
+   E_Toolbar           *tbar;
+
+   struct {
+      Evas_Coord        x, y, max_x, max_y, w, h;
+   } fm_pan, fm_pan_last;
+
+   int index;
+};
+
 struct _E_Fwin_Apps_Dialog
 {
    E_Dialog    *dia;
@@ -72,12 +87,16 @@ typedef enum
 /* local subsystem prototypes */
 static E_Fwin *_e_fwin_new(E_Container *con, const char *dev, const char *path);
 static void _e_fwin_free(E_Fwin *fwin);
+static E_Fwin_Page *_e_fwin_page_create(E_Fwin *fwin);
+static void _e_fwin_page_free(E_Fwin_Page *page);
+static void _e_fwin_page_new(E_Fwin *fwin);
+static void _e_fwin_cb_page_change(void *data1, void *data2);
 static void _e_fwin_cb_delete(E_Win *win);
 static void _e_fwin_cb_move(E_Win *win);
 static void _e_fwin_cb_resize(E_Win *win);
 static void _e_fwin_deleted(void *data, Evas_Object *obj, void *event_info);
 static const char *_e_fwin_custom_file_path_eval(E_Fwin *fwin, Efreet_Desktop *ef, const char *prev_path, const char *key);
-static void _e_fwin_desktop_run(Efreet_Desktop *desktop, E_Fwin *fwin);
+static void _e_fwin_desktop_run(Efreet_Desktop *desktop, E_Fwin_Page *page, Eina_Bool skip_history);
 static Eina_List *_e_fwin_suggested_apps_list_get(Eina_List *files, Eina_List **mime_list);
 static void _e_fwin_changed(void *data, Evas_Object *obj, void *event_info);
 static void _e_fwin_selected(void *data, Evas_Object *obj, void *event_info);
@@ -97,27 +116,29 @@ static void _e_fwin_cb_close(void *data, E_Dialog *dia);
 static void _e_fwin_cb_dialog_free(void *obj);
 static Eina_Bool _e_fwin_cb_hash_foreach(const Eina_Hash *hash __UNUSED__, const void *key, void *data __UNUSED__, void *fdata);
 static E_Fwin_Exec_Type _e_fwin_file_is_exec(E_Fm2_Icon_Info *ici);
-static void _e_fwin_file_exec(E_Fwin *fwin, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext);
-static void _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always);
+static void _e_fwin_file_exec(E_Fwin_Page *page, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext);
+static void _e_fwin_file_open_dialog(E_Fwin_Page *page, Eina_List *files, int always);
+static void _e_fwin_file_open_dialog_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
 
 static void _e_fwin_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
 static void _e_fwin_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
 static void _e_fwin_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
 static void _e_fwin_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-static void _e_fwin_pan_scroll_update(E_Fwin *fwin);
+static void _e_fwin_pan_scroll_update(E_Fwin_Page *page);
 
 static void _e_fwin_zone_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
 static int  _e_fwin_zone_move_resize(void *data, int type, void *event);
 static int  _e_fwin_zone_del(void *data, int type, void *event);
-static void _e_fwin_config_set(E_Fwin *fwin);
-static void _e_fwin_window_title_set(E_Fwin *fwin);
-static void _e_fwin_toolbar_resize(E_Fwin *fwin);
+static void _e_fwin_config_set(E_Fwin_Page *page);
+static void _e_fwin_window_title_set(E_Fwin_Page *page);
+static void _e_fwin_page_resize(E_Fwin_Page *page);
+static void _e_fwin_toolbar_resize(E_Fwin_Page *page);
 static int _e_fwin_dlg_cb_desk_sort(const void *p1, const void *p2);
 static int _e_fwin_dlg_cb_desk_list_sort(const void *data1, const void *data2);
 
 static void _e_fwin_op_registry_listener_cb(void *data, const E_Fm2_Op_Registry_Entry *ere);
 static int _e_fwin_op_registry_entry_add_cb(void *data, int type, void *event);
-static void _e_fwin_op_registry_entry_iter(E_Fwin *fwin);
+static void _e_fwin_op_registry_entry_iter(E_Fwin_Page *page);
 
 /* local subsystem globals */
 static Eina_List *fwins = NULL;
@@ -159,41 +180,43 @@ e_fwin_new(E_Container *con, const char *dev, const char *path)
 
    if (!fwin) return;
 
-   snprintf(buf, sizeof(buf), "dir::%s", e_fm2_real_path_get(fwin->fm_obj));
+   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 > fwin->win->border->zone->w)
-	  w = fwin->win->border->zone->w;
+	else if (w > zw)
+	  w = zw;
 	if (h < 24)
 	  h = 200 * e_scale;
-	else if (h > fwin->win->border->zone->h)
-	  h = fwin->win->border->zone->h;
+	else if (h > zh)
+	  h = zh;
 
 	/* checking left-top corner */
-	if (x < fwin->win->border->zone->x)
-	  x = fwin->win->border->zone->x + fwin->win->border->client_inset.l;
-	if (y < fwin->win->border->zone->y)
-	  y = fwin->win->border->zone->y + fwin->win->border->client_inset.t;
+	if (x < zx)
+	  x = zx;
+	if (y < zy)
+	  y = zy;
 
 	/* checking right-bottom corner */
-	if ((fwin->win->border->zone->x + fwin->win->border->zone->w) < (x + w))
-	  x = fwin->win->border->zone->x + fwin->win->border->zone->w - w - fwin->win->border->client_inset.l;
-	if ((fwin->win->border->zone->y + fwin->win->border->zone->h) < (y + h))
-	  y = fwin->win->border->zone->y + fwin->win->border->zone->h - h - fwin->win->border->client_inset.t;
-
-	e_win_move_resize(fwin->win,
-			  x - fwin->win->border->client_inset.l,
-			  y - fwin->win->border->client_inset.t,
-			  w, h);
+	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;
@@ -203,12 +226,16 @@ EAPI void
 e_fwin_zone_new(E_Zone *zone, const char *dev, const char *path)
 {
    E_Fwin *fwin;
+   E_Fwin_Page *page;
    Evas_Object *o;
 
    fwin = E_OBJECT_ALLOC(E_Fwin, E_FWIN_TYPE, _e_fwin_free);
    if (!fwin) return;
    fwin->zone = zone;
 
+   page = E_NEW(E_Fwin_Page, 1);
+   page->fwin = fwin;
+
    /* Add Event Handler for zone move/resize & del */
    fwin->zone_handler = 
      ecore_event_handler_add(E_EVENT_ZONE_MOVE_RESIZE, 
@@ -225,21 +252,21 @@ e_fwin_zone_new(E_Zone *zone, const char *dev, const char *path)
    fwins = eina_list_append(fwins, fwin);
 
    o = e_fm2_add(zone->container->bg_evas);
-   fwin->fm_obj = o;
-   _e_fwin_config_set(fwin);
+   page->fm_obj = o;
+   _e_fwin_config_set(page);
 
    e_fm2_custom_theme_content_set(o, "desktop");
 
    evas_object_smart_callback_add(o, "dir_changed",
-				  _e_fwin_changed, fwin);
+				  _e_fwin_changed, page);
    evas_object_smart_callback_add(o, "dir_deleted",
-				  _e_fwin_deleted, fwin);
+				  _e_fwin_deleted, page);
    evas_object_smart_callback_add(o, "selected",
-				  _e_fwin_selected, fwin);
+				  _e_fwin_selected, page);
    evas_object_smart_callback_add(o, "selection_change",
-				  _e_fwin_selection_change, fwin);
-   e_fm2_icon_menu_start_extend_callback_set(o, _e_fwin_cb_menu_extend_start, fwin);
-   e_fm2_icon_menu_end_extend_callback_set(o, _e_fwin_menu_extend, fwin);
+				  _e_fwin_selection_change, page);
+   e_fm2_icon_menu_start_extend_callback_set(o, _e_fwin_cb_menu_extend_start, page);
+   e_fm2_icon_menu_end_extend_callback_set(o, _e_fwin_menu_extend, page);
    e_fm2_underlay_hide(o);
    evas_object_show(o);
 
@@ -263,23 +290,26 @@ e_fwin_zone_new(E_Zone *zone, const char *dev, const char *path)
     * same as currently done for bg & overlay. also add to fm2 the ability
     * to specify the .edj files to get the list and icon theme stuff from
     */
-   evas_object_data_set(fwin->fm_obj, "fwin", fwin);
-   e_scrollframe_extern_pan_set(o, fwin->fm_obj,
+   evas_object_data_set(page->fm_obj, "fm_page", page);
+   e_scrollframe_extern_pan_set(o, page->fm_obj,
 				_e_fwin_pan_set,
 				_e_fwin_pan_get,
 				_e_fwin_pan_max_get,
 				_e_fwin_pan_child_size_get);
-   evas_object_propagate_events_set(fwin->fm_obj, 0);
-   fwin->scrollframe_obj = o;
+   evas_object_propagate_events_set(page->fm_obj, 0);
+   page->scrollframe_obj = o;
    evas_object_move(o, fwin->zone->x, fwin->zone->y);
    evas_object_resize(o, fwin->zone->w, fwin->zone->h);
    evas_object_show(o);
 
-   e_fm2_window_object_set(fwin->fm_obj, E_OBJECT(fwin->zone));
+   e_fm2_window_object_set(page->fm_obj, E_OBJECT(fwin->zone));
+
+   evas_object_focus_set(page->fm_obj, 1);
 
-   evas_object_focus_set(fwin->fm_obj, 1);
+   e_fm2_path_set(page->fm_obj, dev, path);
 
-   e_fm2_path_set(fwin->fm_obj, dev, path);
+   fwin->pages = eina_list_append(fwin->pages, page);
+   fwin->cur_page = fwin->pages->data;
 }
 
 EAPI void
@@ -290,7 +320,7 @@ e_fwin_all_unsel(void *data)
    fwin = data;
    E_OBJECT_CHECK(fwin);
    E_OBJECT_TYPE_CHECK(fwin, E_FWIN_TYPE);
-   e_fm2_all_unsel(fwin->fm_obj);
+   e_fm2_all_unsel(fwin->cur_page->fm_obj);
 }
 
 EAPI void 
@@ -324,9 +354,15 @@ e_fwin_reload_all(void)
 	  e_fwin_zone_shutdown(fwin->zone);
 	else 
 	  {
-	     _e_fwin_config_set(fwin);
-	     e_fm2_refresh(fwin->fm_obj);
-	     _e_fwin_window_title_set(fwin);
+	     Eina_List *l2;
+	     E_Fwin_Page *page;
+
+	     EINA_LIST_FOREACH(fwin->pages, l2, page)
+	       {
+		  _e_fwin_config_set(page);
+		  e_fm2_refresh(page->fm_obj);
+		  _e_fwin_window_title_set(page);
+	       }
 	  }
      }
 
@@ -370,6 +406,7 @@ static E_Fwin *
 _e_fwin_new(E_Container *con, const char *dev, const char *path) 
 {
    E_Fwin *fwin;
+   E_Fwin_Page *page;
    Evas_Object *o;
 
    fwin = E_OBJECT_ALLOC(E_Fwin, E_FWIN_TYPE, _e_fwin_free);
@@ -392,79 +429,28 @@ _e_fwin_new(E_Container *con, const char *dev, const char *path)
    evas_object_show(o);
    fwin->bg_obj = o;
 
-   o = e_fm2_add(e_win_evas_get(fwin->win));
-   fwin->fm_obj = o;
-   _e_fwin_config_set(fwin);
-   e_fm2_view_flags_set(o, E_FM2_VIEW_DIR_CUSTOM);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, _e_fwin_cb_key_down, fwin);
-
-   evas_object_smart_callback_add(o, "dir_changed",
-				  _e_fwin_changed, fwin);
-   evas_object_smart_callback_add(o, "dir_deleted",
-				  _e_fwin_deleted, fwin);
-   evas_object_smart_callback_add(o, "selected",
-				  _e_fwin_selected, fwin);
-   evas_object_smart_callback_add(o, "selection_change",
-				  _e_fwin_selection_change, fwin);
-   e_fm2_icon_menu_start_extend_callback_set(o, _e_fwin_cb_menu_extend_start, fwin);
-   e_fm2_icon_menu_end_extend_callback_set(o, _e_fwin_menu_extend, fwin);
-   evas_object_show(o);
-
-   o = e_scrollframe_add(e_win_evas_get(fwin->win));
-   /* FIXME: this theme object will have more versions and options later
-    * for things like swallowing widgets/buttons ot providing them - a
-    * gadcon for starters for fm widgets. need to register the owning 
-    * e_object of the gadcon so gadcon clients can get it and thus do
-    * things like find out what dirs/path the fwin is for etc. this will
-    * probably be how you add optional gadgets to fwin views like empty/full
-    * meters for disk usage, and other dir info/stats or controls. also it
-    * might be possible that we can have custom frames per dir later so need
-    * a way to set an edje file directly
-    */
-   /* FIXME: allow specialised scrollframe obj per dir - get from e config,
-    * then look in the dir itself for a magic dot-file, if not - use theme.
-    * same as currently done for bg & overlay. also add to fm2 the ability
-    * to specify the .edj files to get the list and icon theme stuff from
-    */
-   e_scrollframe_custom_theme_set(o, "base/theme/fileman",
-				  "e/fileman/default/scrollframe");
-   evas_object_data_set(fwin->fm_obj, "fwin", fwin);
-   e_scrollframe_extern_pan_set(o, fwin->fm_obj,
-				_e_fwin_pan_set,
-				_e_fwin_pan_get,
-				_e_fwin_pan_max_get,
-				_e_fwin_pan_child_size_get);
-   evas_object_propagate_events_set(fwin->fm_obj, 0);
-   fwin->scrollframe_obj = o;
-   evas_object_move(o, 0, 0);
-   evas_object_show(o);
-
-   if (fileman_config->view.show_toolbar) 
-     {
-	fwin->tbar = e_toolbar_new(e_win_evas_get(fwin->win), "toolbar", 
-				   fwin->win, fwin->fm_obj);
-	e_toolbar_show(fwin->tbar);
-     }
+   page = _e_fwin_page_create(fwin);
+   fwin->pages = eina_list_append(fwin->pages, page);
+   fwin->cur_page = page;
 
-   o = edje_object_add(e_win_evas_get(fwin->win));
+   o = e_icon_add(e_win_evas_get(fwin->win));
+   e_icon_scale_size_set(o, 0);
+   e_icon_fill_inside_set(o, 0);
    edje_object_part_swallow(fwin->bg_obj, "e.swallow.bg", o);
    evas_object_pass_events_set(o, 1);
    fwin->under_obj = o;
 
-   o = edje_object_add(e_win_evas_get(fwin->win));
-   edje_object_part_swallow(e_scrollframe_edje_object_get(fwin->scrollframe_obj), "e.swallow.overlay", o);
+   o = e_icon_add(e_win_evas_get(fwin->win));
+   e_icon_scale_size_set(o, 0);
+   e_icon_fill_inside_set(o, 0);
+   edje_object_part_swallow(e_scrollframe_edje_object_get(page->scrollframe_obj), "e.swallow.overlay", o);
    evas_object_pass_events_set(o, 1);
    fwin->over_obj = o;
 
-   e_fm2_window_object_set(fwin->fm_obj, E_OBJECT(fwin->win));
-
-   evas_object_focus_set(fwin->fm_obj, 1);
-
-   e_fm2_path_set(fwin->fm_obj, dev, path);
-
    e_win_name_class_set(fwin->win, "E", "e_fwin");
 
-   _e_fwin_window_title_set(fwin);
+   e_fm2_path_set(page->fm_obj, dev, path);
+   _e_fwin_window_title_set(page);
 
    e_win_size_min_set(fwin->win, 24, 24);
    e_win_resize(fwin->win, 280 * e_scale, 200 * e_scale);
@@ -479,22 +465,20 @@ _e_fwin_new(E_Container *con, const char *dev, const char *path)
 	  eina_stringshare_add("system-file-manager");
      }
 
-   fwin->fm_op_entry_add_handler =
-      ecore_event_handler_add(E_EVENT_FM_OP_REGISTRY_ADD,
-			       _e_fwin_op_registry_entry_add_cb, fwin);
-   _e_fwin_op_registry_entry_iter(fwin);
-
    return fwin;
 }
 
 static void
 _e_fwin_free(E_Fwin *fwin)
 {
+   E_Fwin_Page *page;
+
+
    if (!fwin) return; //safety
 
-   if (fwin->fm_obj) evas_object_del(fwin->fm_obj);
-   if (fwin->tbar) e_object_del(E_OBJECT(fwin->tbar));
-   if (fwin->scrollframe_obj) evas_object_del(fwin->scrollframe_obj);
+   EINA_LIST_FREE(fwin->pages, page)
+      _e_fwin_page_free(page);
+
    if (fwin->zone)  
      {
 	evas_object_event_callback_del(fwin->zone->bg_event_object, 
@@ -502,14 +486,12 @@ _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) 
      ecore_event_handler_del(fwin->zone_del_handler);
 
-   if (fwin->fm_op_entry_add_handler) 
-     ecore_event_handler_del(fwin->fm_op_entry_add_handler);
-
    fwins = eina_list_remove(fwins, fwin);
    if (fwin->wallpaper_file) eina_stringshare_del(fwin->wallpaper_file);
    if (fwin->overlay_file) eina_stringshare_del(fwin->overlay_file);
@@ -524,6 +506,156 @@ _e_fwin_free(E_Fwin *fwin)
    free(fwin);
 }
 
+static E_Fwin_Page *
+_e_fwin_page_create(E_Fwin *fwin)
+{
+   Evas_Object *o;
+   E_Fwin_Page *page;
+
+   page = E_NEW(E_Fwin_Page, 1);
+   page->fwin = fwin;
+
+   o = e_fm2_add(e_win_evas_get(fwin->win));
+   page->fm_obj = o;
+   e_fm2_view_flags_set(o, E_FM2_VIEW_DIR_CUSTOM);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, _e_fwin_cb_key_down, page);
+   
+   evas_object_smart_callback_add(o, "dir_changed",
+				  _e_fwin_changed, page);
+   evas_object_smart_callback_add(o, "dir_deleted",
+				  _e_fwin_deleted, page);
+   evas_object_smart_callback_add(o, "selected",
+				  _e_fwin_selected, page);
+   evas_object_smart_callback_add(o, "selection_change",
+				  _e_fwin_selection_change, page);
+   e_fm2_icon_menu_start_extend_callback_set(o, _e_fwin_cb_menu_extend_start, page);
+   e_fm2_icon_menu_end_extend_callback_set(o, _e_fwin_menu_extend, page);
+   e_fm2_window_object_set(o, E_OBJECT(fwin->win));
+   evas_object_focus_set(o, 1);
+   
+   evas_object_show(o);
+   
+   o = e_scrollframe_add(e_win_evas_get(fwin->win));
+   /* FIXME: this theme object will have more versions and options later
+    * for things like swallowing widgets/buttons ot providing them - a
+    * gadcon for starters for fm widgets. need to register the owning 
+    * e_object of the gadcon so gadcon clients can get it and thus do
+    * things like find out what dirs/path the fwin is for etc. this will
+    * probably be how you add optional gadgets to fwin views like empty/full
+    * meters for disk usage, and other dir info/stats or controls. also it
+    * might be possible that we can have custom frames per dir later so need
+    * a way to set an edje file directly
+    */
+   /* FIXME: allow specialised scrollframe obj per dir - get from e config,
+    * then look in the dir itself for a magic dot-file, if not - use theme.
+    * same as currently done for bg & overlay. also add to fm2 the ability
+    * to specify the .edj files to get the list and icon theme stuff from
+    */
+   e_scrollframe_custom_theme_set(o, "base/theme/fileman",
+				  "e/fileman/default/scrollframe");
+   evas_object_data_set(page->fm_obj, "fm_page", page);
+   e_scrollframe_extern_pan_set(o, page->fm_obj,
+				_e_fwin_pan_set,
+				_e_fwin_pan_get,
+				_e_fwin_pan_max_get,
+				_e_fwin_pan_child_size_get);
+   evas_object_propagate_events_set(page->fm_obj, 0);
+   page->scrollframe_obj = o;
+   evas_object_move(o, 0, 0);
+   evas_object_show(o);
+
+   if (fileman_config->view.show_toolbar) 
+     {
+	page->tbar = e_toolbar_new(e_win_evas_get(fwin->win), "toolbar", 
+				   fwin->win, page->fm_obj);
+	e_toolbar_show(page->tbar);
+     }
+
+   page->index = eina_list_count(fwin->pages);
+
+   _e_fwin_config_set(page);
+
+   page->fm_op_entry_add_handler =
+      ecore_event_handler_add(E_EVENT_FM_OP_REGISTRY_ADD,
+			       _e_fwin_op_registry_entry_add_cb, page);
+   _e_fwin_op_registry_entry_iter(page);
+   return page;
+}
+
+static void
+_e_fwin_page_free(E_Fwin_Page *page)
+{
+   if (page->fm_obj) evas_object_del(page->fm_obj);
+   if (page->tbar) e_object_del(E_OBJECT(page->tbar));
+   if (page->scrollframe_obj) evas_object_del(page->scrollframe_obj);
+
+   if (page->fm_op_entry_add_handler) 
+     ecore_event_handler_del(page->fm_op_entry_add_handler);
+
+   E_FREE(page);
+}
+
+static void
+_e_fwin_page_new(E_Fwin *fwin)
+{
+   E_Fwin_Page *page;
+   const char *real;
+   const char *dev, *path;
+
+   if (!fwin->tb_obj)
+     {
+        page = fwin->pages->data;
+
+	/* There is no toolbar yet */
+	fwin->tb_obj = e_widget_toolbar_add(evas_object_evas_get(page->fm_obj),
+	      48 * e_scale, 48 * e_scale);
+
+	e_widget_toolbar_focus_steal_set(fwin->tb_obj, 0);
+	real = ecore_file_file_get(e_fm2_real_path_get(page->fm_obj));
+	e_widget_toolbar_item_append(fwin->tb_obj, NULL, real,
+	      _e_fwin_cb_page_change, fwin, page);
+
+	evas_object_move(fwin->tb_obj, 0, 0);
+	evas_object_show(fwin->tb_obj);
+     }
+
+   page = _e_fwin_page_create(fwin);
+   fwin->pages = eina_list_append(fwin->pages, page);
+   real = ecore_file_file_get(e_fm2_real_path_get(fwin->cur_page->fm_obj));
+   e_widget_toolbar_item_append(fwin->tb_obj, NULL, real,
+	 _e_fwin_cb_page_change, fwin, page);
+   e_fm2_path_get(fwin->cur_page->fm_obj, &dev, &path);
+   e_fm2_path_set(page->fm_obj, dev, path);
+
+   e_widget_toolbar_item_select(fwin->tb_obj, page->index);
+   _e_fwin_cb_resize(fwin->win);
+}
+
+static void
+_e_fwin_cb_page_change(void *data1, void *data2)
+{
+   E_Fwin *fwin = data1;
+   E_Fwin_Page *page = data2, *prev;
+
+   if (!fwin || !page) return;
+   prev = eina_list_nth(fwin->pages, fwin->page_index);
+   fwin->page_index = page->index;
+
+   if (prev)
+     {
+        evas_object_hide(prev->scrollframe_obj);
+	if (prev->tbar)
+	  e_toolbar_hide(prev->tbar);
+     }
+
+   evas_object_show(page->scrollframe_obj);
+   if (page->tbar)
+     e_toolbar_show(page->tbar);
+
+   fwin->cur_page = page;
+   evas_object_focus_set(page->fm_obj, 1);
+}
+
 static const char *
 _e_fwin_custom_file_path_eval(E_Fwin *fwin, Efreet_Desktop *ef, const char *prev_path, const char *key)
 {
@@ -543,7 +675,7 @@ _e_fwin_custom_file_path_eval(E_Fwin *fwin, Efreet_Desktop *ef, const char *prev
    /* relative path to the dir */
    else
      {
-	snprintf(buf, sizeof(buf), "%s/%s", e_fm2_real_path_get(fwin->fm_obj), res);
+	snprintf(buf, sizeof(buf), "%s/%s", e_fm2_real_path_get(fwin->cur_page->fm_obj), res);
 	ret = eina_stringshare_add(buf);
      }
    return ret;
@@ -600,18 +732,19 @@ _e_fwin_suggested_apps_list_get(Eina_List *files, Eina_List **mime_list)
 
 
 static void
-_e_fwin_desktop_run(Efreet_Desktop *desktop, E_Fwin *fwin)
+_e_fwin_desktop_run(Efreet_Desktop *desktop, E_Fwin_Page *page, Eina_Bool skip_history)
 {
    char pcwd[4096], buf[4096];
    Eina_List *selected, *l, *files = NULL;
+   E_Fwin *fwin = page->fwin;
    E_Fm2_Icon_Info *ici;
    char *file;
 
-   selected = e_fm2_selected_list_get(fwin->fm_obj);
+   selected = e_fm2_selected_list_get(page->fm_obj);
    if (!selected) return;
 
    getcwd(pcwd, sizeof(pcwd));
-   chdir(e_fm2_real_path_get(fwin->fm_obj));
+   chdir(e_fm2_real_path_get(page->fm_obj));
 
    EINA_LIST_FOREACH(selected, l, ici)
      {
@@ -629,10 +762,10 @@ _e_fwin_desktop_run(Efreet_Desktop *desktop, E_Fwin *fwin)
 	       ecore_strlcpy(buf, ici->file, sizeof(buf));
 	  }
 	else
-	  _e_fwin_file_exec(fwin, ici, ext);
+	  _e_fwin_file_exec(page, ici, ext);
 	if (buf[0] != 0)
 	  {
-	     if (ici->mime && desktop)
+	     if (ici->mime && desktop && !skip_history)
 		e_exehist_mime_desktop_add(ici->mime, desktop);
 	     files = eina_list_append(files, strdup(ici->file));
 	  }
@@ -728,8 +861,9 @@ _e_fwin_file_is_exec(E_Fm2_Icon_Info *ici)
 }
 
 static void
-_e_fwin_file_exec(E_Fwin *fwin, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext)
+_e_fwin_file_exec(E_Fwin_Page *page, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext)
 {
+   E_Fwin *fwin = page->fwin;
    char buf[4096];
    Efreet_Desktop *desktop;
 
@@ -767,7 +901,7 @@ _e_fwin_file_exec(E_Fwin *fwin, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext)
 	  e_exec(fwin->zone, NULL, buf, NULL, NULL);
 	break;
       case E_FWIN_EXEC_DESKTOP:
-	snprintf(buf, sizeof(buf), "%s/%s", e_fm2_real_path_get(fwin->fm_obj), ici->file);
+	snprintf(buf, sizeof(buf), "%s/%s", e_fm2_real_path_get(page->fm_obj), ici->file);
 	desktop = efreet_desktop_new(buf);
 	if (desktop)
 	  {
@@ -784,12 +918,12 @@ _e_fwin_file_exec(E_Fwin *fwin, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext)
 }
 
 static void 
-_e_fwin_config_set(E_Fwin *fwin) 
+_e_fwin_config_set(E_Fwin_Page *page) 
 {
    E_Fm2_Config fmc;
 
    memset(&fmc, 0, sizeof(E_Fm2_Config));
-   if (!fwin->zone) 
+   if (!page->fwin->zone) 
      {
 #if 0
 	fmc.view.mode = E_FM2_VIEW_MODE_LIST;
@@ -835,65 +969,106 @@ _e_fwin_config_set(E_Fwin *fwin)
    fmc.list.sort.dirs.last = fileman_config->list.sort.dirs.last;
    fmc.selection.single = fileman_config->selection.single;
    fmc.selection.windows_modifiers = fileman_config->selection.windows_modifiers;
-   e_fm2_config_set(fwin->fm_obj, &fmc);
+   e_fm2_config_set(page->fm_obj, &fmc);
 }
 
 static void 
-_e_fwin_window_title_set(E_Fwin *fwin) 
+_e_fwin_window_title_set(E_Fwin_Page *page) 
 {
    char buf[4096];
    const char *file;
 
-   if (!fwin) return;
-   if (fwin->zone) return; //safety
+   if (!page) return;
+   if (page->fwin->zone) return; //safety
 
    if (fileman_config->view.show_full_path) 
-     file = e_fm2_real_path_get(fwin->fm_obj);
+     file = e_fm2_real_path_get(page->fm_obj);
    else
-     file = ecore_file_file_get(e_fm2_real_path_get(fwin->fm_obj));
+     file = ecore_file_file_get(e_fm2_real_path_get(page->fm_obj));
 
    if (file) 
      {
 	ecore_strlcpy(buf, file, sizeof(buf));
-	e_win_title_set(fwin->win, buf);
+	e_win_title_set(page->fwin->win, buf);
+     }
+}
+
+static void
+_e_fwin_page_resize(E_Fwin_Page *page)
+{
+   if (page->tbar)
+     _e_fwin_toolbar_resize(page);
+   else 
+     {
+        int offset = 0;
+
+        if (page->fwin->tb_obj)
+          evas_object_geometry_get(page->fwin->tb_obj, NULL, NULL, NULL, &offset);
+        evas_object_move(page->scrollframe_obj, 0, offset);
+        evas_object_resize(page->scrollframe_obj, page->fwin->win->w, page->fwin->win->h - offset);
      }
 }
 
 static void 
-_e_fwin_toolbar_resize(E_Fwin *fwin) 
+_e_fwin_toolbar_resize(E_Fwin_Page *page) 
 {
+   int tx, ty, tw, th, offset = 0;
    int x, y, w, h;
 
-   e_toolbar_position_calc(fwin->tbar);
-   w = fwin->win->w;
-   h = fwin->win->h;
-   switch (fwin->tbar->gadcon->orient) 
+   if (page->fwin->tb_obj)
+     evas_object_geometry_get(page->fwin->tb_obj, NULL, NULL, NULL, &offset);
+   w = page->fwin->win->w;
+   h = page->fwin->win->h;
+   switch (page->tbar->gadcon->orient) 
      {
+      case E_GADCON_ORIENT_HORIZ:
       case E_GADCON_ORIENT_TOP:
-	x = 0;
-	y = fwin->tbar->h;
-	h = (h - fwin->tbar->h);
-	break;
+	 tx = 0;
+	 ty = offset;
+	 th = 32;
+	 tw = w;
+
+	 x = 0;
+	 y = offset + th;
+	 h = (h - offset - th);
+	 break;
       case E_GADCON_ORIENT_BOTTOM:
-	x = 0;
-	y = 0;
-	h = (h - fwin->tbar->h);
-	break;
+	 tx = 0;
+	 th = 32;
+	 tw = w;
+	 ty = h - th;
+
+	 x = 0;
+	 y = offset;
+	 h = (h - offset - th);
+	 break;
+      case E_GADCON_ORIENT_VERT:
       case E_GADCON_ORIENT_LEFT:
-	x = (fwin->tbar->x + fwin->tbar->w);
-	y = 0;
-	w = (w - fwin->tbar->w);
-	break;
+	 tx = 0;
+	 tw = 32;
+	 th = h - offset;
+	 ty = offset;
+
+	 x = (tx + tw);
+	 y = offset;
+	 w = (w - tw);
+	 break;
       case E_GADCON_ORIENT_RIGHT:
-	x = 0;
-	y = 0;
-	w = (fwin->win->w - fwin->tbar->w);
-	break;
+	 ty = offset;
+	 tw = 32;
+	 tx = w - tw;
+	 th = h - offset;
+
+	 x = 0;
+	 y = offset;
+	 w = (w - tw);
+	 break;
       default:
-	return;
+	 return;
      }
-   evas_object_move(fwin->scrollframe_obj, x, y);
-   evas_object_resize(fwin->scrollframe_obj, w, h);
+   e_toolbar_move_resize(page->tbar, tx, ty, tw, th);
+   evas_object_move(page->scrollframe_obj, x, y);
+   evas_object_resize(page->scrollframe_obj, w, h);
 }
 
 
@@ -915,15 +1090,15 @@ _e_fwin_geom_save(E_Fwin *fwin)
    E_Fm2_Custom_File *cf;
 
    if (!fwin->geom_save_ready) return;
-   snprintf(buf, sizeof(buf), "dir::%s", e_fm2_real_path_get(fwin->fm_obj));
+   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 - fwin->win->border->client_inset.l;
-   cf->geom.y = fwin->win->y - fwin->win->border->client_inset.t;
+   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;
@@ -956,39 +1131,49 @@ _e_fwin_cb_resize(E_Win *win)
      }
    if (fwin->win) 
      {
-	if (fwin->tbar)
-	  _e_fwin_toolbar_resize(fwin);
-	else 
-	  evas_object_resize(fwin->scrollframe_obj, fwin->win->w, fwin->win->h);
+        E_Fwin_Page *page;
+        Eina_List *l;
+
+	if (fwin->tb_obj)
+	  {
+	     int height;
+
+	     e_widget_min_size_get(fwin->tb_obj, NULL, &height);
+	     evas_object_resize(fwin->tb_obj, fwin->win->w, height);
+	  }
+        EINA_LIST_FOREACH(fwin->pages, l, page)
+           _e_fwin_page_resize(page);
      }
    else if (fwin->zone)
-     evas_object_resize(fwin->scrollframe_obj, fwin->zone->w, fwin->zone->h);
+     evas_object_resize(fwin->cur_page->scrollframe_obj, fwin->zone->w, fwin->zone->h);
    _e_fwin_geom_save(fwin);
 }
 
 static void
 _e_fwin_deleted(void *data, Evas_Object *obj, void *event_info)
 {
-   E_Fwin *fwin;
+   E_Fwin_Page *page;
 
-   fwin = data;
-   e_object_del(E_OBJECT(fwin));
+   page = data;
+   e_object_del(E_OBJECT(page->fwin));
 }
 
 static void
 _e_fwin_changed(void *data, Evas_Object *obj, void *event_info)
 {
    E_Fwin *fwin;
+   E_Fwin_Page *page;
    Efreet_Desktop *ef;
-   char buf[PATH_MAX];
+   char buf[PATH_MAX], *ext;
 
-   fwin = data;
+   page = data;
+   fwin = page->fwin;
    if (!fwin) return; //safety
 
    /* FIXME: first look in E config for a special override for this dir's bg
     * or overlay
     */
-   snprintf(buf, sizeof(buf), "%s/.directory.desktop", e_fm2_real_path_get(fwin->fm_obj));
+   snprintf(buf, sizeof(buf), "%s/.directory.desktop", e_fm2_real_path_get(page->fm_obj));
    ef = efreet_desktop_new(buf);
    if (ef)
      {
@@ -1000,41 +1185,71 @@ _e_fwin_changed(void *data, Evas_Object *obj, void *event_info)
 	// frees - doesnt just unref.
  	efreet_desktop_free(ef);
      }
+   else
+     {
+        #define RELEASE_STR(x) if (x) { eina_stringshare_del(x); (x) = NULL; }
+           RELEASE_STR(fwin->wallpaper_file);
+           RELEASE_STR(fwin->overlay_file);
+           RELEASE_STR(fwin->scrollframe_file);
+           RELEASE_STR(fwin->theme_file);
+        #undef RELEASE_STR
+     }
    if (fwin->under_obj)
      {
 	evas_object_hide(fwin->under_obj);
-	edje_object_file_set(fwin->under_obj, NULL, NULL);
 	if (fwin->wallpaper_file)
-	  edje_object_file_set(fwin->under_obj, fwin->wallpaper_file, "e/desktop/background");
+	  {
+             ext = strrchr(fwin->wallpaper_file, '.');
+             if (ext && !strcasecmp(ext, ".edj"))
+                e_icon_file_edje_set(fwin->under_obj, fwin->wallpaper_file, "e/desktop/background");
+             else
+                e_icon_file_set(fwin->under_obj, fwin->wallpaper_file);
+	  }
+	else
+          e_icon_file_edje_set(fwin->under_obj, NULL, NULL);
 	evas_object_show(fwin->under_obj);
      }
    if (fwin->over_obj)
      {
 	evas_object_hide(fwin->over_obj);
-	edje_object_file_set(fwin->over_obj, NULL, NULL);
 	if (fwin->overlay_file)
-	  edje_object_file_set(fwin->over_obj, fwin->overlay_file, "e/desktop/background");
+	  {
+             ext = strrchr(fwin->overlay_file, '.');
+             if (ext && !strcasecmp(ext, ".edj"))
+	       e_icon_file_edje_set(fwin->over_obj, fwin->overlay_file, "e/desktop/background");
+             else
+               e_icon_file_set(fwin->over_obj, fwin->overlay_file);
+	  }
+	else
+          e_icon_file_edje_set(fwin->over_obj, NULL, NULL);
 	evas_object_show(fwin->over_obj);
      }
-   if (fwin->scrollframe_obj)
+   if (page->scrollframe_obj)
      {
 	if ((fwin->scrollframe_file) && 
 	    (e_util_edje_collection_exists(fwin->scrollframe_file, "e/fileman/default/scrollframe")))
-	  e_scrollframe_custom_edje_file_set(fwin->scrollframe_obj, 
+	  e_scrollframe_custom_edje_file_set(page->scrollframe_obj, 
 					     (char *)fwin->scrollframe_file,
 					     "e/fileman/default/scrollframe");
 	else
 	  {
 	     if (fwin->zone)
-	       e_scrollframe_custom_theme_set(fwin->scrollframe_obj,
+	       e_scrollframe_custom_theme_set(page->scrollframe_obj,
 					      "base/theme/fileman",
 					      "e/fileman/desktop/scrollframe");
 	     else
-	       e_scrollframe_custom_theme_set(fwin->scrollframe_obj,
+	       e_scrollframe_custom_theme_set(page->scrollframe_obj,
 					      "base/theme/fileman",
 					      "e/fileman/default/scrollframe");
 	  }
-	e_scrollframe_child_pos_set(fwin->scrollframe_obj, 0, 0);
+	e_scrollframe_child_pos_set(page->scrollframe_obj, 0, 0);
+     }
+   if (fwin->tb_obj)
+     {
+	const char *file;
+
+	file = ecore_file_file_get(e_fm2_real_path_get(page->fm_obj));
+	e_widget_toolbar_item_label_set(fwin->tb_obj, fwin->page_index, file);
      }
    if ((fwin->theme_file) && (ecore_file_exists(fwin->theme_file)))
      e_fm2_custom_theme_set(obj, fwin->theme_file);
@@ -1042,19 +1257,19 @@ _e_fwin_changed(void *data, Evas_Object *obj, void *event_info)
      e_fm2_custom_theme_set(obj, NULL);
 
    if (fwin->zone) return;
-   _e_fwin_window_title_set(fwin);
+   _e_fwin_window_title_set(page);
 }
 
 static void
 _e_fwin_selected(void *data, Evas_Object *obj, void *event_info)
 {
-   E_Fwin *fwin;
+   E_Fwin_Page *page;
    Eina_List *selected;
 
-   fwin = data;
-   selected = e_fm2_selected_list_get(fwin->fm_obj);
+   page = data;
+   selected = e_fm2_selected_list_get(page->fm_obj);
    if (!selected) return;
-   _e_fwin_file_open_dialog(fwin, selected, 0);
+   _e_fwin_file_open_dialog(page, selected, 0);
    eina_list_free(selected);
 }
 
@@ -1062,12 +1277,12 @@ static void
 _e_fwin_selection_change(void *data, Evas_Object *obj, void *event_info)
 {
    Eina_List *l;
-   E_Fwin *fwin;
+   E_Fwin_Page *page;
 
-   fwin = data;
+   page = data;
    for (l = fwins; l; l = l->next)
      {
-	if (l->data != fwin)
+	if (l->data != page->fwin)
 	  e_fwin_all_unsel(l->data);
      }
 }
@@ -1089,8 +1304,10 @@ _e_fwin_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Key_Down *ev;
    E_Fwin *fwin;
+   E_Fwin_Page *page;
 
-   fwin = data;
+   page = data;
+   fwin = page->fwin;
    ev = event_info;
 
    if (evas_key_modifier_is_set(ev->modifiers, "Control"))
@@ -1101,18 +1318,76 @@ _e_fwin_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 	     const char *dev, *path;
 
 	     con = e_container_current_get(e_manager_current_get());
-	     e_fm2_path_get(fwin->fm_obj, &dev, &path);
+	     e_fm2_path_get(page->fm_obj, &dev, &path);
 	     e_fwin_new(con, dev, path);
 	     return;
 	  }
 	if (!strcmp(ev->key, "w"))
 	  {
-	     e_object_del(E_OBJECT(fwin));
+             int count = eina_list_count(fwin->pages);
+             E_Fwin_Page *page;
+
+             if (count > 2)
+               {
+                  Eina_List *l;
+                  int i = 0;
+
+                  page = fwin->cur_page;
+                  if (fwin->page_index > 0)
+                    e_widget_toolbar_item_select(fwin->tb_obj, fwin->page_index - 1);
+                  else
+                    e_widget_toolbar_item_select(fwin->tb_obj, 1);
+                  e_widget_toolbar_item_remove(fwin->tb_obj, page->index);
+                  fwin->pages = eina_list_remove(fwin->pages, page);
+                  _e_fwin_page_free(page);
+                  EINA_LIST_FOREACH(fwin->pages, l, page)
+                     page->index = i++;
+               }
+             else if (count > 1)
+               {
+                  evas_object_del(fwin->tb_obj);
+                  fwin->tb_obj = NULL;
+                  fwin->page_index = 0;
+                  fwin->pages = eina_list_remove(fwin->pages, fwin->cur_page);
+                  _e_fwin_page_free(fwin->cur_page);
+                  page = fwin->pages->data;
+                  page->index = 0;
+                  _e_fwin_cb_page_change(fwin, page);
+                  _e_fwin_cb_resize(fwin->win);
+               }
+             else
+               e_object_del(E_OBJECT(fwin));
 	     return;
 	  }
 	if (!strcmp(ev->key, "a"))
 	  {
-	     e_fm2_all_sel(fwin->fm_obj);
+	     e_fm2_all_sel(page->fm_obj);
+	     return;
+	  }
+	if (!strcmp(ev->key, "t"))
+	  {
+	     _e_fwin_page_new(fwin);
+	     return;
+	  }
+	if (!strcmp(ev->key, "Tab"))
+	  {
+	     Eina_List *l;
+	     if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
+	       {
+		  l = eina_list_nth_list(fwin->pages, fwin->page_index);
+		  if (l->prev)
+		    e_widget_toolbar_item_select(fwin->tb_obj, fwin->page_index - 1);
+		  else
+		    e_widget_toolbar_item_select(fwin->tb_obj, eina_list_count(fwin->pages) - 1);
+	       }
+	     else
+	       {
+		  l = eina_list_nth_list(fwin->pages, fwin->page_index);
+		  if (l->next)
+		    e_widget_toolbar_item_select(fwin->tb_obj, fwin->page_index + 1);
+		  else
+		    e_widget_toolbar_item_select(fwin->tb_obj, 0);
+	       }
 	     return;
 	  }
      }
@@ -1146,10 +1421,10 @@ _e_fwin_zone_move_resize(void *data, int type, void *event)
 	evas_object_move(fwin->bg_obj, ev->zone->x, ev->zone->y);
 	evas_object_resize(fwin->bg_obj, ev->zone->w, ev->zone->h);
      }
-   if (fwin->scrollframe_obj) 
+   if (fwin->cur_page->scrollframe_obj) 
      {
-	evas_object_move(fwin->scrollframe_obj, ev->zone->x, ev->zone->y);
-	evas_object_resize(fwin->scrollframe_obj, ev->zone->w, ev->zone->h);
+	evas_object_move(fwin->cur_page->scrollframe_obj, ev->zone->x, ev->zone->y);
+	evas_object_resize(fwin->cur_page->scrollframe_obj, ev->zone->w, ev->zone->h);
      }
    return 1;
 }
@@ -1174,10 +1449,10 @@ _e_fwin_zone_del(void *data, int type, void *event)
 static void
 _e_fwin_menu_extend(void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info *info)
 {
-   E_Fwin *fwin;
+   E_Fwin_Page *page;
    E_Menu_Item *mi;
 
-   fwin = data;
+   page = data;
    if (e_fm2_has_parent_get(obj))
      {
 	mi = e_menu_item_new(m);
@@ -1205,14 +1480,14 @@ _e_fwin_parent(void *data, E_Menu *m, E_Menu_Item *mi)
 static void
 _e_fwin_cb_menu_open_fast(void *data, E_Menu *m, E_Menu_Item *mi)
 {
-   E_Fwin *fwin;
+   E_Fwin_Page *page;
    Efreet_Desktop *desk;
 
-   fwin = data;
+   page = data;
    desk = e_object_data_get(E_OBJECT(mi));
 
-   if (fwin && desk)
-      _e_fwin_desktop_run(desk, fwin);
+   if (page && desk)
+      _e_fwin_desktop_run(desk, page, EINA_TRUE);
 }
 
 static void
@@ -1220,12 +1495,12 @@ _e_fwin_cb_menu_extend_open_with(void *data, E_Menu *m)
 {
    Eina_List *selected = NULL, *apps = NULL, *l;
    E_Menu_Item *mi;
-   E_Fwin *fwin;
+   E_Fwin_Page *page;
    Efreet_Desktop *desk = NULL;
 
-   fwin = data;
+   page = data;
 
-   selected = e_fm2_selected_list_get(fwin->fm_obj);
+   selected = e_fm2_selected_list_get(page->fm_obj);
    if (!selected) return;
 
    apps = _e_fwin_suggested_apps_list_get(selected, NULL);
@@ -1235,7 +1510,7 @@ _e_fwin_cb_menu_extend_open_with(void *data, E_Menu *m)
 	mi = e_menu_item_new(m);
 	e_menu_item_label_set(mi, desk->name);
 	e_util_desktop_menu_item_icon_add(desk, 24, mi);
-	e_menu_item_callback_set(mi, _e_fwin_cb_menu_open_fast, fwin);
+	e_menu_item_callback_set(mi, _e_fwin_cb_menu_open_fast, page);
 	e_object_data_set(E_OBJECT(mi), desk);
      }
 
@@ -1248,7 +1523,7 @@ _e_fwin_cb_menu_extend_open_with(void *data, E_Menu *m)
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Other application..."));
    e_util_menu_item_theme_icon_set(mi, "document-open");
-   e_menu_item_callback_set(mi, _e_fwin_cb_menu_open_with, fwin);
+   e_menu_item_callback_set(mi, _e_fwin_cb_menu_open_with, page);
 
    e_menu_pre_activate_callback_set(m, NULL, NULL);
 
@@ -1260,14 +1535,14 @@ static void
 _e_fwin_cb_menu_extend_start(void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info *info)
 {
    E_Menu_Item *mi;
-   E_Fwin *fwin;
+   E_Fwin_Page *page;
    E_Menu *subm;
 
-   fwin = data;
+   page = data;
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Open"));
    e_util_menu_item_theme_icon_set(mi, "document-open");
-   e_menu_item_callback_set(mi, _e_fwin_cb_menu_open, fwin);
+   e_menu_item_callback_set(mi, _e_fwin_cb_menu_open, page);
 
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Open with..."));
@@ -1275,41 +1550,41 @@ _e_fwin_cb_menu_extend_start(void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon
 
    subm = e_menu_new();
    e_menu_item_submenu_set(mi, subm);
-   e_menu_pre_activate_callback_set(subm, _e_fwin_cb_menu_extend_open_with, fwin);
+   e_menu_pre_activate_callback_set(subm, _e_fwin_cb_menu_extend_open_with, page);
 }
 
 static void
 _e_fwin_cb_menu_open(void *data, E_Menu *m, E_Menu_Item *mi)
 {
-   E_Fwin *fwin;
+   E_Fwin_Page *page;
    Eina_List *selected;
 
-   fwin = data;
-   selected = e_fm2_selected_list_get(fwin->fm_obj);
+   page = data;
+   selected = e_fm2_selected_list_get(page->fm_obj);
    if (!selected) return;
-   _e_fwin_file_open_dialog(fwin, selected, 0);
+   _e_fwin_file_open_dialog(page, selected, 0);
    eina_list_free(selected);
 }
 
 static void
 _e_fwin_cb_menu_open_with(void *data, E_Menu *m, E_Menu_Item *mi)
 {
-   E_Fwin *fwin;
+   E_Fwin_Page *page;
    Eina_List *selected = NULL;
 
-   fwin = data;
-   selected = e_fm2_selected_list_get(fwin->fm_obj);
+   page = data;
+   selected = e_fm2_selected_list_get(page->fm_obj);
    if (!selected) return;
-   _e_fwin_file_open_dialog(fwin, selected, 1);
+   _e_fwin_file_open_dialog(page, selected, 1);
    eina_list_free(selected);
 }
 
 
 /* 'open with' dialog*/
 static void
-_e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
+_e_fwin_file_open_dialog(E_Fwin_Page *page, Eina_List *files, int always)
 {
-   E_Fwin *fwin2 = NULL;
+   E_Fwin *fwin = page->fwin, *fwin2 = NULL;
    E_Dialog *dia;
    Evas_Coord mw, mh;
    Evas_Object *o, *of, *ot;
@@ -1342,8 +1617,8 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
 		    }
 		  else 
 		    {
-		       e_fm2_path_set(fwin->fm_obj, ici->link, "/");
-		       _e_fwin_window_title_set(fwin);
+		       e_fm2_path_set(page->fm_obj, ici->link, "/");
+		       _e_fwin_window_title_set(page);
 		    }
 	       }
 	     else if ((ici->link) && (ici->removable))
@@ -1358,8 +1633,8 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
 		    }
 		  else 
 		    {
-		       e_fm2_path_set(fwin->fm_obj, buf, "/");
-		       _e_fwin_window_title_set(fwin);
+		       e_fm2_path_set(page->fm_obj, buf, "/");
+		       _e_fwin_window_title_set(page);
 		    }
 	       }
 	     else if (ici->real_link)
@@ -1375,8 +1650,8 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
 			 }
 		       else 
 			 {
-			    e_fm2_path_set(fwin->fm_obj, NULL, ici->real_link);
-			    _e_fwin_window_title_set(fwin);
+			    e_fm2_path_set(page->fm_obj, NULL, ici->real_link);
+			    _e_fwin_window_title_set(page);
 			 }
 		    }
 		  else
@@ -1385,7 +1660,7 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
 	     else
 	       {
 		  snprintf(buf, sizeof(buf), "%s/%s", 
-			   e_fm2_real_path_get(fwin->fm_obj), ici->file);
+			   e_fm2_real_path_get(page->fm_obj), ici->file);
 		  if (S_ISDIR(ici->statinfo.st_mode))
 		    {
 		       if ((!fileman_config->view.open_dirs_in_place) || (fwin->zone)) 
@@ -1397,8 +1672,8 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
 			 }
 		       else 
 			 {
-			    e_fm2_path_set(fwin->fm_obj, NULL, buf);
-			    _e_fwin_window_title_set(fwin);
+			    e_fm2_path_set(page->fm_obj, NULL, buf);
+			    _e_fwin_window_title_set(page);
 			 }
 		    }
 		  else
@@ -1412,7 +1687,7 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
 		       const char *itype = NULL;
 		       int ix, iy, iw, ih, nx, ny, nw, nh;
 
-		       oic = e_fm2_icon_get(evas_object_evas_get(fwin->fm_obj),
+		       oic = e_fm2_icon_get(evas_object_evas_get(page->fm_obj),
 					    ici->ic, NULL, NULL, 0, &itype);
 		       if (oic)
 			 {
@@ -1447,7 +1722,7 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
 			    evas_object_del(oic);
 			    
 			    snprintf(buf, sizeof(buf), "dir::%s",
-				     e_fm2_real_path_get(fwin2->fm_obj));
+				     e_fm2_real_path_get(fwin2->cur_page->fm_obj));
 			    cf = e_fm2_custom_file_get(buf);
 			    if ((cf) && (cf->geom.valid))
 			      {
@@ -1458,36 +1733,25 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
 				 /* 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;
-				 printf("load @ %i %i, %ix%i inset %i %i\n",
-					nx, ny, nw, nh,
-					fwin2->win->border->client_inset.l,
-					fwin2->win->border->client_inset.t);
+
 				 /* if it ended up out of the zone */
 				 if (nx < fwin2->win->border->zone->x)
-				   nx = fwin2->win->border->zone->x +
-				   fwin2->win->border->client_inset.l;
+				   nx = fwin2->win->border->zone->x;
 				 if (ny < fwin2->win->border->zone->y)
-				   ny = fwin2->win->border->zone->y + 
-				   fwin2->win->border->client_inset.t;
+				   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 - 
-				   fwin2->win->border->client_inset.l;
+				     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 - 
-				   fwin2->win->border->client_inset.t;
-				 e_win_move_resize
-				   (fwin2->win, 
-				    nx - fwin2->win->border->client_inset.l, 
-				    ny - fwin2->win->border->client_inset.t,
-				    nw, nh);
+				   fwin2->win->border->h;
+				 e_win_move_resize(fwin2->win, nx, ny, nw, nh);
 			      }
 			    else
 			      {
@@ -1552,7 +1816,7 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
 	     need_dia = 1;
 	     if (mlist) desk = e_exehist_mime_desktop_get(mlist->data);
 	     getcwd(pcwd, sizeof(pcwd));
-	     chdir(e_fm2_real_path_get(fwin->fm_obj));
+	     chdir(e_fm2_real_path_get(page->fm_obj));
 	     
 	     files_list = NULL;
 	     EINA_LIST_FOREACH(files, l, ici)
@@ -1565,7 +1829,7 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
 		  ext = _e_fwin_file_is_exec(ici);
 		  if (ext != E_FWIN_EXEC_NONE)
 		    {
-		       _e_fwin_file_exec(fwin, ici, ext);
+		       _e_fwin_file_exec(page, ici, ext);
 		       need_dia = 0;
 		    }
 	       }
@@ -1685,8 +1949,23 @@ _e_fwin_file_open_dialog(E_Fwin *fwin, Eina_List *files, int always)
 
    e_widget_min_size_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);
    e_dialog_border_icon_set(dia, "preferences-applications");
+   e_widget_focus_set(fad->o_entry, 0);
+}
+
+static void
+_e_fwin_file_open_dialog_cb_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
+{
+   Evas_Event_Key_Down *ev = event_info;
+   E_Fwin_Page *page = data;
+   E_Fwin *fwin = page->fwin;
+
+   if (!strcmp(ev->keyname, "Escape"))
+     _e_fwin_cb_close(fwin->fad, fwin->fad->dia);
+   else if (!strcmp(ev->keyname, "Return"))
+     _e_fwin_cb_open(fwin->fad, fwin->fad->dia);
 }
 
 static int 
@@ -1760,7 +2039,7 @@ _e_fwin_cb_open(void *data, E_Dialog *dia)
       }
 
    if ((desktop) || (strcmp(fad->exec_cmd, "")))
-     _e_fwin_desktop_run(desktop,fad->fwin);
+     _e_fwin_desktop_run(desktop, fad->fwin->cur_page, EINA_FALSE);
 
    // Free fake .desktop
    if (!strcmp(fad->exec_cmd, ""))
@@ -1797,90 +2076,90 @@ _e_fwin_cb_dialog_free(void *obj)
 static void
 _e_fwin_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 {
-   E_Fwin *fwin;
+   E_Fwin_Page *page;
 
-   fwin = evas_object_data_get(obj, "fwin");
+   page = evas_object_data_get(obj, "fm_page");
    e_fm2_pan_set(obj, x, y);
-   if (x > fwin->fm_pan.max_x) x = fwin->fm_pan.max_x;
-   if (y > fwin->fm_pan.max_y) y = fwin->fm_pan.max_y;
+   if (x > page->fm_pan.max_x) x = page->fm_pan.max_x;
+   if (y > page->fm_pan.max_y) y = page->fm_pan.max_y;
    if (x < 0) x = 0;
    if (y < 0) y = 0;
-   fwin->fm_pan.x = x;
-   fwin->fm_pan.y = y;
-   _e_fwin_pan_scroll_update(fwin);
+   page->fm_pan.x = x;
+   page->fm_pan.y = y;
+   _e_fwin_pan_scroll_update(page);
 }
 
 static void
 _e_fwin_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
 {
-   E_Fwin *fwin;
+   E_Fwin_Page *page;
 
-   fwin = evas_object_data_get(obj, "fwin");
+   page = evas_object_data_get(obj, "fm_page");
    e_fm2_pan_get(obj, x, y);
-   fwin->fm_pan.x = *x;
-   fwin->fm_pan.y = *y;
+   page->fm_pan.x = *x;
+   page->fm_pan.y = *y;
 }
 
 static void
 _e_fwin_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
 {
-   E_Fwin *fwin;
+   E_Fwin_Page *page;
 
-   fwin = evas_object_data_get(obj, "fwin");
+   page = evas_object_data_get(obj, "fm_page");
    e_fm2_pan_max_get(obj, x, y);
-   fwin->fm_pan.max_x = *x;
-   fwin->fm_pan.max_y = *y;
-   _e_fwin_pan_scroll_update(fwin);
+   page->fm_pan.max_x = *x;
+   page->fm_pan.max_y = *y;
+   _e_fwin_pan_scroll_update(page);
 }
 
 static void
 _e_fwin_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
 {
-   E_Fwin *fwin;
-
-   fwin = evas_object_data_get(obj, "fwin");
+   E_Fwin_Page *page;
+    
+   page = evas_object_data_get(obj, "fm_page");
    e_fm2_pan_child_size_get(obj, w, h);
-   fwin->fm_pan.w = *w;
-   fwin->fm_pan.h = *h;
-   _e_fwin_pan_scroll_update(fwin);
+   page->fm_pan.w = *w;
+   page->fm_pan.h = *h;
+   _e_fwin_pan_scroll_update(page);
 }
 
 static void
-_e_fwin_pan_scroll_update(E_Fwin *fwin)
+_e_fwin_pan_scroll_update(E_Fwin_Page *page)
 {
    Edje_Message_Int_Set *msg;
 
-   if ((fwin->fm_pan.x == fwin->fm_pan_last.x) &&
-       (fwin->fm_pan.y == fwin->fm_pan_last.y) &&
-       (fwin->fm_pan.max_x == fwin->fm_pan_last.max_x) &&
-       (fwin->fm_pan.max_y == fwin->fm_pan_last.max_y) &&
-       (fwin->fm_pan.w == fwin->fm_pan_last.w) &&
-       (fwin->fm_pan.h == fwin->fm_pan_last.h)) return;
+   if ((page->fm_pan.x == page->fm_pan_last.x) &&
+       (page->fm_pan.y == page->fm_pan_last.y) &&
+       (page->fm_pan.max_x == page->fm_pan_last.max_x) &&
+       (page->fm_pan.max_y == page->fm_pan_last.max_y) &&
+       (page->fm_pan.w == page->fm_pan_last.w) &&
+       (page->fm_pan.h == page->fm_pan_last.h)) return;
    msg = alloca(sizeof(Edje_Message_Int_Set) -
 		sizeof(int) + (6 * sizeof(int)));
    msg->count = 6;
-   msg->val[0] = fwin->fm_pan.x;
-   msg->val[1] = fwin->fm_pan.y;
-   msg->val[2] = fwin->fm_pan.max_x;
-   msg->val[3] = fwin->fm_pan.max_y;
-   msg->val[4] = fwin->fm_pan.w;
-   msg->val[5] = fwin->fm_pan.h;
+   msg->val[0] = page->fm_pan.x;
+   msg->val[1] = page->fm_pan.y;
+   msg->val[2] = page->fm_pan.max_x;
+   msg->val[3] = page->fm_pan.max_y;
+   msg->val[4] = page->fm_pan.w;
+   msg->val[5] = page->fm_pan.h;
 //   printf("SEND MSG %i %i | %i %i | %ix%i\n",
-//	  fwin->fm_pan.x, fwin->fm_pan.y,
-//	  fwin->fm_pan.max_x, fwin->fm_pan.max_y,
-//	  fwin->fm_pan.w, fwin->fm_pan.h);
-   if (fwin->under_obj)
-     edje_object_message_send(fwin->under_obj, EDJE_MESSAGE_INT_SET, 1, msg);
-   if (fwin->over_obj)
-     edje_object_message_send(fwin->over_obj, EDJE_MESSAGE_INT_SET, 1, msg);
-   if (fwin->scrollframe_obj)
-     edje_object_message_send(e_scrollframe_edje_object_get(fwin->scrollframe_obj), EDJE_MESSAGE_INT_SET, 1, msg);
-   fwin->fm_pan_last.x = fwin->fm_pan.x;
-   fwin->fm_pan_last.y = fwin->fm_pan.y;
-   fwin->fm_pan_last.max_x = fwin->fm_pan.max_x;
-   fwin->fm_pan_last.max_y = fwin->fm_pan.max_y;
-   fwin->fm_pan_last.w = fwin->fm_pan.w;
-   fwin->fm_pan_last.h = fwin->fm_pan.h;
+//	  page->fm_pan.x, page->fm_pan.y,
+//	  page->fm_pan.max_x, page->fm_pan.max_y,
+//	  page->fm_pan.w, page->fm_pan.h);
+   if (page->fwin->under_obj)
+     edje_object_message_send(page->fwin->under_obj, EDJE_MESSAGE_INT_SET, 1, msg);
+   if (page->fwin->over_obj)
+     edje_object_message_send(page->fwin->over_obj, EDJE_MESSAGE_INT_SET, 1, msg);
+   if (page->scrollframe_obj)
+     edje_object_message_send(e_scrollframe_edje_object_get(page->scrollframe_obj), EDJE_MESSAGE_INT_SET, 1, msg);
+   page->fm_pan_last.x = page->fm_pan.x;
+   page->fm_pan_last.y = page->fm_pan.y;
+   page->fm_pan_last.max_x = page->fm_pan.max_x;
+   page->fm_pan_last.max_y = page->fm_pan.max_y;
+   page->fm_pan_last.w = page->fm_pan.w;
+   page->fm_pan_last.h = page->fm_pan.h;
 }
 
 
@@ -1951,7 +2230,7 @@ static int
 _e_fwin_op_registry_entry_add_cb(void *data, int type, void *event)
 {
    E_Fm2_Op_Registry_Entry *ere = (E_Fm2_Op_Registry_Entry *)event;
-   E_Fwin *fwin = data;
+   E_Fwin_Page *page = data;
    Evas_Object *o;
    int mw, mh;
 
@@ -1959,7 +2238,7 @@ _e_fwin_op_registry_entry_add_cb(void *data, int type, void *event)
          ere->op == E_FM_OP_REMOVE))
       return ECORE_CALLBACK_RENEW;
 
-   o = edje_object_add(e_win_evas_get(fwin->win));
+   o = edje_object_add(evas_object_evas_get(page->scrollframe_obj));
    e_theme_edje_object_set(o, "base/theme/fileman",
                            "e/fileman/default/progress");
    edje_object_size_min_get(o, &mw, &mh);
@@ -1971,7 +2250,7 @@ _e_fwin_op_registry_entry_add_cb(void *data, int type, void *event)
    _e_fwin_op_registry_listener_cb(o, ere);
 
    // Append the element to the box
-   edje_object_part_box_append(e_scrollframe_edje_object_get(fwin->scrollframe_obj),
+   edje_object_part_box_append(e_scrollframe_edje_object_get(page->scrollframe_obj),
                                "e.box.operations", o);
    evas_object_size_hint_align_set(o, 1.0, 1.0); //FIXME this should be theme-configurable
    evas_object_show(o);
@@ -1984,13 +2263,13 @@ _e_fwin_op_registry_entry_add_cb(void *data, int type, void *event)
 }
 
 static void
-_e_fwin_op_registry_entry_iter(E_Fwin *fwin)
+_e_fwin_op_registry_entry_iter(E_Fwin_Page *page)
 {
    Eina_Iterator *itr;
    E_Fm2_Op_Registry_Entry *ere;
 
    itr = e_fm2_op_registry_iterator_new();
    EINA_ITERATOR_FOREACH(itr, ere)
-     _e_fwin_op_registry_entry_add_cb(fwin, 0, ere);
+     _e_fwin_op_registry_entry_add_cb(page, 0, ere);
    eina_iterator_free(itr);
 }
diff --git a/src/modules/fileman/e_mod_config.c b/src/modules/fileman/e_mod_config.c
index 330a7ab..f68a0cb 100644
--- a/src/modules/fileman/e_mod_config.c
+++ b/src/modules/fileman/e_mod_config.c
@@ -65,6 +65,8 @@ struct _E_Config_Dialog_Data
    struct
      {
         int desktop;
+        int auto_mount;
+        int auto_open;
      } hal;
 
    E_Config_Dialog *cfd;
@@ -124,6 +126,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    cfdata->list.sort.dirs.first = fileman_config->list.sort.dirs.first;
    cfdata->list.sort.case_sen = !(fileman_config->list.sort.no_case);
    cfdata->hal.desktop = e_config->hal_desktop;
+   cfdata->hal.auto_mount = e_config->hal_auto_mount;
+   cfdata->hal.auto_open = e_config->hal_auto_open;
 }
 
 static void 
@@ -159,7 +163,10 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      e_fm2_hal_show_desktop_icons();
    else
      e_fm2_hal_hide_desktop_icons();
-     
+
+   e_config->hal_auto_mount = cfdata->hal.auto_mount;
+   e_config->hal_auto_open = cfdata->hal.auto_open;
+   
    e_config_save_queue();
    
    /* FIXME: reload/refresh existing fm's */
@@ -184,7 +191,9 @@ _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
       (fileman_config->list.sort.dirs.first != cfdata->list.sort.dirs.first) ||
       (fileman_config->list.sort.dirs.last != !(cfdata->list.sort.dirs.first)) ||
       (fileman_config->list.sort.no_case != !(cfdata->list.sort.case_sen)) ||
-      (e_config->hal_desktop != cfdata->hal.desktop));
+      (e_config->hal_desktop != cfdata->hal.desktop) ||
+      (e_config->hal_auto_mount != cfdata->hal.auto_mount) ||
+      (e_config->hal_auto_open != cfdata->hal.auto_open));
 }
 
 static Evas_Object *
@@ -254,12 +263,22 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    ob = e_widget_check_add(evas, _("Show Toolbar"), 
 			   &(cfdata->view.show_toolbar));
    e_widget_list_object_append(o, ob, 1, 1, 0.5);
-   ob = e_widget_check_add(evas, _("Show HAL icons on desktop"), 
-			   &(cfdata->hal.desktop));
-   e_widget_list_object_append(o, ob, 1, 1, 0.5);
 
    e_widget_toolbook_page_append(otb, NULL, _("Behavior"), o, 0, 0, 0, 0, 0.5, 0.0);
 
+   o = e_widget_list_add(evas, 2, 0);
+   ob = e_widget_check_add(evas, _("Show HAL icons on desktop"), 
+                           &(cfdata->hal.desktop));
+   e_widget_list_object_append(o, ob, 1, 1, 0.5);
+   ob = e_widget_check_add(evas, _("Mount volumes on insert"), 
+                           &(cfdata->hal.auto_mount));
+   e_widget_list_object_append(o, ob, 1, 1, 0.5);
+   ob = e_widget_check_add(evas, _("Open filemanager on mount"),
+                           &(cfdata->hal.auto_open));
+   e_widget_list_object_append(o, ob, 1, 1, 0.5);
+   
+   e_widget_toolbook_page_append(otb, NULL, _("HAL"), o, 0, 0, 0, 0, 0.5, 0.0);
+
    e_widget_toolbook_page_show(otb, 0);
    return otb;
 }
diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c
index 6d69e3c..588c01a 100644
--- a/src/modules/fileman/e_mod_main.c
+++ b/src/modules/fileman/e_mod_main.c
@@ -216,21 +216,6 @@ _e_mod_action_fileman_cb(E_Object *obj, const char *params)
 //~ }
 
 static void
-_mount_ok(void *data)
-{
-   E_Volume *vol = data;
-   e_fwin_new(e_container_current_get(e_manager_current_get()),
-	      NULL, vol->mount_point);
-}
-
-static void
-_mount_fail(void *data)
-{
-   //TODO make a better dialog
-   e_util_dialog_internal(_("Mount error"), _("Mount of device failed"));
-}
-
-static void
 _e_mod_menu_gtk_cb(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    char *path = data;
@@ -253,8 +238,13 @@ _e_mod_menu_volume_cb(void *data, E_Menu *m, E_Menu_Item *mi)
 	if (m->zone)
 	  e_fwin_new(m->zone->container, NULL, vol->mount_point);
      }
-   else //TODO need to remove the mount?
-      e_fm2_hal_mount(vol, _mount_ok, _mount_fail, NULL, NULL, vol);
+   else
+     {
+        char buf[PATH_MAX];
+        snprintf(buf, sizeof(buf), "removable:%s", vol->udi);
+        e_fwin_new(e_container_current_get(e_manager_current_get()),
+                   buf, "/");
+     }
 }
 
 static void
diff --git a/src/modules/fileman_opinfo/Makefile.in b/src/modules/fileman_opinfo/Makefile.in
index 5468464..c212f2b 100644
--- a/src/modules/fileman_opinfo/Makefile.in
+++ b/src/modules/fileman_opinfo/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/fileman_opinfo/module.desktop b/src/modules/fileman_opinfo/module.desktop
index 9890a53..d728b23 100644
--- a/src/modules/fileman_opinfo/module.desktop
+++ b/src/modules/fileman_opinfo/module.desktop
@@ -2,9 +2,11 @@
 Type=Link
 Name=EFM Operation Info
 Name[it]=Informazioni operazioni EFM
+Name[eo]=Aktualaj operacioj en EFM
 Name[fr]=Informations EFM
 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[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.
 X-Enlightenment-ModuleType=fileman
diff --git a/src/modules/fileman_opinfo/module.desktop.in b/src/modules/fileman_opinfo/module.desktop.in
index 9890a53..d728b23 100644
--- a/src/modules/fileman_opinfo/module.desktop.in
+++ b/src/modules/fileman_opinfo/module.desktop.in
@@ -2,9 +2,11 @@
 Type=Link
 Name=EFM Operation Info
 Name[it]=Informazioni operazioni EFM
+Name[eo]=Aktualaj operacioj en EFM
 Name[fr]=Informations EFM
 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[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.
 X-Enlightenment-ModuleType=fileman
diff --git a/src/modules/gadman/Makefile.in b/src/modules/gadman/Makefile.in
index 8d08f50..2094e79 100644
--- a/src/modules/gadman/Makefile.in
+++ b/src/modules/gadman/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/gadman/module.desktop b/src/modules/gadman/module.desktop
index 0b203f1..3a29f2c 100644
--- a/src/modules/gadman/module.desktop
+++ b/src/modules/gadman/module.desktop
@@ -2,12 +2,14 @@
 Type=Link
 Name=Gadgets
 Name[cs]=Gadgety
+Name[eo]=Akcesoraĵoj
 Name[it]=Gestore gadget
 Name[hu]=Bigyók az asztalon
 Icon=e-module-gadman
 X-Enlightenment-ModuleType=appearance
 Comment=<title>Gadget Manager</title><br>Module to manage gadgets on the desktop.
 Comment[cs]=<title>Správce gadgetů</title><br>Modul pro správu gadgetů na ploše.
+Comment[eo]=<title>Administrilo de akcesoraĵoj</title>Modulo de administrado de akcesoraĵoj sur labortablo.
 Comment[it]=<title>Gestore gadget</title><br>Modulo per la gestione dei gadget sul desktop.
 Comment[hu]=<title>Bigyó kezelő :)</title><br>A modul segítségével könnyedén tudsz elhelyezni, mozgatni, átméretezni modulokat/bigyókat a munkaasztalodon.
 Comment[fr]=<title>Gestionnaire de gadgets</title><br>Module de gestion des gadgets sur le bureau.
diff --git a/src/modules/gadman/module.desktop.in b/src/modules/gadman/module.desktop.in
index 0b203f1..3a29f2c 100644
--- a/src/modules/gadman/module.desktop.in
+++ b/src/modules/gadman/module.desktop.in
@@ -2,12 +2,14 @@
 Type=Link
 Name=Gadgets
 Name[cs]=Gadgety
+Name[eo]=Akcesoraĵoj
 Name[it]=Gestore gadget
 Name[hu]=Bigyók az asztalon
 Icon=e-module-gadman
 X-Enlightenment-ModuleType=appearance
 Comment=<title>Gadget Manager</title><br>Module to manage gadgets on the desktop.
 Comment[cs]=<title>Správce gadgetů</title><br>Modul pro správu gadgetů na ploše.
+Comment[eo]=<title>Administrilo de akcesoraĵoj</title>Modulo de administrado de akcesoraĵoj sur labortablo.
 Comment[it]=<title>Gestore gadget</title><br>Modulo per la gestione dei gadget sul desktop.
 Comment[hu]=<title>Bigyó kezelő :)</title><br>A modul segítségével könnyedén tudsz elhelyezni, mozgatni, átméretezni modulokat/bigyókat a munkaasztalodon.
 Comment[fr]=<title>Gestionnaire de gadgets</title><br>Module de gestion des gadgets sur le bureau.
diff --git a/src/modules/ibar/Makefile.in b/src/modules/ibar/Makefile.in
index 67d6aa4..5d7140b 100644
--- a/src/modules/ibar/Makefile.in
+++ b/src/modules/ibar/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c
index 3519ce5..c4eb113 100644
--- a/src/modules/ibar/e_mod_config.c
+++ b/src/modules/ibar/e_mod_config.c
@@ -8,9 +8,8 @@
 struct _E_Config_Dialog_Data
 {
    const char *dir;
-   int   show_label;
-   int   eap_label;
-   
+   int show_label, eap_label;
+
    Evas_Object *tlist;
    Evas_Object *radio_name;
    Evas_Object *radio_comment;
@@ -38,7 +37,7 @@ _config_ibar_module(Config_Item *ci)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    char buf[4096];
-   
+
    v = E_NEW(E_Config_Dialog_View, 1);
 
    /* Dialog Methods */
@@ -49,7 +48,9 @@ _config_ibar_module(Config_Item *ci)
    v->advanced.apply_cfdata = NULL;
    v->advanced.create_widgets = NULL;
 
-   snprintf(buf, sizeof(buf), "%s/e-module-ibar.edj", e_module_dir_get(ibar_config->module));
+   snprintf(buf, sizeof(buf), "%s/e-module-ibar.edj", 
+            e_module_dir_get(ibar_config->module));
+
    /* Create The Dialog */
    cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
 			     _("IBar Settings"),
@@ -74,7 +75,7 @@ _create_data(E_Config_Dialog *cfd)
 {
    E_Config_Dialog_Data *cfdata;
    Config_Item *ci;
-   
+
    ci = cfd->data;
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
    _fill_data(ci, cfdata);
@@ -95,16 +96,16 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 {
    Evas_Object *o, *of, *ol, *ob, *ot;
    E_Radio_Group *rg;
-   
+
    o = e_widget_list_add(evas, 0, 0);
-   
+
    of = e_widget_frametable_add(evas, _("Selected Bar Source"), 0);
    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_frametable_object_append(of, ol, 0, 0, 1, 2, 1, 1, 1, 0);
-   
+
    ot = e_widget_table_add(evas, 0);
    ob = e_widget_button_add(evas, _("Add"), "list-add", _cb_add, cfdata, NULL);
    e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 1, 1, 0);
@@ -115,15 +116,15 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 
    if (!e_configure_registry_exists("applications/ibar_applications")) 
      e_widget_disabled_set(ob, 1);
-   
+
    e_widget_frametable_object_append(of, ot, 1, 0, 1, 1, 1, 1, 1, 0);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
-   
+
    of = e_widget_framelist_add(evas, _("Icon Labels"), 0);
    ob = e_widget_check_add(evas, _("Show Icon Label"), &(cfdata->show_label));
    e_widget_on_change_hook_set(ob, _show_label_cb_change, cfdata);
    e_widget_framelist_object_append(of, ob);  
-   
+
    rg = e_widget_radio_group_new(&(cfdata->eap_label));
 
    cfdata->radio_name = e_widget_radio_add(evas, _("Display App Name"), 0, rg);
@@ -133,11 +134,11 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    cfdata->radio_comment = e_widget_radio_add(evas, _("Display App Comment"), 1, rg);
    e_widget_framelist_object_append(of, cfdata->radio_comment);
    if (!cfdata->show_label) e_widget_disabled_set(cfdata->radio_comment, 1);
-   
+
    cfdata->radio_generic = e_widget_radio_add(evas, _("Display App Generic"), 2, rg);
    e_widget_framelist_object_append(of, cfdata->radio_generic);
    if (!cfdata->show_label) e_widget_disabled_set(cfdata->radio_generic, 1);
-   
+
    e_widget_list_object_append(o, of, 1, 1, 0.5);
    return o;
 }
@@ -146,7 +147,7 @@ static int
 _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    Config_Item *ci;
-   
+
    ci = cfd->data;
    if (ci->dir) eina_stringshare_del(ci->dir);
    ci->dir = NULL;
@@ -162,7 +163,7 @@ static void
 _cb_add(void *data, void *data2) 
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = data;
    e_entry_dialog_show(_("Create new IBar source"), "enlightenment",
 		       _("Enter a name for this new source:"), "", NULL, NULL,
@@ -177,16 +178,16 @@ _cb_del(void *data, void *data2)
    E_Confirm_Dialog *dialog;
 
    cfdata = data;   
-   if (cfdata->dialog_delete)
-     return;
+   if (cfdata->dialog_delete) return;
 
    snprintf(buf, sizeof(buf), _("You requested to delete \"%s\".<br><br>"
 				"Are you sure you want to delete this bar source?"),
 	    cfdata->dir);
-   
+
    dialog = e_confirm_dialog_show(_("Are you sure you want to delete this bar source?"),
                                   "application-exit", buf, NULL, NULL, 
-                                  _cb_confirm_dialog_yes, NULL, cfdata, NULL, _cb_confirm_dialog_destroy, cfdata);
+                                  _cb_confirm_dialog_yes, NULL, cfdata, NULL, 
+                                  _cb_confirm_dialog_destroy, cfdata);
    cfdata->dialog_delete = dialog;
 }
 
@@ -195,9 +196,10 @@ _cb_config(void *data, void *data2)
 {
    char path[PATH_MAX];
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = data;
-   e_user_dir_snprintf(path, sizeof(path), "applications/bar/%s/.order", cfdata->dir);
+   e_user_dir_snprintf(path, sizeof(path), "applications/bar/%s/.order", 
+                       cfdata->dir);
    e_configure_registry_call("internal/ibar_other",
 			     e_container_current_get(e_manager_current_get()),
 			     path);
@@ -228,7 +230,7 @@ _cb_entry_ok(char *text, void *data)
 	     fclose(f);
 	  }
      }
-   
+
    _load_tlist(data);
 }
 
@@ -251,7 +253,7 @@ static void
 _cb_confirm_dialog_destroy(void *data) 
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = data;
    cfdata->dialog_delete = NULL;
 }
@@ -291,18 +293,16 @@ _load_tlist(E_Config_Dialog_Data *cfdata)
      }
 
    e_widget_ilist_go(cfdata->tlist);
-   if (selnum >= 0)
-     e_widget_ilist_selected_set(cfdata->tlist, selnum);   
+   if (selnum >= 0) e_widget_ilist_selected_set(cfdata->tlist, selnum);   
 }
 
 static void 
 _show_label_cb_change(void *data, Evas_Object *obj) 
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = data;
    if (!cfdata) return;
-   
    e_widget_disabled_set(cfdata->radio_name, !cfdata->show_label);
    e_widget_disabled_set(cfdata->radio_comment, !cfdata->show_label);
    e_widget_disabled_set(cfdata->radio_generic, !cfdata->show_label);   
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index c0c8ec9..694d53d 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -34,48 +34,44 @@ static const E_Gadcon_Client_Class _gadcon_class =
 
 /* actual module specifics */
 typedef struct _Instance  Instance;
-
-typedef struct _IBar      IBar;
+typedef struct _IBar IBar;
 typedef struct _IBar_Icon IBar_Icon;
 
 struct _Instance
 {
    E_Gadcon_Client *gcc;
-   Evas_Object     *o_ibar;
-   IBar            *ibar;
-   E_Drop_Handler  *drop_handler;
-   Config_Item     *ci;
+   Evas_Object *o_ibar;
+   IBar *ibar;
+   E_Drop_Handler *drop_handler;
+   Config_Item *ci;
    E_Gadcon_Orient orient;
 };
 
 struct _IBar
 {
-   Instance       *inst;
-   Evas_Object    *o_box;
-   Evas_Object    *o_drop;
-   Evas_Object    *o_drop_over;
-   Evas_Object    *o_empty;
-   IBar_Icon      *ic_drop_before;
-   int             drop_before;
-   E_Order        *apps;
-   Eina_List      *icons;
-   Evas_Coord	   dnd_x, dnd_y;
+   Instance *inst;
+   Evas_Object *o_box, *o_drop;
+   Evas_Object *o_drop_over, *o_empty;
+   IBar_Icon *ic_drop_before;
+   int drop_before;
+   E_Order *apps;
+   Eina_List *icons;
+   Evas_Coord dnd_x, dnd_y;
 };
 
 struct _IBar_Icon
 {
-   IBar           *ibar;
-   Evas_Object    *o_holder;
-   Evas_Object    *o_icon;
-   Evas_Object    *o_holder2;
-   Evas_Object    *o_icon2;
+   IBar *ibar;
+   Evas_Object *o_holder, *o_icon;
+   Evas_Object *o_holder2, *o_icon2;
    Efreet_Desktop *app;
-   int             mouse_down;
-   struct {
-      unsigned char  start : 1;
-      unsigned char  dnd : 1;
-      int            x, y;
-   } drag;
+   int mouse_down;
+   struct 
+     {
+        unsigned char start : 1;
+        unsigned char dnd : 1;
+        int x, y;
+     } drag;
 };
 
 static IBar *_ibar_new(Evas *evas, Instance *inst);
@@ -115,7 +111,6 @@ static void _ibar_inst_cb_leave(void *data, const char *type, void *event_info);
 static void _ibar_inst_cb_drop(void *data, const char *type, void *event_info);
 static void _ibar_drop_position_update(Instance *inst, Evas_Coord x, Evas_Coord y);
 static void _ibar_inst_cb_scroll(void *data);
-
 static int  _ibar_cb_config_icon_theme(void *data, int ev_type, void *ev);
 
 static E_Config_DD *conf_edd = NULL;
@@ -135,7 +130,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    Evas_Coord x, y, w, h;
    const char *drop[] = { "enlightenment/desktop", "enlightenment/border", "text/uri-list" };
    Config_Item *ci;
-   
+
    inst = E_NEW(Instance, 1);
 
    ci = _ibar_config_item_get(id);
@@ -145,11 +140,11 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    o = b->o_box;
    gcc = e_gadcon_client_new(gc, name, id, style, o);
    gcc->data = inst;
-   
+
    inst->gcc = gcc;
    inst->o_ibar = o;
    inst->orient = E_GADCON_ORIENT_HORIZ;
-   
+
    evas_object_geometry_get(o, &x, &y, &w, &h);
    inst->drop_handler =
      e_drop_handler_add(E_OBJECT(inst->gcc), inst,
@@ -168,12 +163,12 @@ static void
 _gc_shutdown(E_Gadcon_Client *gcc)
 {
    Instance *inst;
-   
+
    inst = gcc->data;
    ibar_config->instances = eina_list_remove(ibar_config->instances, inst);
    e_drop_handler_del(inst->drop_handler);
    _ibar_free(inst->ibar);
-   free(inst);
+   E_FREE(inst);
 }
 
 static void
@@ -182,8 +177,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
    Instance *inst;
 
    inst = gcc->data;
-   if (orient != -1)
-      inst->orient = orient;
+   if (orient != -1) inst->orient = orient;
 
    switch (inst->orient)
      {
@@ -225,7 +219,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
 {
    Evas_Object *o;
    char buf[4096];
-   
+
    o = edje_object_add(evas);
    snprintf(buf, sizeof(buf), "%s/e-module-ibar.edj",
 	    e_module_dir_get(ibar_config->module));
@@ -260,12 +254,6 @@ _gc_id_del(E_Gadcon_Client_Class *client_class, const char *id)
  */
 }
 
-/**/
-/***************************************************************************/
-
-/***************************************************************************/
-/**/
-
 static IBar *
 _ibar_new(Evas *evas, Instance *inst)
 {
@@ -280,9 +268,8 @@ _ibar_new(Evas *evas, Instance *inst)
    e_box_orientation_set(b->o_box, 1);
    e_box_align_set(b->o_box, 0.5, 0.5);
    if (inst->ci->dir[0] != '/')
-     {
-	e_user_dir_snprintf(buf, sizeof(buf), "applications/bar/%s/.order", inst->ci->dir);
-     }
+     e_user_dir_snprintf(buf, sizeof(buf), "applications/bar/%s/.order", 
+                         inst->ci->dir);
    else
      ecore_strlcpy(buf, inst->ci->dir, sizeof(buf));
    b->apps = e_order_new(buf);
@@ -301,7 +288,7 @@ _ibar_free(IBar *b)
    if (b->o_empty) evas_object_del(b->o_empty);
    e_order_update_callback_set(b->apps, NULL, NULL);
    if (b->apps) e_object_del(E_OBJECT(b->apps));
-   free(b);
+   E_FREE(b);
 }
 
 static void
@@ -309,7 +296,7 @@ _ibar_cb_empty_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
 {
    Evas_Event_Mouse_Down *ev;
    IBar *b;
-   
+
    ev = event_info;
    b = data;
    if (!ibar_config->menu)
@@ -317,7 +304,7 @@ _ibar_cb_empty_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
 	E_Menu *mn;
 	E_Menu_Item *mi;
 	int cx, cy, cw, ch;
-	
+
 	mn = e_menu_new();
 	e_menu_post_deactivate_callback_set(mn, _ibar_cb_menu_post, NULL);
 	ibar_config->menu = mn;
@@ -329,9 +316,9 @@ _ibar_cb_empty_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
 
 	mi = e_menu_item_new(mn);
 	e_menu_item_separator_set(mi, 1);
-	
+
 	e_gadcon_client_util_menu_items_append(b->inst->gcc, mn, 0);
-	
+
 	e_gadcon_canvas_zone_geometry_get(b->inst->gcc->gadcon,
 					  &cx, &cy, &cw, &ch);
 	e_menu_activate_mouse(mn,
@@ -349,9 +336,11 @@ _ibar_empty_handle(IBar *b)
 	if (!b->o_empty)
 	  {
 	     Evas_Coord w, h;
-	     
+
 	     b->o_empty = evas_object_rectangle_add(evas_object_evas_get(b->o_box));
-	     evas_object_event_callback_add(b->o_empty, EVAS_CALLBACK_MOUSE_DOWN, _ibar_cb_empty_mouse_down, b);
+	     evas_object_event_callback_add(b->o_empty, 
+                                            EVAS_CALLBACK_MOUSE_DOWN, 
+                                            _ibar_cb_empty_mouse_down, b);
 	     evas_object_color_set(b->o_empty, 0, 0, 0, 0);
 	     evas_object_show(b->o_empty);
 	     e_box_pack_end(b->o_box, b->o_empty);
@@ -383,6 +372,7 @@ _ibar_fill(IBar *b)
      {
 	Efreet_Desktop *desktop;
 	const Eina_List *l;
+
 	EINA_LIST_FOREACH(b->apps->desktops, l, desktop)
 	  {
 	     IBar_Icon *ic = _ibar_icon_new(b, desktop);
@@ -398,6 +388,7 @@ static void
 _ibar_empty(IBar *b)
 {
    IBar_Icon *ic;
+
    EINA_LIST_FREE(b->icons, ic)
      _ibar_icon_free(ic);
 
@@ -417,7 +408,7 @@ _ibar_resize_handle(IBar *b)
    const Eina_List *l;
    IBar_Icon *ic;
    Evas_Coord w, h;
-   
+
    evas_object_geometry_get(b->o_box, NULL, NULL, &w, &h);
    if (e_box_orientation_get(b->o_box))
      w = h;
@@ -441,7 +432,7 @@ static void
 _ibar_instance_drop_zone_recalc(Instance *inst)
 {
    Evas_Coord x, y, w, h;
-   
+
    evas_object_geometry_get(inst->o_ibar, &x, &y, &w, &h);
    e_drop_handler_geometry_set(inst->drop_handler, x, y, w, h);
 }  
@@ -460,13 +451,13 @@ _ibar_config_item_get(const char *id)
    else
      {
 	const Eina_List *l;
+
 	/* Find old config, or reuse supplied id */
 	EINA_LIST_FOREACH(ibar_config->items, l, ci)
 	  {
 	     if ((ci->id) && (!strcmp(ci->id, id)))
 	       {
-		  if (!ci->dir)
-		    ci->dir = eina_stringshare_add("default");
+		  if (!ci->dir) ci->dir = eina_stringshare_add("default");
 		  return ci;
 	       }
 	  }
@@ -496,9 +487,8 @@ _ibar_config_update(Config_Item *ci)
 	if (inst->ibar->apps)
 	  e_object_del(E_OBJECT(inst->ibar->apps));
 	if (inst->ci->dir[0] != '/')
-	  {
-	     e_user_dir_snprintf(buf, sizeof(buf), "applications/bar/%s/.order", inst->ci->dir);
-	  }
+          e_user_dir_snprintf(buf, sizeof(buf), "applications/bar/%s/.order", 
+                              inst->ci->dir);
 	else
 	  ecore_strlcpy(buf, inst->ci->dir, sizeof(buf));
 	inst->ibar->apps = e_order_new(buf);
@@ -508,18 +498,22 @@ _ibar_config_update(Config_Item *ci)
 
 	const Eina_List *i;
 	IBar_Icon *ic;
+
 	EINA_LIST_FOREACH(inst->ibar->icons, i, ic)
 	  {
 	     switch (ci->eap_label)
 	       {
 		case 0:
-		  edje_object_part_text_set(ic->o_holder2, "e.text.label", ic->app->name);
+		  edje_object_part_text_set(ic->o_holder2, "e.text.label", 
+                                            ic->app->name);
 		  break;
 		case 1:
-		  edje_object_part_text_set(ic->o_holder2, "e.text.label", ic->app->comment);
+		  edje_object_part_text_set(ic->o_holder2, "e.text.label", 
+                                            ic->app->comment);
 		  break;
 		case 2:
-		  edje_object_part_text_set(ic->o_holder2, "e.text.label", ic->app->generic_name);
+		  edje_object_part_text_set(ic->o_holder2, "e.text.label", 
+                                            ic->app->generic_name);
 		  break;
 	       }
 	  }
@@ -535,6 +529,7 @@ _ibar_icon_at_coord(IBar *b, Evas_Coord x, Evas_Coord y)
    EINA_LIST_FOREACH(b->icons, l, ic)
      {
         Evas_Coord dx, dy, dw, dh;
+
         evas_object_geometry_get(ic->o_holder, &dx, &dy, &dw, &dh);
 	if (E_INSIDE(x, y, dx, dy, dw, dh)) return ic;
      }
@@ -545,29 +540,36 @@ static IBar_Icon *
 _ibar_icon_new(IBar *b, Efreet_Desktop *desktop)
 {
    IBar_Icon *ic;
-   
+
    ic = E_NEW(IBar_Icon, 1);
    ic->ibar = b;
    ic->app = desktop;
    ic->o_holder = edje_object_add(evas_object_evas_get(b->o_box));
    e_theme_edje_object_set(ic->o_holder, "base/theme/modules/ibar",
 			   "e/modules/ibar/icon");
-   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_IN,  _ibar_cb_icon_mouse_in,  ic);
-   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_OUT, _ibar_cb_icon_mouse_out, ic);
-   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_DOWN, _ibar_cb_icon_mouse_down, ic);
-   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_UP, _ibar_cb_icon_mouse_up, ic);
-   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_MOVE, _ibar_cb_icon_mouse_move, ic);
-   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOVE, _ibar_cb_icon_move, ic);
-   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_RESIZE, _ibar_cb_icon_resize, ic);
+   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_IN,  
+                                  _ibar_cb_icon_mouse_in,  ic);
+   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_OUT, 
+                                  _ibar_cb_icon_mouse_out, ic);
+   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_DOWN, 
+                                  _ibar_cb_icon_mouse_down, ic);
+   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_UP, 
+                                  _ibar_cb_icon_mouse_up, ic);
+   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_MOVE, 
+                                  _ibar_cb_icon_mouse_move, ic);
+   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOVE, 
+                                  _ibar_cb_icon_move, ic);
+   evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_RESIZE, 
+                                  _ibar_cb_icon_resize, ic);
    evas_object_show(ic->o_holder);
-   
+
    ic->o_holder2 = edje_object_add(evas_object_evas_get(b->o_box));
    e_theme_edje_object_set(ic->o_holder2, "base/theme/modules/ibar",
 			   "e/modules/ibar/icon_overlay");
    evas_object_layer_set(ic->o_holder2, 9999);
    evas_object_pass_events_set(ic->o_holder2, 1);
    evas_object_show(ic->o_holder2);
-   
+
    _ibar_icon_fill(ic);
    return ic;
 }
@@ -586,7 +588,7 @@ _ibar_icon_free(IBar_Icon *ic)
    _ibar_icon_empty(ic);
    evas_object_del(ic->o_holder);
    evas_object_del(ic->o_holder2);
-   free(ic);
+   E_FREE(ic);
 }
 
 static void
@@ -594,16 +596,18 @@ _ibar_icon_fill(IBar_Icon *ic)
 {
    /* TODO: Correct icon size! */
    if (ic->o_icon) evas_object_del(ic->o_icon);
-   ic->o_icon = e_util_desktop_icon_add(ic->app, 48, evas_object_evas_get(ic->ibar->o_box));
+   ic->o_icon = e_util_desktop_icon_add(ic->app, 48, 
+                                        evas_object_evas_get(ic->ibar->o_box));
    edje_object_part_swallow(ic->o_holder, "e.swallow.content", ic->o_icon);
    evas_object_pass_events_set(ic->o_icon, 1);
    evas_object_show(ic->o_icon);
    if (ic->o_icon2) evas_object_del(ic->o_icon2);
-   ic->o_icon2 = e_util_desktop_icon_add(ic->app, 48, evas_object_evas_get(ic->ibar->o_box));
+   ic->o_icon2 = e_util_desktop_icon_add(ic->app, 48, 
+                                         evas_object_evas_get(ic->ibar->o_box));
    edje_object_part_swallow(ic->o_holder2, "e.swallow.content", ic->o_icon2);
    evas_object_pass_events_set(ic->o_icon2, 1);
    evas_object_show(ic->o_icon2);
-   
+
    switch (ic->ibar->inst->ci->eap_label) 
      {
       case 0: /* Eap Name */
@@ -650,15 +654,14 @@ _ibar_cb_app_change(void *data, E_Order *eo)
    _ibar_empty(b);
    _ibar_fill(b);
    _ibar_resize_handle(b);
-   if (b->inst)
-     _gc_orient(b->inst->gcc, -1);
+   if (b->inst) _gc_orient(b->inst->gcc, -1);
 }
 
 static void
 _ibar_cb_obj_moveresize(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Instance *inst;
-   
+
    inst = data;
    _ibar_resize_handle(inst->ibar);
    _ibar_instance_drop_zone_recalc(inst);
@@ -688,10 +691,9 @@ static void
 _ibar_cb_menu_icon_properties(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    IBar_Icon *ic;
-   
+
    ic = data;
-   e_desktop_edit(ic->ibar->inst->gcc->gadcon->zone->container,
-	 ic->app);
+   e_desktop_edit(ic->ibar->inst->gcc->gadcon->zone->container, ic->app);
 }
 
 static void
@@ -699,7 +701,7 @@ _ibar_cb_menu_icon_remove(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    IBar_Icon *ic;
    E_Gadcon_Client *gc;
-   
+
    ic = data;
    ic->ibar->icons = eina_list_remove(ic->ibar->icons, ic);
    _ibar_resize_handle(ic->ibar);
@@ -713,7 +715,7 @@ static void
 _ibar_cb_menu_configuration(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    IBar *b;
- 
+
    b = data;
    _config_ibar_module(b->inst->ci);
 }
@@ -722,7 +724,7 @@ static void
 _ibar_cb_menu_add(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    IBar *b;
-   
+
    b = data;
    e_configure_registry_call("internal/ibar_other",
 			     b->inst->gcc->gadcon->zone->container,
@@ -742,7 +744,7 @@ _ibar_cb_icon_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_In *ev;
    IBar_Icon *ic;
-   
+
    ev = event_info;
    ic = data;
    _ibar_icon_signal_emit(ic, "e,state,focused", "e");
@@ -755,7 +757,7 @@ _ibar_cb_icon_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_Out *ev;
    IBar_Icon *ic;
-   
+
    ev = event_info;
    ic = data;
    _ibar_icon_signal_emit(ic, "e,state,unfocused", "e");
@@ -768,7 +770,7 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info
 {
    Evas_Event_Mouse_Down *ev;
    IBar_Icon *ic;
-   
+
    ev = event_info;
    ic = data;
    if (ev->button == 1)
@@ -794,7 +796,7 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info
 	e_menu_item_label_set(mi, _("Change Icon Properties"));
 	e_util_menu_item_theme_icon_set(mi, "configure");
 	e_menu_item_callback_set(mi, _ibar_cb_menu_icon_properties, ic);
-	
+
 	mi = e_menu_item_new(mn);
 	e_menu_item_label_set(mi, _("Remove Icon"));
 	e_util_menu_item_theme_icon_set(mi, "list-remove");
@@ -833,9 +835,8 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info
 	     e_util_menu_item_theme_icon_set(mi, "list-add");
 	     e_menu_item_callback_set(mi, _ibar_cb_menu_add, ic->ibar);
 	  }
-	
+
 	e_gadcon_client_util_menu_items_append(ic->ibar->inst->gcc, mn, 0);
-	
 	e_gadcon_canvas_zone_geometry_get(ic->ibar->inst->gcc->gadcon,
 					  &cx, &cy, NULL, NULL);
 	e_menu_activate_mouse(mn,
@@ -850,7 +851,7 @@ _ibar_cb_icon_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_Up *ev;
    IBar_Icon *ic;
-   
+
    ev = event_info;
    ic = data;
    if ((ev->button == 1) && (!ic->drag.dnd) && (ic->mouse_down == 1))
@@ -883,7 +884,7 @@ _ibar_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info
 {
    Evas_Event_Mouse_Move *ev;
    IBar_Icon *ic;
-   
+
    ev = event_info;
    ic = data;
    if (ic->drag.start)
@@ -930,7 +931,7 @@ _ibar_cb_icon_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    IBar_Icon *ic;
    Evas_Coord x, y;
-   
+
    ic = data;
    evas_object_geometry_get(ic->o_holder, &x, &y, NULL, NULL);
    evas_object_move(ic->o_holder2, x, y);
@@ -942,7 +943,7 @@ _ibar_cb_icon_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    IBar_Icon *ic;
    Evas_Coord w, h;
-   
+
    ic = data;
    evas_object_geometry_get(ic->o_holder, NULL, NULL, &w, &h);
    evas_object_resize(ic->o_holder2, w, h);
@@ -954,7 +955,7 @@ _ibar_cb_drop_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    IBar *b;
    Evas_Coord x, y;
-   
+
    b = data;
    evas_object_geometry_get(b->o_drop, &x, &y, NULL, NULL);
    evas_object_move(b->o_drop_over, x, y);
@@ -965,7 +966,7 @@ _ibar_cb_drop_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    IBar *b;
    Evas_Coord w, h;
-   
+
    b = data;
    evas_object_geometry_get(b->o_drop, NULL, NULL, &w, &h);
    evas_object_resize(b->o_drop_over, w, h);
@@ -992,8 +993,7 @@ _ibar_drop_position_update(Instance *inst, Evas_Coord x, Evas_Coord y)
    inst->ibar->dnd_x = x;
    inst->ibar->dnd_y = y;
 
-   if (inst->ibar->o_drop)
-      e_box_unpack(inst->ibar->o_drop);
+   if (inst->ibar->o_drop) e_box_unpack(inst->ibar->o_drop);
    evas_object_geometry_get(inst->ibar->o_box, &xx, &yy, NULL, NULL);
    e_box_align_pixel_offset_get(inst->gcc->o_box, &ox, &oy);
    ic = _ibar_icon_at_coord(inst->ibar, x + xx + ox, y + yy + oy);
@@ -1002,7 +1002,7 @@ _ibar_drop_position_update(Instance *inst, Evas_Coord x, Evas_Coord y)
     * from dropping in the very last spot in the ibar. This is not
     * necessarily a good way to solve the problem however it is by far
     * the simplest. */
-   if (inst->gcc->autoscroll && ic)
+   if ((inst->gcc->autoscroll) && (ic))
      {
 	 double ax,ay;
 
@@ -1022,7 +1022,7 @@ _ibar_drop_position_update(Instance *inst, Evas_Coord x, Evas_Coord y)
      {
 	Evas_Coord ix, iy, iw, ih;
 	int before = 0;
-	
+
 	evas_object_geometry_get(ic->o_holder, &ix, &iy, &iw, &ih);
 	if (e_box_orientation_get(inst->ibar->o_box))
 	  {
@@ -1056,15 +1056,17 @@ _ibar_inst_cb_enter(void *data, const char *type, void *event_info)
    E_Event_Dnd_Enter *ev;
    Instance *inst;
    Evas_Object *o, *o2;
-   
+
    ev = event_info;
    inst = data;
    o = edje_object_add(evas_object_evas_get(inst->ibar->o_box));
    inst->ibar->o_drop = o;
    o2 = edje_object_add(evas_object_evas_get(inst->ibar->o_box));
    inst->ibar->o_drop_over = o2;
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOVE, _ibar_cb_drop_move, inst->ibar);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE, _ibar_cb_drop_resize, inst->ibar);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOVE, 
+                                  _ibar_cb_drop_move, inst->ibar);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE, 
+                                  _ibar_cb_drop_resize, inst->ibar);
    e_theme_edje_object_set(o, "base/theme/modules/ibar",
 			   "e/modules/ibar/drop");
    e_theme_edje_object_set(o2, "base/theme/modules/ibar",
@@ -1086,7 +1088,6 @@ _ibar_inst_cb_move(void *data, const char *type, void *event_info)
 
    ev = event_info;
    inst = data;
-
    _ibar_drop_position_update(inst, ev->x, ev->y);
    e_gadcon_client_autoscroll_update(inst->gcc, ev->x, ev->y);
 }
@@ -1096,7 +1097,7 @@ _ibar_inst_cb_leave(void *data, const char *type, void *event_info)
 {
    E_Event_Dnd_Leave *ev;
    Instance *inst;
-   
+
    ev = event_info;
    inst = data;
    inst->ibar->ic_drop_before = NULL;
@@ -1117,33 +1118,29 @@ _ibar_inst_cb_drop(void *data, const char *type, void *event_info)
    Efreet_Desktop *app = NULL;
    Eina_List *fl = NULL;
    IBar_Icon *ic;
-   
+
    ev = event_info;
    inst = data;
 
    if (!strcmp(type, "enlightenment/desktop"))
-     {
-	app = ev->data;
-     }
+     app = ev->data;
    else if (!strcmp(type, "enlightenment/border"))
      {
 	E_Border *bd;
 
 	bd = ev->data;
 	app = bd->desktop;
-
 	if (!app)
 	  {
 	     app = e_desktop_border_create(bd);
 	     efreet_desktop_save(app);
-	     e_desktop_edit(e_container_current_get(e_manager_current_get()), app);
+	     e_desktop_edit(e_container_current_get(e_manager_current_get()), 
+                            app);
 	  }
      }
    else if (!strcmp(type, "text/uri-list"))
-     {
-	fl = ev->data;
-     }
-   
+     fl = ev->data;
+
    ic = inst->ibar->ic_drop_before;
    if (ic)
      {
@@ -1152,6 +1149,7 @@ _ibar_inst_cb_drop(void *data, const char *type, void *event_info)
 	  {
 	     const Eina_List *l;
 	     IBar_Icon *ic2;
+
 	     EINA_LIST_FOREACH(inst->ibar->icons, l, ic2)
 	       {
 		  if (ic2 == ic)
@@ -1189,16 +1187,12 @@ _ibar_inst_cb_drop(void *data, const char *type, void *event_info)
    _ibar_empty_handle(inst->ibar);
    _ibar_resize_handle(inst->ibar);
    _gc_orient(inst->gcc, -1);
-
 }
 
-/***************************************************************************/
-/**/
 /* module setup */
 EAPI E_Module_Api e_modapi =
 {
-   E_MODULE_API_VERSION,
-     "IBar"
+   E_MODULE_API_VERSION, "IBar"
 };
 
 EAPI void *
@@ -1213,20 +1207,20 @@ e_modapi_init(E_Module *m)
    E_CONFIG_VAL(D, T, dir, STR);
    E_CONFIG_VAL(D, T, show_label, INT);
    E_CONFIG_VAL(D, T, eap_label, INT);
-   
+
    conf_edd = E_CONFIG_DD_NEW("IBar_Config", Config);
 #undef T
 #undef D
 #define T Config
 #define D conf_edd
    E_CONFIG_LIST(D, T, items, conf_item_edd);
-   
+
    ibar_config = e_config_domain_load("module.ibar", conf_edd);
-   
+
    if (!ibar_config)
      {
 	Config_Item *ci;
-	
+
 	ibar_config = E_NEW(Config, 1);
 
 	ci = E_NEW(Config_Item, 1);
@@ -1241,6 +1235,7 @@ e_modapi_init(E_Module *m)
 	Eina_List *removes = NULL;
 	const Eina_List *l;
 	Config_Item *ci;
+
 	EINA_LIST_FOREACH(ibar_config->items, l, ci)
 	  {
 	     if (!ci->id)
@@ -1251,6 +1246,7 @@ e_modapi_init(E_Module *m)
 	       {
 		  const Eina_List *ll;
 		  Config_Item *ci2;
+
 		  EINA_LIST_FOREACH(l->next, ll, ci2)
 		    {
 		       if ((ci2->id) && (!strcmp(ci->id, ci2->id)))
@@ -1266,18 +1262,19 @@ e_modapi_init(E_Module *m)
 	     ibar_config->items = eina_list_remove(ibar_config->items, ci);
 	     if (ci->id) eina_stringshare_del(ci->id);
 	     if (ci->dir) eina_stringshare_del(ci->dir);
-	     free(ci);
-	  }
+	     E_FREE(ci);
+          }
 	EINA_LIST_FOREACH(ibar_config->items, l, ci)
           {
 	     if (ci->id)
 	       {
 		  const char *p;
+
 		  p = strrchr(ci->id, '.');
 		  if (p)
 		    {
 		       int id;
-		       
+
 		       id = atoi(p + 1);
 		       if (id > uuid) uuid = id;
 		    }
@@ -1287,9 +1284,11 @@ e_modapi_init(E_Module *m)
  
    ibar_config->module = m;
 
-   ibar_config->handlers = eina_list_append(ibar_config->handlers,
-					    ecore_event_handler_add(E_EVENT_CONFIG_ICON_THEME, _ibar_cb_config_icon_theme, NULL));
-   
+   ibar_config->handlers = 
+     eina_list_append(ibar_config->handlers,
+                      ecore_event_handler_add(E_EVENT_CONFIG_ICON_THEME, 
+                                              _ibar_cb_config_icon_theme, NULL));
+
    e_gadcon_provider_register(&_gadcon_class);
    return m;
 }
@@ -1297,12 +1296,14 @@ e_modapi_init(E_Module *m)
 EAPI int
 e_modapi_shutdown(E_Module *m)
 {
+   Ecore_Event_Handler *eh;
+   Config_Item *ci;
+
    e_gadcon_provider_unregister(&_gadcon_class);
 
    if (ibar_config->config_dialog)
      e_object_del(E_OBJECT(ibar_config->config_dialog));
 
-   Ecore_Event_Handler *eh;
    EINA_LIST_FREE(ibar_config->handlers, eh)
      ecore_event_handler_del(eh);
 
@@ -1313,14 +1314,13 @@ e_modapi_shutdown(E_Module *m)
 	ibar_config->menu = NULL;
      }
 
-   Config_Item *ci;
    EINA_LIST_FREE(ibar_config->items, ci)
      {
 	if (ci->id) eina_stringshare_del(ci->id);
 	if (ci->dir) eina_stringshare_del(ci->dir);
-	free(ci);
+	E_FREE(ci);
      }
-   free(ibar_config);
+   E_FREE(ibar_config);
    ibar_config = NULL;
    E_CONFIG_DD_FREE(conf_item_edd);
    E_CONFIG_DD_FREE(conf_edd);
@@ -1344,11 +1344,9 @@ _ibar_cb_config_icon_theme(void *data, int ev_type, void *ev)
      {
 	const Eina_List *l2;
 	IBar_Icon *icon;
+
 	EINA_LIST_FOREACH(inst->ibar->icons, l2, icon)
 	  _ibar_icon_fill(icon);
      }
    return 1;
 }
-
-/**/
-/***************************************************************************/
diff --git a/src/modules/ibox/Makefile.in b/src/modules/ibox/Makefile.in
index df405cb..5b3d280 100644
--- a/src/modules/ibox/Makefile.in
+++ b/src/modules/ibox/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/illume/Makefile.am b/src/modules/illume/Makefile.am
index 1013cc5..b174b1e 100644
--- a/src/modules/illume/Makefile.am
+++ b/src/modules/illume/Makefile.am
@@ -8,7 +8,7 @@ filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
 e-module-$(MODULE).edj module.desktop
 
-EXTRA_DIST = $(files_DATA) $(kbds_DATA) $(dicts_DATA)
+EXTRA_DIST = $(files_DATA)
 
 # the module .so file
 INCLUDES               = -I. \
diff --git a/src/modules/illume/Makefile.in b/src/modules/illume/Makefile.in
index 2b42059..1137633 100644
--- a/src/modules/illume/Makefile.in
+++ b/src/modules/illume/Makefile.in
@@ -279,6 +279,7 @@ 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@
@@ -291,6 +292,7 @@ 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@
@@ -377,7 +379,7 @@ filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
 e-module-$(MODULE).edj module.desktop
 
-EXTRA_DIST = $(files_DATA) $(kbds_DATA) $(dicts_DATA)
+EXTRA_DIST = $(files_DATA)
 
 # the module .so file
 INCLUDES = -I. \
diff --git a/src/modules/illume/dicts/Makefile.in b/src/modules/illume/dicts/Makefile.in
index 65012b1..33f4977 100644
--- a/src/modules/illume/dicts/Makefile.in
+++ b/src/modules/illume/dicts/Makefile.in
@@ -230,6 +230,7 @@ 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@
@@ -242,6 +243,7 @@ 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@
diff --git a/src/modules/illume/e_appwin.c b/src/modules/illume/e_appwin.c
index 1526563..d380940 100644
--- a/src/modules/illume/e_appwin.c
+++ b/src/modules/illume/e_appwin.c
@@ -68,7 +68,7 @@ e_appwin_new(E_Zone *zone, const char *themedir)
    if (!esw) return NULL;
    
    esw->zone = zone;
-   if (themedir) esw->themedir = evas_stringshare_add(themedir);
+   if (themedir) esw->themedir = eina_stringshare_add(themedir);
    
    esw->clickwin = ecore_x_window_input_new(zone->container->win,
 					    zone->x, zone->y, zone->w, zone->h);
@@ -229,7 +229,7 @@ _e_appwin_free(E_Appwin *esw)
    EINA_LIST_FREE(esw->handlers, handle)
      ecore_event_handler_del(handle);
    if (esw->animator) ecore_animator_del(esw->animator);
-   if (esw->themedir) evas_stringshare_del(esw->themedir);
+   if (esw->themedir) eina_stringshare_del(esw->themedir);
    ecore_x_window_free(esw->clickwin);
    e_object_del(E_OBJECT(esw->popup));
    free(esw);
diff --git a/src/modules/illume/e_busycover.c b/src/modules/illume/e_busycover.c
index 976d5b8..00ecc2f 100644
--- a/src/modules/illume/e_busycover.c
+++ b/src/modules/illume/e_busycover.c
@@ -56,7 +56,7 @@ e_busycover_new(E_Zone *zone, const char *themedir)
    if (!esw) return NULL;
    
    esw->zone = zone;
-   if (themedir) esw->themedir = evas_stringshare_add(themedir);
+   if (themedir) esw->themedir = eina_stringshare_add(themedir);
 
    busycovers = eina_list_append(busycovers, esw);
 
@@ -78,8 +78,8 @@ e_busycover_push(E_Busycover *esw, const char *message, const char *icon)
    if (!esw->base_obj) _e_busycover_add_object(esw);
    h = calloc(1, sizeof(E_Busycover_Handle));
    h->busycover = esw;
-   if (message) h->message = evas_stringshare_add(message);
-   if (icon) h->icon = evas_stringshare_add(icon);
+   if (message) h->message = eina_stringshare_add(message);
+   if (icon) h->icon = eina_stringshare_add(icon);
    esw->handles = eina_list_prepend(esw->handles, h);
    edje_object_part_text_set(esw->base_obj, "e.text.label", h->message);
    /* FIXME: handle icon... */
@@ -94,8 +94,8 @@ e_busycover_pop(E_Busycover *esw, E_Busycover_Handle *handle)
    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->message) evas_stringshare_del(handle->message);
-   if (handle->icon) evas_stringshare_del(handle->icon);
+   if (handle->message) eina_stringshare_del(handle->message);
+   if (handle->icon) eina_stringshare_del(handle->icon);
    free(handle);
    if (esw->handles)
      {
@@ -121,7 +121,7 @@ _e_busycover_free(E_Busycover *esw)
    busycovers = eina_list_remove(busycovers, esw);
    EINA_LIST_FREE(esw->handlers, handle)
      ecore_event_handler_del(handle);
-   if (esw->themedir) evas_stringshare_del(esw->themedir);
+   if (esw->themedir) eina_stringshare_del(esw->themedir);
    free(esw);
 }
 
diff --git a/src/modules/illume/e_busywin.c b/src/modules/illume/e_busywin.c
index 1d203f1..32d8b75 100644
--- a/src/modules/illume/e_busywin.c
+++ b/src/modules/illume/e_busywin.c
@@ -42,7 +42,7 @@ e_busywin_new(E_Zone *zone, const char *themedir)
    if (!esw) return NULL;
    
    esw->zone = zone;
-   if (themedir) esw->themedir = evas_stringshare_add(themedir);
+   if (themedir) esw->themedir = eina_stringshare_add(themedir);
    
    esw->clickwin = ecore_x_window_input_new(zone->container->win,
 					    zone->x, zone->y, zone->w, zone->h);
@@ -95,8 +95,8 @@ e_busywin_push(E_Busywin *esw, const char *message, const char *icon)
    E_OBJECT_TYPE_CHECK_RETURN(esw, E_BUSYWIN_TYPE, NULL);
    h = calloc(1, sizeof(E_Busywin_Handle));
    h->busywin = esw;
-   if (message) h->message = evas_stringshare_add(message);
-   if (icon) h->icon = evas_stringshare_add(icon);
+   if (message) h->message = eina_stringshare_add(message);
+   if (icon) h->icon = eina_stringshare_add(icon);
    esw->handles = eina_list_prepend(esw->handles, h);
    edje_object_part_text_set(esw->base_obj, "e.text.label", h->message);
    /* FIXME: handle icon... */
@@ -111,8 +111,8 @@ e_busywin_pop(E_Busywin *esw, E_Busywin_Handle *handle)
    E_OBJECT_TYPE_CHECK(esw, E_BUSYWIN_TYPE);
    if (!eina_list_data_find(esw->handles, handle)) return;
    esw->handles = eina_list_remove(esw->handles, handle);
-   if (handle->message) evas_stringshare_del(handle->message);
-   if (handle->icon) evas_stringshare_del(handle->icon);
+   if (handle->message) eina_stringshare_del(handle->message);
+   if (handle->icon) eina_stringshare_del(handle->icon);
    free(handle);
    if (esw->handles)
      {
@@ -139,7 +139,7 @@ _e_busywin_free(E_Busywin *esw)
 	esw->handlers = eina_list_remove_list(esw->handlers, esw->handlers);
      }
    if (esw->animator) ecore_animator_del(esw->animator);
-   if (esw->themedir) evas_stringshare_del(esw->themedir);
+   if (esw->themedir) eina_stringshare_del(esw->themedir);
    ecore_x_window_free(esw->clickwin);
    e_object_del(E_OBJECT(esw->popup));
    free(esw);
diff --git a/src/modules/illume/e_cfg.c b/src/modules/illume/e_cfg.c
index 641c933..7ae6213 100644
--- a/src/modules/illume/e_cfg.c
+++ b/src/modules/illume/e_cfg.c
@@ -104,7 +104,7 @@ e_cfg_init(E_Module *m)
 	  }
 	if ((illume_cfg->config_version & 0xffff) < 2) // new in minor ver 2
 	  {
-	     illume_cfg->kbd.dict = evas_stringshare_add("English_(US).dic");
+	     illume_cfg->kbd.dict = eina_stringshare_add("English_(US).dic");
 	  }
 	if ((illume_cfg->config_version & 0xffff) < 3) // new in minor ver 3
 	  {
@@ -141,8 +141,8 @@ e_cfg_shutdown(void)
    e_configure_registry_item_del("display/power");
    e_configure_registry_item_del("display/launcher");
    e_configure_registry_category_del("display");
-   if (illume_cfg->kbd.run_keyboard) evas_stringshare_del(illume_cfg->kbd.run_keyboard);
-   if (illume_cfg->kbd.dict) evas_stringshare_del(illume_cfg->kbd.dict);
+   if (illume_cfg->kbd.run_keyboard) eina_stringshare_del(illume_cfg->kbd.run_keyboard);
+   if (illume_cfg->kbd.dict) eina_stringshare_del(illume_cfg->kbd.dict);
    free(illume_cfg);
    E_CONFIG_DD_FREE(conf_edd);
    illume_cfg = NULL;
@@ -858,7 +858,7 @@ _e_cfg_gadgets_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	
    EINA_LIST_FREE(gadits, gi)
      {
-	evas_stringshare_del(gi->name);
+	eina_stringshare_del(gi->name);
 	free(gi);
      }
    e_object_unref(E_OBJECT(local_slipshelf));
@@ -897,7 +897,7 @@ _e_cfg_gadgets_ui(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdata)
 	
 	gi = E_NEW(Gadit, 1);
 	gi->gc = local_slipshelf->gadcon;
-	gi->name = evas_stringshare_add(cc->name);
+	gi->name = eina_stringshare_add(cc->name);
 	gi->was_enabled = on;
 	gi->enabled = on;
 	gadits = eina_list_append(gadits, gi);
@@ -928,7 +928,7 @@ _e_cfg_gadgets_ui(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdata)
 	
 	gi = E_NEW(Gadit, 1);
 	gi->gc = local_slipshelf->gadcon_extra;
-	gi->name = evas_stringshare_add(cc->name);
+	gi->name = eina_stringshare_add(cc->name);
 	gi->was_enabled = on;
 	gi->enabled = on;
 	gadits = eina_list_append(gadits, gi);
@@ -972,7 +972,7 @@ static int _e_cfg_keyboard_change_timeout(void *data)
    illume_cfg->kbd.use_internal = 0;
    if (illume_cfg->kbd.run_keyboard)
      {
-	evas_stringshare_del(illume_cfg->kbd.run_keyboard);
+	eina_stringshare_del(illume_cfg->kbd.run_keyboard);
 	illume_cfg->kbd.run_keyboard = NULL;
      }
    if (external_keyboard == 0)
@@ -1001,7 +1001,7 @@ static int _e_cfg_keyboard_change_timeout(void *data)
 		  if (nn == external_keyboard)
 		    {
 		       if (dname)
-			 illume_cfg->kbd.run_keyboard = evas_stringshare_add(dname);
+			 illume_cfg->kbd.run_keyboard = eina_stringshare_add(dname);
 		       break;
 		    }
 		  nn++;
@@ -1940,7 +1940,7 @@ _dbcb_keyboard_set(E_DBus_Object *obj, DBusMessage *msg)
 	illume_cfg->kbd.use_internal = 0;
 	if (illume_cfg->kbd.run_keyboard)
 	  {
-	     evas_stringshare_del(illume_cfg->kbd.run_keyboard);
+	     eina_stringshare_del(illume_cfg->kbd.run_keyboard);
 	     illume_cfg->kbd.run_keyboard = NULL;
 	  }
 	if (!strcmp(s, "none"))
@@ -1948,7 +1948,7 @@ _dbcb_keyboard_set(E_DBus_Object *obj, DBusMessage *msg)
 	else if (!strcmp(s, "internal"))
 	  illume_cfg->kbd.use_internal = 1;
 	else
-	  illume_cfg->kbd.run_keyboard = evas_stringshare_add(s);
+	  illume_cfg->kbd.run_keyboard = eina_stringshare_add(s);
 	e_mod_win_cfg_kbd_update();
 	e_config_save_queue();
 	return dbus_message_new_method_return(msg);
diff --git a/src/modules/illume/e_flaunch.c b/src/modules/illume/e_flaunch.c
index dcdb703..0772f79 100644
--- a/src/modules/illume/e_flaunch.c
+++ b/src/modules/illume/e_flaunch.c
@@ -44,7 +44,7 @@ static void
 _e_flaunch_button_del(E_Flaunch_App *fla)
 {
    evas_object_del(fla->obj);
-   if (fla->desktop) evas_stringshare_del(fla->desktop);
+   if (fla->desktop) eina_stringshare_del(fla->desktop);
    free(fla);
 }
 
@@ -71,7 +71,7 @@ _e_flaunch_app_add(E_Flaunch *fl, const char *deskfile)
    desktop = efreet_util_desktop_file_id_find(deskfile);
    if (desktop) label = desktop->name;
    fla = _e_fluanch_button_add(fl, label, 1, _e_fluanch_cb_app_button, NULL);
-   if (deskfile) fla->desktop = evas_stringshare_add(deskfile);
+   if (deskfile) fla->desktop = eina_stringshare_add(deskfile);
    fl->apps = eina_list_append(fl->apps, fla);
    e_box_pack_end(fl->app_box_obj, fla->obj);
    e_box_pack_options_set(fla->obj, 1, 1, 1, 1, 0.5, 0.5, 0, 0, 9999, 9999);
@@ -153,7 +153,7 @@ _e_flaunch_free(E_Flaunch *fl)
    if (fl->repopulate_timer) ecore_timer_del(fl->repopulate_timer);
    _e_flaunch_apps_clear(fl);
    _e_flaunch_button_del(fl->start_button);
-   evas_stringshare_del(fl->themedir);
+   eina_stringshare_del(fl->themedir);
    evas_object_del(fl->app_box_obj);
    evas_object_del(fl->box_obj);
    EINA_LIST_FREE(fl->handlers, handle)
@@ -233,7 +233,7 @@ e_flaunch_new(E_Zone *zone, const char *themedir)
    if (!fl) return NULL;
    fl->zone = zone;
    
-   fl->themedir = evas_stringshare_add(themedir);
+   fl->themedir = eina_stringshare_add(themedir);
 
    // FIXME: height should become config
    fl->height = 30 * e_scale;
diff --git a/src/modules/illume/e_kbd.c b/src/modules/illume/e_kbd.c
index 3bad3fc..2855674 100644
--- a/src/modules/illume/e_kbd.c
+++ b/src/modules/illume/e_kbd.c
@@ -465,15 +465,14 @@ _e_kbd_cb_border_hook_pre_post_fetch(void *data, E_Border *bd)
 		    {
 		       if (bd->bordername)
 			 {
-			    evas_stringshare_del(bd->bordername);
+			    eina_stringshare_del(bd->bordername);
 			    bd->bordername = NULL;
 			    bd->client.border.changed = 1;
 			 }
 		       e_remember_unuse(bd->remember);
 		       bd->remember = NULL;
 		    }
-		  if (bd->bordername) evas_stringshare_del(bd->bordername);
-		  bd->bordername = evas_stringshare_add("borderless");
+		  eina_stringshare_replace(&bd->bordername, "borderless");
 		  bd->client.border.changed = 1;
 		  return;
 	       }
@@ -485,15 +484,14 @@ _e_kbd_cb_border_hook_pre_post_fetch(void *data, E_Border *bd)
 		    {
 		       if (bd->bordername)
 			 {
-			    evas_stringshare_del(bd->bordername);
+			    eina_stringshare_del(bd->bordername);
 			    bd->bordername = NULL;
 			    bd->client.border.changed = 1;
 			 }
 		       e_remember_unuse(bd->remember);
 		       bd->remember = NULL;
 		    }
-		  if (bd->bordername) evas_stringshare_del(bd->bordername);
-		  bd->bordername = evas_stringshare_add("borderless");
+		  eina_stringshare_replace(&bd->bordername, "borderless");
 		  bd->client.border.changed = 1;
 		  return;
 	       }
@@ -673,7 +671,7 @@ _e_kbd_dbus_keyboard_add(const char *udi)
      if (!strcmp(str, udi)) return;
 
    _e_kbd_dbus_keyboards = eina_list_append
-     (_e_kbd_dbus_keyboards, evas_stringshare_add(udi));
+     (_e_kbd_dbus_keyboards, eina_stringshare_add(udi));
 }
 
 static void
@@ -685,7 +683,7 @@ _e_kbd_dbus_keyboard_del(const char *udi)
    EINA_LIST_FOREACH(_e_kbd_dbus_keyboards, l, str)
      if (!strcmp(str, udi))
      {
-	  evas_stringshare_del(str);
+	  eina_stringshare_del(str);
 	     _e_kbd_dbus_keyboards = eina_list_remove_list(_e_kbd_dbus_keyboards, l);
 	     return;
 	  }
@@ -827,7 +825,7 @@ _e_kbd_dbus_ignore_keyboards_file_load(const char *file)
 	while (isspace(*p)) p++;
 	if (*p)
 	  _e_kbd_dbus_real_ignore = eina_list_append
-	  (_e_kbd_dbus_real_ignore, evas_stringshare_add(p));
+	  (_e_kbd_dbus_real_ignore, eina_stringshare_add(p));
      }
    fclose(f);
 }
@@ -886,9 +884,9 @@ _e_kbd_dbus_real_kbd_shutdown(void)
 	e_dbus_signal_handler_del(_e_kbd_dbus_conn, _e_kbd_dbus_handler_dev_chg);
      }
    EINA_LIST_FREE(_e_kbd_dbus_real_ignore, str)
-     evas_stringshare_del(str);
+     eina_stringshare_del(str);
    EINA_LIST_FREE(_e_kbd_dbus_keyboards, str)
-     evas_stringshare_del(str);
+     eina_stringshare_del(str);
    _e_kbd_dbus_have_real_keyboard = 0;
 }
 
diff --git a/src/modules/illume/e_kbd_buf.c b/src/modules/illume/e_kbd_buf.c
index 0b9689a..6fc55b3 100644
--- a/src/modules/illume/e_kbd_buf.c
+++ b/src/modules/illume/e_kbd_buf.c
@@ -31,9 +31,9 @@ _e_kbd_buf_layout_unref(E_Kbd_Buf_Layout *kbl)
 	E_Kbd_Buf_Key *ky;
 	
 	ky = kbl->keys->data;
-	if (ky->key) evas_stringshare_del(ky->key);
-	if (ky->key_shift) evas_stringshare_del(ky->key_shift);
-	if (ky->key_capslock) evas_stringshare_del(ky->key_capslock);
+	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);
      }
@@ -46,7 +46,7 @@ _e_kbd_buf_string_matches_clear(E_Kbd_Buf *kb)
    while (kb->string_matches)
      {
 	if (kb->string_matches->data)
-	  evas_stringshare_del(kb->string_matches->data);
+	  eina_stringshare_del(kb->string_matches->data);
 	kb->string_matches = eina_list_remove_list(kb->string_matches, kb->string_matches);
      }
 }
@@ -54,7 +54,7 @@ _e_kbd_buf_string_matches_clear(E_Kbd_Buf *kb)
 static void
 _e_kbd_buf_actual_string_clear(E_Kbd_Buf *kb)
 {
-   if (kb->actual_string) evas_stringshare_del(kb->actual_string);
+   if (kb->actual_string) eina_stringshare_del(kb->actual_string);
    kb->actual_string = NULL;
 }
 
@@ -174,7 +174,7 @@ _e_kbd_buf_actual_string_update(E_Kbd_Buf *kb)
      }
    if (actual)
      {
-	kb->actual_string = evas_stringshare_add(actual);
+	kb->actual_string = eina_stringshare_add(actual);
 	if (actual) free(actual);
      }
 }
@@ -214,7 +214,7 @@ _e_kbd_buf_matches_update(E_Kbd_Buf *kb)
 	     if (!word) break;
 	     if (!_e_kbd_buf_matches_find(kb->string_matches, word))
 	       kb->string_matches = eina_list_append(kb->string_matches,
-						     evas_stringshare_add(word));
+						     eina_stringshare_add(word));
 	     e_kbd_dict_matches_next(dicts[i]);
 	  }
      }
@@ -253,7 +253,7 @@ e_kbd_buf_new(const char *sysdicts, const char *dict)
 
    kb = E_NEW(E_Kbd_Buf, 1);
    if (!kb) return NULL;
-   kb->sysdicts = evas_stringshare_add(sysdicts);
+   kb->sysdicts = eina_stringshare_add(sysdicts);
 
    e_user_dir_concat_static(buf, "dicts");
    if (!ecore_file_exists(buf)) ecore_file_mkpath(buf);
@@ -296,7 +296,7 @@ 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);
-   evas_stringshare_del(kb->sysdicts);
+   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);
@@ -335,7 +335,7 @@ e_kbd_buf_clear(E_Kbd_Buf *kb)
 	E_Kbd_Buf_Keystroke *ks;
 	
 	ks = kb->keystrokes->data;
-	if (ks->key) evas_stringshare_del(ks->key);
+	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);
@@ -384,9 +384,9 @@ e_kbd_buf_layout_key_add(E_Kbd_Buf *kb, const char *key,  const char *key_shift,
    if (!kb->layout) return;
    ky = E_NEW(E_Kbd_Buf_Key, 1);
    if (!ky) return;
-   if (key) ky->key = evas_stringshare_add(key);
-   if (key_shift) ky->key_shift = evas_stringshare_add(key_shift);
-   if (key_capslock) ky->key_capslock = evas_stringshare_add(key_capslock);
+   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;
@@ -419,7 +419,7 @@ e_kbd_buf_pressed_key_add(E_Kbd_Buf *kb, const char *key, int shift, int capsloc
    if (!kb->layout) return;
    ks = E_NEW(E_Kbd_Buf_Keystroke, 1);
    if (!ks) return;
-   ks->key = evas_stringshare_add(key);
+   ks->key = eina_stringshare_add(key);
    if (shift) ks->shift = 1;
    if (capslock) ks->capslock = 1;
    ks->layout = kb->layout;
@@ -516,7 +516,7 @@ e_kbd_buf_backspace(E_Kbd_Buf *kb)
 	E_Kbd_Buf_Keystroke *ks;
 	
 	ks = l->data;
-	if (ks->key) evas_stringshare_del(ks->key);
+	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);
diff --git a/src/modules/illume/e_kbd_dict.c b/src/modules/illume/e_kbd_dict.c
index d7be8d2..9123db6 100644
--- a/src/modules/illume/e_kbd_dict.c
+++ b/src/modules/illume/e_kbd_dict.c
@@ -303,7 +303,7 @@ e_kbd_dict_new(const char *file)
    _e_kbd_normalise_init();
    kd = E_NEW(E_Kbd_Dict, 1);
    if (!kd) return NULL;
-   kd->file.file = evas_stringshare_add(file);
+   kd->file.file = eina_stringshare_add(file);
    if (!kd->file.file)
      {
 	free(kd);
@@ -312,7 +312,7 @@ e_kbd_dict_new(const char *file)
    kd->file.fd = -1;
    if (!_e_kbd_dict_open(kd))
      {
-	evas_stringshare_del(kd->file.file);
+	eina_stringshare_del(kd->file.file);
 	free(kd);
 	return NULL;
      }
@@ -394,7 +394,7 @@ e_kbd_dict_save(E_Kbd_Dict *kd)
 			      {
 				 fprintf(f, "%s %i\n", kw->word, kw->usage);
 				 writeline = 1;
-				 evas_stringshare_del(kw->word);
+				 eina_stringshare_del(kw->word);
 				 free(kw);
 				 kd->changed.writes  = eina_list_remove_list(kd->changed.writes, kd->changed.writes);
 				 writeline = 1;
@@ -406,7 +406,7 @@ e_kbd_dict_save(E_Kbd_Dict *kd)
 				   writeline = 0;
 				 else
 				   writeline = 1;
-				 evas_stringshare_del(kw->word);
+				 eina_stringshare_del(kw->word);
 				 free(kw);
 				 kd->changed.writes  = eina_list_remove_list(kd->changed.writes, kd->changed.writes);
 				 break;
@@ -433,7 +433,7 @@ e_kbd_dict_save(E_Kbd_Dict *kd)
 			    
 	     kw = kd->changed.writes->data;
 	     fprintf(f, "%s %i\n", kw->word, kw->usage);
-	     evas_stringshare_del(kw->word);
+	     eina_stringshare_del(kw->word);
 	     free(kw);
 	     kd->changed.writes  = eina_list_remove_list(kd->changed.writes, kd->changed.writes);
 	  }
@@ -466,7 +466,7 @@ _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 = evas_stringshare_add(word);
+   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)
@@ -641,7 +641,7 @@ e_kbd_dict_word_letter_clear(E_Kbd_Dict *kd)
 	E_Kbd_Dict_Word *kw;
 
 	kw = kd->matches.list->data;
-	evas_stringshare_del(kw->word);
+	eina_stringshare_del(kw->word);
 	free(kw);
 	kd->matches.list = eina_list_remove_list(kd->matches.list, kd->matches.list);
     }
@@ -660,7 +660,7 @@ e_kbd_dict_word_letter_add(E_Kbd_Dict *kd, const char *letter, int dist)
    list = l->data;
    kl = E_NEW(E_Kbd_Dict_Letter, 1);
    if (!kl) return;
-   kl->letter = evas_stringshare_add(letter);
+   kl->letter = eina_stringshare_add(letter);
    kl->dist = dist;
    list = eina_list_append(list, kl);
    l->data = list;
@@ -687,7 +687,7 @@ e_kbd_dict_word_letter_delete(E_Kbd_Dict *kd)
 	E_Kbd_Dict_Letter *kl;
 	
 	kl = list->data;
-	evas_stringshare_del(kl->letter);
+	eina_stringshare_del(kl->letter);
 	free(kl);
 	list = eina_list_remove_list(list, list);
      }
@@ -786,7 +786,7 @@ _e_kbd_dict_matches_lookup_iter(E_Kbd_Dict *kd, Eina_List *word,
 			    w = w2;
 			    b = b2;
 			 }
-		       kw->word = evas_stringshare_add(wd);
+		       kw->word = eina_stringshare_add(wd);
 		       // FIXME: magic combination of distance metric and
 		       // frequency of useage. this is simple now, but could
 		       // be tweaked
@@ -834,7 +834,7 @@ e_kbd_dict_matches_lookup(E_Kbd_Dict *kd)
 	E_Kbd_Dict_Word *kw;
 	
 	kw = kd->matches.list->data;
-	evas_stringshare_del(kw->word);
+	eina_stringshare_del(kw->word);
 	free(kw);
 	kd->matches.list = eina_list_remove_list(kd->matches.list, kd->matches.list);
     }
diff --git a/src/modules/illume/e_kbd_int.c b/src/modules/illume/e_kbd_int.c
index 5930ff1..5fe90c4 100644
--- a/src/modules/illume/e_kbd_int.c
+++ b/src/modules/illume/e_kbd_int.c
@@ -258,7 +258,7 @@ _e_kbd_int_matches_add(E_Kbd_Int *ki, const char *str, int num)
    o = _theme_obj_new(ki->win->evas, ki->themedir,
 		      "e/modules/kbd/match/word");
    km->ki = ki;
-   km->str = evas_stringshare_add(str);
+   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);
@@ -281,7 +281,7 @@ _e_kbd_int_matches_free(E_Kbd_Int *ki)
 	
    EINA_LIST_FREE(ki->matches, km)
      {
-	if (km->str) evas_stringshare_del(km->str);
+	if (km->str) eina_stringshare_del(km->str);
 	evas_object_del(km->obj);
 	free(km);
      }
@@ -862,7 +862,7 @@ _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) evas_stringshare_del(ki->layout.file);
+   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)
@@ -871,9 +871,9 @@ _e_kbd_int_layout_free(E_Kbd_Int *ki)
 	     
 	EINA_LIST_FREE(ky->states, st)
 	  {
-	     if (st->label) evas_stringshare_del(st->label);
-	     if (st->icon) evas_stringshare_del(st->icon);
-	     if (st->out) evas_stringshare_del(st->out);
+	     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);
@@ -896,7 +896,7 @@ _e_kbd_int_layout_parse(E_Kbd_Int *ki, const char *layout)
    f = fopen(layout, "r");
    if (!f) return;
    ki->layout.directory = ecore_file_dir_get(layout);
-   ki->layout.file = evas_stringshare_add(layout);
+   ki->layout.file = eina_stringshare_add(layout);
    while (fgets(buf, sizeof(buf), f))
      {
 	int len;
@@ -954,13 +954,13 @@ _e_kbd_int_layout_parse(E_Kbd_Int *ki, const char *layout)
 	     if (!strcmp(str, "capslock")) st->state = CAPSLOCK;
 	     p = strrchr(label, '.');
 	     if ((p) && (!strcmp(p, ".png")))
-	       st->icon = evas_stringshare_add(label);
+	       st->icon = eina_stringshare_add(label);
 	     else if ((p) && (!strcmp(p, ".edj")))
-	       st->icon = evas_stringshare_add(label);
+	       st->icon = eina_stringshare_add(label);
 	     else
-	       st->label = evas_stringshare_add(label);
+	       st->label = eina_stringshare_add(label);
 	     if (sscanf(buf, "%*s %*s %4000s", str) != 1) continue;
-	     st->out = evas_stringshare_add(str);
+	     st->out = eina_stringshare_add(str);
 	  }
 	if (!strcmp(str, "is_shift")) ky->is_shift = 1;
 	if (!strcmp(str, "is_ctrl")) ky->is_ctrl = 1;
@@ -1053,10 +1053,10 @@ _e_kbd_int_layouts_free(E_Kbd_Int *ki)
 	
    EINA_LIST_FREE(ki->layouts, kil)
      {
-	evas_stringshare_del(kil->path);
-	evas_stringshare_del(kil->dir);
-	evas_stringshare_del(kil->icon);
-	evas_stringshare_del(kil->name);
+	eina_stringshare_del(kil->path);
+	eina_stringshare_del(kil->dir);
+	eina_stringshare_del(kil->icon);
+	eina_stringshare_del(kil->name);
 	free(kil);
      }
 }
@@ -1088,7 +1088,7 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
 	  {
 	     if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
 	       continue;
-	     kbs = eina_list_append(kbs, evas_stringshare_add(buf));
+	     kbs = eina_list_append(kbs, eina_stringshare_add(buf));
 	  }
 	free(file);
      }
@@ -1119,7 +1119,7 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
 	       {
 		  if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
 		    continue;
-		  kbs = eina_list_append(kbs, evas_stringshare_add(buf));
+		  kbs = eina_list_append(kbs, eina_stringshare_add(buf));
 	       }
 	  }
 	free(file);
@@ -1144,13 +1144,13 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
 	       {
 		  p = strrchr(s, '.');
 		  if (p) *p = 0;
-		  kil->name = evas_stringshare_add(s);
+		  kil->name = eina_stringshare_add(s);
 		  free(s);
 	       }
 	     s = ecore_file_dir_get(kil->path);
 	     if (s)
 	       {
-		  kil->dir = evas_stringshare_add(s);
+		  kil->dir = eina_stringshare_add(s);
 		  free(s);
 	       }
 	     f = fopen(kil->path, "r");
@@ -1198,7 +1198,7 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
 			 {
 			    sscanf(buf, "%*s %4000s\n", str);
 			    snprintf(buf, sizeof(buf), "%s/%s", kil->dir, str);
-			    kil->icon = evas_stringshare_add(buf);
+			    kil->icon = eina_stringshare_add(buf);
 			    continue;
 			 }
 		    }
@@ -1330,7 +1330,7 @@ _e_kbd_int_dictlist_down(E_Kbd_Int *ki)
    e_object_del(E_OBJECT(ki->dictlist.popup));
    ki->dictlist.popup = NULL;
    EINA_LIST_FREE(ki->dictlist.matches, str)
-     evas_stringshare_del(str);
+     eina_stringshare_del(str);
 }
 
 static void
@@ -1350,8 +1350,7 @@ _e_kbd_int_cb_dictlist_item_sel(void *data)
 	_e_kbd_int_layout_state_update(ki);
      }
    
-   if (illume_cfg->kbd.dict) evas_stringshare_del(illume_cfg->kbd.dict);
-   illume_cfg->kbd.dict = evas_stringshare_add(str);
+   eina_stringshare_replace(&illume_cfg->kbd.dict, str);
    
    e_kbd_buf_dict_set(ki->kbuf, illume_cfg->kbd.dict);
    
@@ -1410,7 +1409,7 @@ _e_kbd_int_dictlist_up(E_Kbd_Int *ki)
 			      }
 			    pp = strrchr(p, '.');
 			    *pp = 0;
-			    str = evas_stringshare_add(file);
+			    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);
@@ -1445,7 +1444,7 @@ _e_kbd_int_dictlist_up(E_Kbd_Int *ki)
 			      }
 			    pp = strrchr(p, '.');
 			    *pp = 0;
-			    str = evas_stringshare_add(file);
+			    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);
@@ -1493,7 +1492,7 @@ _e_kbd_int_matchlist_down(E_Kbd_Int *ki)
    e_object_del(E_OBJECT(ki->matchlist.popup));
    ki->matchlist.popup = NULL;
    EINA_LIST_FREE(ki->matchlist.matches, str)
-     evas_stringshare_del(str);
+     eina_stringshare_del(str);
 }
 
 static void
@@ -1548,14 +1547,14 @@ _e_kbd_int_matchlist_up(E_Kbd_Int *ki)
 	     str = e_kbd_buf_actual_string_get(ki->kbuf);
 	     if (str)
 	       {
-		  str = evas_stringshare_add(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 = evas_stringshare_add(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);
@@ -1740,9 +1739,9 @@ e_kbd_int_new(const char *themedir, const char *syskbds, const char *sysdicts)
    
    ki = E_NEW(E_Kbd_Int, 1);
    if (!ki) return NULL;
-   if (themedir) ki->themedir = evas_stringshare_add(themedir);
-   if (syskbds) ki->syskbds = evas_stringshare_add(syskbds);
-   if (sysdicts) ki->sysdicts = evas_stringshare_add(sysdicts);
+   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;
@@ -1818,9 +1817,9 @@ e_kbd_int_new(const char *themedir, const char *syskbds, const char *sysdicts)
 EAPI void
 e_kbd_int_free(E_Kbd_Int *ki)
 {
-   if (ki->themedir) evas_stringshare_del(ki->themedir);
-   if (ki->syskbds) evas_stringshare_del(ki->syskbds);
-   if (ki->sysdicts) evas_stringshare_del(ki->sysdicts);
+   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);
diff --git a/src/modules/illume/e_mod_layout.c b/src/modules/illume/e_mod_layout.c
index 6edd4a5..ef13ca4 100644
--- a/src/modules/illume/e_mod_layout.c
+++ b/src/modules/illume/e_mod_layout.c
@@ -388,7 +388,7 @@ _e_mod_layout_cb_hook_post_fetch(void *data, E_Border *bd)
 	  {
 	     if (bd->bordername)
 	       {
-		  evas_stringshare_del(bd->bordername);
+		  eina_stringshare_del(bd->bordername);
 		  bd->bordername = NULL;
 		  bd->client.border.changed = 1;
 	       }
@@ -397,8 +397,7 @@ _e_mod_layout_cb_hook_post_fetch(void *data, E_Border *bd)
 	  }
 	if (!_is_dialog(bd))
 	  {
-	     if (bd->bordername) evas_stringshare_del(bd->bordername);
-	     bd->bordername = evas_stringshare_add("borderless");
+	     eina_stringshare_replace(&bd->bordername, "borderless");
 	     bd->client.border.changed = 1;
 	  }
         bd->client.e.state.centered = 0;
diff --git a/src/modules/illume/e_mod_main.h b/src/modules/illume/e_mod_main.h
index 3e0d4c4..f884cc0 100644
--- a/src/modules/illume/e_mod_main.h
+++ b/src/modules/illume/e_mod_main.h
@@ -1,5 +1,3 @@
-#define D_(str) dgettext(PACKAGE, str)
-
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
diff --git a/src/modules/illume/e_slipshelf.c b/src/modules/illume/e_slipshelf.c
index cf4aaf6..64fde94 100644
--- a/src/modules/illume/e_slipshelf.c
+++ b/src/modules/illume/e_slipshelf.c
@@ -71,7 +71,7 @@ e_slipshelf_new(E_Zone *zone, const char *themedir)
    if (!ess) return NULL;
    
    ess->zone = zone;
-   if (themedir) ess->themedir = evas_stringshare_add(themedir);
+   if (themedir) ess->themedir = eina_stringshare_add(themedir);
    
    ess->clickwin = ecore_x_window_input_new(zone->container->win,
 					    zone->x, zone->y, zone->w, zone->h);
@@ -427,11 +427,7 @@ e_slipshelf_default_title_set(E_Slipshelf *ess, const char *title)
 {
    E_OBJECT_CHECK(ess);
    E_OBJECT_TYPE_CHECK(ess, E_SLIPSHELF_TYPE);
-   if (ess->default_title) evas_stringshare_del(ess->default_title);
-   if (title)
-     ess->default_title = evas_stringshare_add(title);
-   else
-     ess->default_title = NULL;
+   eina_stringshare_replace(&ess->default_title, title);
    if (!ess->focused_border)
      edje_object_part_text_set(ess->base_obj, "e.text.label",
 			       ess->default_title);
@@ -468,8 +464,8 @@ _e_slipshelf_free(E_Slipshelf *ess)
    EINA_LIST_FREE(ess->handlers, handle)
      ecore_event_handler_del(handle);
    if (ess->animator) ecore_animator_del(ess->animator);
-   if (ess->themedir) evas_stringshare_del(ess->themedir);
-   if (ess->default_title) evas_stringshare_del(ess->default_title);
+   if (ess->themedir) eina_stringshare_del(ess->themedir);
+   if (ess->default_title) eina_stringshare_del(ess->default_title);
    if (ess->clickwin) ecore_x_window_free(ess->clickwin);
    e_object_del(E_OBJECT(ess->popup));
    free(ess);
diff --git a/src/modules/illume/e_slipwin.c b/src/modules/illume/e_slipwin.c
index 4427e48..8e305e9 100644
--- a/src/modules/illume/e_slipwin.c
+++ b/src/modules/illume/e_slipwin.c
@@ -56,7 +56,7 @@ e_slipwin_new(E_Zone *zone, const char *themedir)
    if (!esw) return NULL;
    
    esw->zone = zone;
-   if (themedir) esw->themedir = evas_stringshare_add(themedir);
+   if (themedir) esw->themedir = eina_stringshare_add(themedir);
    
    esw->clickwin = ecore_x_window_input_new(zone->container->win,
 					    zone->x, zone->y, zone->w, zone->h);
@@ -217,7 +217,7 @@ _e_slipwin_free(E_Slipwin *esw)
    EINA_LIST_FREE(esw->handlers, handle)
      ecore_event_handler_del(handle);
    if (esw->animator) ecore_animator_del(esw->animator);
-   if (esw->themedir) evas_stringshare_del(esw->themedir);
+   if (esw->themedir) eina_stringshare_del(esw->themedir);
    ecore_x_window_free(esw->clickwin);
    e_object_del(E_OBJECT(esw->popup));
    free(esw);
diff --git a/src/modules/illume/e_syswin.c b/src/modules/illume/e_syswin.c
index 909882e..9b1c03e 100644
--- a/src/modules/illume/e_syswin.c
+++ b/src/modules/illume/e_syswin.c
@@ -56,7 +56,7 @@ e_syswin_new(E_Zone *zone, const char *themedir)
    if (!esw) return NULL;
    
    esw->zone = zone;
-   if (themedir) esw->themedir = evas_stringshare_add(themedir);
+   if (themedir) esw->themedir = eina_stringshare_add(themedir);
    
    esw->clickwin = ecore_x_window_input_new(zone->container->win,
 					    zone->x, zone->y, zone->w, zone->h);
@@ -217,7 +217,7 @@ _e_syswin_free(E_Syswin *esw)
    EINA_LIST_FREE(esw->handlers, handle)
      ecore_event_handler_del(handle);
    if (esw->animator) ecore_animator_del(esw->animator);
-   if (esw->themedir) evas_stringshare_del(esw->themedir);
+   if (esw->themedir) eina_stringshare_del(esw->themedir);
    ecore_x_window_free(esw->clickwin);
    e_object_del(E_OBJECT(esw->popup));
    free(esw);
diff --git a/src/modules/illume/e_winilist.c b/src/modules/illume/e_winilist.c
index 313010c..0873a37 100644
--- a/src/modules/illume/e_winilist.c
+++ b/src/modules/illume/e_winilist.c
@@ -123,7 +123,7 @@ e_winilist_special_append(Evas_Object *obj, Evas_Object *icon, const char *label
 	s = E_NEW(Special, 1);
 	d->special.prepend = eina_list_prepend(d->special.prepend, s);
 	s->icon = icon;
-	if (label) s->label = evas_stringshare_add(label);
+	if (label) s->label = eina_stringshare_add(label);
 	s->func = func;
 	s->data1 = data1;
 	s->data2 = data2;
@@ -145,7 +145,7 @@ e_winilist_special_prepend(Evas_Object *obj, Evas_Object *icon, const char *labe
 	s = E_NEW(Special, 1);
 	d->special.append = eina_list_append(d->special.append, s);
 	s->icon = icon;
-	if (label) s->label = evas_stringshare_add(label);
+	if (label) s->label = eina_stringshare_add(label);
 	s->func = func;
 	s->data1 = data1;
 	s->data2 = data2;
@@ -211,7 +211,7 @@ _cb_object_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
      }
    while (d->labels)
      {
-	evas_stringshare_del(d->labels->data);
+	eina_stringshare_del(d->labels->data);
 	d->labels = eina_list_remove_list(d->labels, d->labels);
      }
    
@@ -227,7 +227,7 @@ _cb_object_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
 	  }
 	if (s->label)
 	  {
-	     evas_stringshare_del(s->label);
+	     eina_stringshare_del(s->label);
 	     s->label = NULL;
 	  }
 	free(s);
@@ -245,7 +245,7 @@ _cb_object_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
 	  }
 	if (s->label)
 	  {
-	     evas_stringshare_del(s->label);
+	     eina_stringshare_del(s->label);
 	     s->label = NULL;
 	  }
 	free(s);
@@ -353,7 +353,7 @@ _refill(Data *d)
      }
    while (d->labels)
      {
-	evas_stringshare_del(d->labels->data);
+	eina_stringshare_del(d->labels->data);
 	d->labels = eina_list_remove_list(d->labels, d->labels);
      }
    
@@ -386,7 +386,7 @@ _refill(Data *d)
 	else if (bd->client.icccm.title) title = bd->client.icccm.title;
 	e_object_ref(E_OBJECT(bd));
 	d->borders = eina_list_append(d->borders, bd);
-	d->labels = eina_list_append(d->labels, evas_stringshare_add(title));
+	d->labels = eina_list_append(d->labels, eina_stringshare_add(title));
 	e_ilist_append(d->o_ilist, NULL/*icon*/, title, 0,
 		       _cb_item_sel,
 		       NULL, d, bd);
diff --git a/src/modules/illume/keyboards/Makefile.in b/src/modules/illume/keyboards/Makefile.in
index cb18c49..6d2110d 100644
--- a/src/modules/illume/keyboards/Makefile.in
+++ b/src/modules/illume/keyboards/Makefile.in
@@ -230,6 +230,7 @@ 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@
@@ -242,6 +243,7 @@ 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@
diff --git a/src/modules/illume/module.desktop b/src/modules/illume/module.desktop
index 7345edc..62fb3ee 100644
--- a/src/modules/illume/module.desktop
+++ b/src/modules/illume/module.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Type=Link
 Name=Illume
+Name[eo]=Illume
 Name[hu]=Érintő
 Icon=e-module-illume
 X-Enlightenment-ModuleType=system
@@ -9,3 +10,4 @@ Comment[cs]=<title>Illume pro PDA</title><br>Modul, který přemění UI Enlight
 Comment[it]=<title>Illume per embedded</title><br>Questo è un modulo per rendere Enlightenment adatto ai display touchscreen<br>embedded, come sui cellulari e i web-pad, con finestre sempre<br>a tutto schermo e gestori di applicazioni semplificati.
 Comment[hu]=<title>Érints meg</title><br>Ez a modul lehetővé teszi az Enlightenment finomhangolását a különböző érintőképernyő típusokhoz,<br> például telefonokhoz, web-padokhoz,<br> hogy elérhető legyen egy egyszerű alkamazásindító hozzájuk.
 Comment[fr]=<title>Illume pour l'embarqué</title><br>Un module pour adapter Enlightenment aux écrans tactiles comme ceux<br>des téléphones et tablettes internet avec des fenêtres toujours<br>plein écran et disposant d'une gestion simplifiée des applications.
+Comment[eo]=<title>Illume por enkorpigita</title><br>Modulo por adapti Enlightenment en la tuŝekranoj<br>kiel la telefonoj kaj ttt-tabletoj kun fenestroj<br>ĉiam plenekranaj kaj simpligita administrado de<br>aplikaĵoj.
diff --git a/src/modules/illume/module.desktop.in b/src/modules/illume/module.desktop.in
index 7345edc..62fb3ee 100644
--- a/src/modules/illume/module.desktop.in
+++ b/src/modules/illume/module.desktop.in
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Type=Link
 Name=Illume
+Name[eo]=Illume
 Name[hu]=Érintő
 Icon=e-module-illume
 X-Enlightenment-ModuleType=system
@@ -9,3 +10,4 @@ Comment[cs]=<title>Illume pro PDA</title><br>Modul, který přemění UI Enlight
 Comment[it]=<title>Illume per embedded</title><br>Questo è un modulo per rendere Enlightenment adatto ai display touchscreen<br>embedded, come sui cellulari e i web-pad, con finestre sempre<br>a tutto schermo e gestori di applicazioni semplificati.
 Comment[hu]=<title>Érints meg</title><br>Ez a modul lehetővé teszi az Enlightenment finomhangolását a különböző érintőképernyő típusokhoz,<br> például telefonokhoz, web-padokhoz,<br> hogy elérhető legyen egy egyszerű alkamazásindító hozzájuk.
 Comment[fr]=<title>Illume pour l'embarqué</title><br>Un module pour adapter Enlightenment aux écrans tactiles comme ceux<br>des téléphones et tablettes internet avec des fenêtres toujours<br>plein écran et disposant d'une gestion simplifiée des applications.
+Comment[eo]=<title>Illume por enkorpigita</title><br>Modulo por adapti Enlightenment en la tuŝekranoj<br>kiel la telefonoj kaj ttt-tabletoj kun fenestroj<br>ĉiam plenekranaj kaj simpligita administrado de<br>aplikaĵoj.
diff --git a/src/modules/mixer/Makefile.in b/src/modules/mixer/Makefile.in
index 77379b7..1227162 100644
--- a/src/modules/mixer/Makefile.in
+++ b/src/modules/mixer/Makefile.in
@@ -260,6 +260,7 @@ 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@
@@ -272,6 +273,7 @@ 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@
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index 06cf72c..b30de2d 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -384,18 +384,6 @@ _mixer_popup_cb_mute_change(void *data, Evas_Object *obj, void *event)
    _mixer_gadget_update(inst);
 }
 
-static void
-_mixer_popup_cb_resize(Evas_Object *obj, int *w, int *h)
-{
-   int mw, mh;
-
-   e_widget_min_size_get(obj, &mw, &mh);
-   if (mh < 200) mh = 200;
-   if (mw < 60) mw = 60;
-   if (w) *w = (mw + 8);
-   if (h) *h = (mh + 8);
-}
-
 static Evas_Object *
 _mixer_popup_add_slider(E_Mixer_Instance *inst, int value, void (*cb) (void *data, Evas_Object *obj, void *event_info))
 {
@@ -554,6 +542,7 @@ _mixer_popup_new(E_Mixer_Instance *inst)
 {
    E_Mixer_Channel_State *state;
    Evas *evas;
+   Evas_Coord mw, mh;
    int colspan;
 
    if (inst->conf->dialog)
@@ -568,7 +557,7 @@ _mixer_popup_new(E_Mixer_Instance *inst)
    else
       colspan = 1;
 
-   inst->popup = e_gadcon_popup_new(inst->gcc, _mixer_popup_cb_resize);
+   inst->popup = e_gadcon_popup_new(inst->gcc);
    evas = inst->popup->win->evas;
 
    inst->ui.table = e_widget_table_add(evas, 0);
@@ -615,6 +604,11 @@ _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);
+   if (mh < 208) mh = 208;
+   if (mw < 68) mw = 68;
+   e_widget_min_size_set(inst->ui.table, mw, mh);
+
    e_gadcon_popup_content_set(inst->popup, inst->ui.table);
    e_gadcon_popup_show(inst->popup);
    _mixer_popup_input_window_create(inst);
diff --git a/src/modules/mixer/e_mod_main.h b/src/modules/mixer/e_mod_main.h
index dc70340..2341032 100644
--- a/src/modules/mixer/e_mod_main.h
+++ b/src/modules/mixer/e_mod_main.h
@@ -1,5 +1,3 @@
-#define D_(str) dgettext(PACKAGE, str)
-
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
diff --git a/src/modules/mixer/module.desktop b/src/modules/mixer/module.desktop
index 4417e48..189b56a 100644
--- a/src/modules/mixer/module.desktop
+++ b/src/modules/mixer/module.desktop
@@ -2,10 +2,12 @@
 Type=Link
 Name=Mixer
 Name[cs]=Ovládání hlasitosti
+Name[eo]=Sonmiksilo
 Name[fr]=Mélangeur
 Icon=e-module-mixer
 Comment=<title>Mixer Gadget</title><br>A module to provide a mixer for changing volume.
 Comment[cs]=<title>Mixer gadget</title><br>Modul pro ovládání hlasitosti.
+Comment[eo]=<hilight>Sonmiksilo akcesorajxo</hilight><br><br>Modulo de sonmiksilo por sxangxi la sonfortecon.
 Comment[it]=<title>Modulo Mixer</title><br>Un modulo che fornisce un mixer per regolare il volume.
 Comment[fr]=<title>Gadget Mélangeur</title><br>Fournit un mélangeur pour régler le volume.
 X-Enlightenment-ModuleType=system
diff --git a/src/modules/mixer/module.desktop.in b/src/modules/mixer/module.desktop.in
index 4417e48..189b56a 100644
--- a/src/modules/mixer/module.desktop.in
+++ b/src/modules/mixer/module.desktop.in
@@ -2,10 +2,12 @@
 Type=Link
 Name=Mixer
 Name[cs]=Ovládání hlasitosti
+Name[eo]=Sonmiksilo
 Name[fr]=Mélangeur
 Icon=e-module-mixer
 Comment=<title>Mixer Gadget</title><br>A module to provide a mixer for changing volume.
 Comment[cs]=<title>Mixer gadget</title><br>Modul pro ovládání hlasitosti.
+Comment[eo]=<hilight>Sonmiksilo akcesorajxo</hilight><br><br>Modulo de sonmiksilo por sxangxi la sonfortecon.
 Comment[it]=<title>Modulo Mixer</title><br>Un modulo che fornisce un mixer per regolare il volume.
 Comment[fr]=<title>Gadget Mélangeur</title><br>Fournit un mélangeur pour régler le volume.
 X-Enlightenment-ModuleType=system
diff --git a/src/modules/msgbus_lang/Makefile.in b/src/modules/msgbus_lang/Makefile.in
index 26fdd09..17803cd 100644
--- a/src/modules/msgbus_lang/Makefile.in
+++ b/src/modules/msgbus_lang/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/msgbus_lang/module.desktop b/src/modules/msgbus_lang/module.desktop
index 030b95e..9822404 100644
--- a/src/modules/msgbus_lang/module.desktop
+++ b/src/modules/msgbus_lang/module.desktop
@@ -3,6 +3,7 @@ Type=Link
 Name=DBus Extension - Language
 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[hu]=DBus kiterjesztés - Nyelv
@@ -14,6 +15,7 @@ Name[zh_CN]=
 Name[zh_TW]=
 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[hu]=<title>DBus kiterjesztés - Nyelv</title>
diff --git a/src/modules/msgbus_lang/module.desktop.in b/src/modules/msgbus_lang/module.desktop.in
index 030b95e..9822404 100644
--- a/src/modules/msgbus_lang/module.desktop.in
+++ b/src/modules/msgbus_lang/module.desktop.in
@@ -3,6 +3,7 @@ Type=Link
 Name=DBus Extension - Language
 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[hu]=DBus kiterjesztés - Nyelv
@@ -14,6 +15,7 @@ Name[zh_CN]=
 Name[zh_TW]=
 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[hu]=<title>DBus kiterjesztés - Nyelv</title>
diff --git a/src/modules/pager/Makefile.in b/src/modules/pager/Makefile.in
index 165fa9a..dbeb8d0 100644
--- a/src/modules/pager/Makefile.in
+++ b/src/modules/pager/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c
index f291642..29847af 100644
--- a/src/modules/pager/e_mod_config.c
+++ b/src/modules/pager/e_mod_config.c
@@ -8,28 +8,28 @@
 struct _E_Config_Dialog_Data
 {
    struct
-   {
-      int show, urgent_show, urgent_stick;
-      double speed, urgent_speed;
-      int height;
-      int act_height;
-   } popup;
+     {
+        int show, urgent_show, urgent_stick;
+        double speed, urgent_speed;
+        int height;
+        int act_height;
+     } popup;
    int drag_resist, flip_desk, show_desk_names;
    struct
-   {
-      unsigned int drag, noplace, desk;
-   } btn;
+     {
+        unsigned int drag, noplace, desk;
+     } btn;
    struct
-   {
-      Ecore_X_Window bind_win;
-      E_Dialog *dia;
-      Eina_List *hdls;
-      int btn;
-   } grab;
+     {
+        Ecore_X_Window bind_win;
+        E_Dialog *dia;
+        Eina_List *hdls;
+        int btn;
+     } grab;
    struct
-   {
-      Evas_Object *o_btn1, *o_btn2, *o_btn3;
-   } gui;
+     {
+        Evas_Object *o_btn1, *o_btn2, *o_btn3;
+     } gui;
 };
 
 static void *_create_data(E_Config_Dialog *cfd);
@@ -106,7 +106,6 @@ static void
 _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    popup_list = eina_list_free(popup_list);
-
    pager_config->config_dialog = NULL;
    E_FREE(cfdata);
 }
@@ -145,7 +144,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    pager_config->flip_desk = cfdata->flip_desk;
    pager_config->show_desk_names = cfdata->show_desk_names;
    pager_config->popup_urgent = cfdata->popup.urgent_show;
-   /* FIXME: update gui with desk names */
+//   _pager_config_updated();
    e_config_save_queue();
    return 1;
 }
@@ -260,7 +259,7 @@ _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    pager_config->btn_drag = cfdata->btn.drag;
    pager_config->btn_noplace = cfdata->btn.noplace;
    pager_config->btn_desk = cfdata->btn.desk;
-   /* FIXME: update gui with desk names */
+//   _pager_config_updated();
    e_config_save_queue();
    return 1;
 }
@@ -277,9 +276,9 @@ _grab_wnd_show(void *data1, void *data2)
 
    cfdata->grab.btn = 0;
    if ((int)data1 == BUTTON_DRAG)
-      cfdata->grab.btn = 1;
+     cfdata->grab.btn = 1;
    else if ((int)data1 == BUTTON_NOPLACE)
-      cfdata->grab.btn = 2;
+     cfdata->grab.btn = 2;
 
    cfdata->grab.dia = e_dialog_new(e_container_current_get(man), "Pager",
                                    "_pager_button_grab_dialog");
@@ -293,16 +292,16 @@ _grab_wnd_show(void *data1, void *data2)
    e_win_borderless_set(cfdata->grab.dia->win, 1);
 
    cfdata->grab.bind_win = ecore_x_window_input_new(man->root, 0, 0,
-                           man->w, man->h);
+                                                    man->w, man->h);
    ecore_x_window_show(cfdata->grab.bind_win);
    if (!e_grabinput_get(cfdata->grab.bind_win, 0, cfdata->grab.bind_win))
-   {
-      ecore_x_window_free(cfdata->grab.bind_win);
-      cfdata->grab.bind_win = 0;
-      e_object_del(E_OBJECT(cfdata->grab.dia));
-      cfdata->grab.dia = NULL;
-      return;
-   }
+     {
+        ecore_x_window_free(cfdata->grab.bind_win);
+        cfdata->grab.bind_win = 0;
+        e_object_del(E_OBJECT(cfdata->grab.dia));
+        cfdata->grab.dia = NULL;
+        return;
+     }
    hdl = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN,
                                  _grab_cb_key_down, cfdata);
    cfdata->grab.hdls = eina_list_append(cfdata->grab.hdls, hdl);
@@ -326,27 +325,27 @@ _grab_cb_mouse_down(void *data, int type, void *event)
    if (ev->window != cfdata->grab.bind_win) return 1;
 
    if (ev->buttons == cfdata->btn.drag)
-      cfdata->btn.drag = 0;
+     cfdata->btn.drag = 0;
    else if (ev->buttons == cfdata->btn.noplace)
-      cfdata->btn.noplace = 0;
+     cfdata->btn.noplace = 0;
    else if (ev->buttons == cfdata->btn.desk)
-      cfdata->btn.desk = 0;
+     cfdata->btn.desk = 0;
 
    if (cfdata->grab.btn == 1)
-      cfdata->btn.drag = ev->buttons;
+     cfdata->btn.drag = ev->buttons;
    else if (cfdata->grab.btn == 2)
-      cfdata->btn.noplace = ev->buttons;
+     cfdata->btn.noplace = ev->buttons;
    else
-      cfdata->btn.desk = ev->buttons;
+     cfdata->btn.desk = ev->buttons;
 
    if (ev->buttons == 3)
-   {
-      e_util_dialog_show(_("Attetion"),
-                         _("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"));
-   }
+     {
+        e_util_dialog_show(_("Attetion"),
+                           _("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"));
+     }
    _grab_wnd_hide(cfdata);
    return 1;
 }
@@ -362,15 +361,15 @@ _grab_cb_key_down(void *data, int type, void *event)
    if (ev->window != cfdata->grab.bind_win) return 1;
    if (!strcmp(ev->keyname, "Escape")) _grab_wnd_hide(cfdata);
    if (!strcmp(ev->keyname, "Delete"))
-   {
-      if (cfdata->grab.btn == 1)
-         cfdata->btn.drag = 0;
-      else if (cfdata->grab.btn == 2)
-         cfdata->btn.noplace = 0;
-      else
-         cfdata->btn.desk = 0;
-      _grab_wnd_hide(cfdata);
-   }
+     {
+        if (cfdata->grab.btn == 1)
+          cfdata->btn.drag = 0;
+        else if (cfdata->grab.btn == 2)
+          cfdata->btn.noplace = 0;
+        else
+          cfdata->btn.desk = 0;
+        _grab_wnd_hide(cfdata);
+     }
    return 1;
 }
 
@@ -378,17 +377,17 @@ static void
 _grab_wnd_hide(E_Config_Dialog_Data *cfdata)
 {
    while (cfdata->grab.hdls)
-   {
-      ecore_event_handler_del(cfdata->grab.hdls->data);
-      cfdata->grab.hdls = eina_list_remove_list(cfdata->grab.hdls, cfdata->grab.hdls);
-   }
+     {
+        ecore_event_handler_del(cfdata->grab.hdls->data);
+        cfdata->grab.hdls = 
+          eina_list_remove_list(cfdata->grab.hdls, cfdata->grab.hdls);
+     }
    cfdata->grab.hdls = NULL;
    e_grabinput_release(cfdata->grab.bind_win, cfdata->grab.bind_win);
    if (cfdata->grab.bind_win) ecore_x_window_free(cfdata->grab.bind_win);
    cfdata->grab.bind_win = 0;
 
-   if (cfdata->grab.dia)
-      e_object_del(E_OBJECT(cfdata->grab.dia));
+   if (cfdata->grab.dia) e_object_del(E_OBJECT(cfdata->grab.dia));
    cfdata->grab.dia = NULL;
 
    _adv_update_btn_lbl(cfdata);
@@ -401,17 +400,17 @@ _adv_update_btn_lbl(E_Config_Dialog_Data *cfdata)
 
    snprintf(lbl, sizeof(lbl), _("Click to set"));
    if (cfdata->btn.drag)
-      snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.drag);
+     snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.drag);
    e_widget_button_label_set(cfdata->gui.o_btn1, lbl);
-
+   
    snprintf(lbl, sizeof(lbl), _("Click to set"));
    if (cfdata->btn.noplace)
-      snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.noplace);
+     snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.noplace);
    e_widget_button_label_set(cfdata->gui.o_btn2, lbl);
 
    snprintf(lbl, sizeof(lbl), _("Click to set"));
    if (cfdata->btn.desk)
-      snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.desk);
+     snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.desk);
    e_widget_button_label_set(cfdata->gui.o_btn3, lbl);
 }
 
@@ -427,5 +426,5 @@ _cb_disable_check_list(void *data, Evas_Object *obj)
    Evas_Object *o;
 
    EINA_LIST_FOREACH(list, l, o)
-      e_widget_disabled_set(o, !e_widget_check_checked_get(obj));
+     e_widget_disabled_set(o, !e_widget_check_checked_get(obj));
 }
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 4925aef..3f6d8ef 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -25,78 +25,78 @@ static const E_Gadcon_Client_Class _gadcon_class =
 
 /* actual module specifics */
 typedef struct _Instance Instance;
-typedef struct _Pager       Pager;
-typedef struct _Pager_Desk  Pager_Desk;
-typedef struct _Pager_Win   Pager_Win;
+typedef struct _Pager Pager;
+typedef struct _Pager_Desk Pager_Desk;
+typedef struct _Pager_Win Pager_Win;
 typedef struct _Pager_Popup Pager_Popup;
 
 struct _Instance
 {
    E_Gadcon_Client *gcc;
-   Evas_Object     *o_pager; /* table */
-   Pager           *pager;
+   Evas_Object *o_pager; /* table */
+   Pager *pager;
 };
 
 struct _Pager
 {
-   Instance       *inst;
+   Instance *inst;
    E_Drop_Handler *drop_handler;
-   Pager_Popup    *popup;
-   Evas_Object    *o_table;
-   E_Zone         *zone;
-   int             xnum, ynum;
-   Eina_List      *desks;
-   unsigned char   dragging : 1;
-   unsigned char   just_dragged : 1;
-   Evas_Coord      dnd_x, dnd_y;
-   Pager_Desk     *active_drop_pd;
+   Pager_Popup *popup;
+   Evas_Object *o_table;
+   E_Zone *zone;
+   int xnum, ynum;
+   Eina_List *desks;
+   unsigned char dragging : 1;
+   unsigned char just_dragged : 1;
+   Evas_Coord dnd_x, dnd_y;
+   Pager_Desk *active_drop_pd;
 };
 
 struct _Pager_Desk
 {
-   Pager           *pager;
-   E_Desk          *desk;
-   Eina_List       *wins;
-   Evas_Object     *o_desk;
-   Evas_Object     *o_layout;
-   int              xpos, ypos;
-   int              current : 1;
-   int              urgent;
-   struct {
-      Pager         *from_pager;
-      unsigned char  in_pager : 1;
-      unsigned char  start : 1;
-      int            x, y;
-      int            dx, dy;
-      int            button;
-   } drag;
+   Pager *pager;
+   E_Desk *desk;
+   Eina_List *wins;
+   Evas_Object *o_desk;
+   Evas_Object *o_layout;
+   int xpos, ypos;
+   int current : 1;
+   int urgent;
+   struct 
+     {
+        Pager *from_pager;
+        unsigned char in_pager : 1;
+        unsigned char start : 1;
+        int x, y, dx, dy;
+        int button;
+     } drag;
 };
 
 struct _Pager_Win
 {
-   E_Border     *border;
-   Pager_Desk   *desk;
-   Evas_Object  *o_window;
-   Evas_Object  *o_icon;
+   E_Border *border;
+   Pager_Desk *desk;
+   Evas_Object *o_window;
+   Evas_Object *o_icon;
    unsigned char skip_winlist : 1;
-   struct {
-      Pager         *from_pager;
-      unsigned char  start : 1;
-      unsigned char  in_pager : 1;
-      unsigned char  no_place : 1;
-      unsigned char  desktop  : 1;
-      int            x, y;
-      int            dx, dy;
-      int            button;
-   } drag;
+   struct 
+     {
+        Pager *from_pager;
+        unsigned char start : 1;
+        unsigned char in_pager : 1;
+        unsigned char no_place : 1;
+        unsigned char desktop  : 1;
+        int x, y, dx, dy;
+        int button;
+     } drag;
 };
 
 struct _Pager_Popup
 {
-   E_Popup      *popup;
-   Pager        *pager;
-   Evas_Object  *o_bg;
-   Ecore_Timer  *timer;
+   E_Popup *popup;
+   Pager *pager;
+   Evas_Object *o_bg;
+   Ecore_Timer *timer;
    unsigned char urgent : 1;
 };
 
@@ -187,14 +187,11 @@ static Pager_Popup *act_popup = NULL; /* active popup */
 static int hold_count = 0;
 static int hold_mod = 0;
 static E_Desk *current_desk = NULL;
-
 static E_Config_DD *conf_edd = NULL;
-
 static Eina_List *pagers = NULL;
 
 Config *pager_config = NULL;
 
-
 static E_Gadcon_Client *
 _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
 {
@@ -220,9 +217,9 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    evas_object_geometry_get(o, &x, &y, &w, &h);
    p->drop_handler =
    e_drop_handler_add(E_OBJECT(inst->gcc), p,
-			_pager_drop_cb_enter, _pager_drop_cb_move,
-			_pager_drop_cb_leave, _pager_drop_cb_drop,
-			drop, 3, x, y, w, h);
+                      _pager_drop_cb_enter, _pager_drop_cb_move,
+                      _pager_drop_cb_leave, _pager_drop_cb_drop,
+                      drop, 3, x, y, w, h);
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOVE,
 				  _pager_cb_obj_moveresize, inst);
    evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE,
@@ -318,7 +315,7 @@ _pager_fill(Pager *p)
 	for (y = 0; y < p->ynum; y++)
 	  {
 	     Pager_Desk *pd;
-	     E_Desk     *desk;
+	     E_Desk *desk;
 
 	     desk = e_desk_at_xy_get(p->zone, x, y);
 	     pd = _pager_desk_new(p, desk, x, y);
@@ -345,19 +342,17 @@ _pager_empty(Pager *p)
 static Pager_Desk *
 _pager_desk_new(Pager *p, E_Desk *desk, int xpos, int ypos)
 {
-   Pager_Desk    *pd;
-   Evas_Object   *o;
+   Pager_Desk *pd;
+   Evas_Object *o, *evo;
    E_Border_List *bl;
-   E_Border      *bd;
+   E_Border *bd;
 
    pd = E_NEW(Pager_Desk, 1);
    if (!pd) return NULL;
 
    pd->xpos = xpos;
    pd->ypos = ypos;
-
    pd->urgent = 0;
-
    pd->desk = desk;
    e_object_ref(E_OBJECT(desk));
    pd->pager = p;
@@ -368,13 +363,24 @@ _pager_desk_new(Pager *p, E_Desk *desk, int xpos, int ypos)
 			   "e/modules/pager/desk");
    if (pager_config->show_desk_names)
      edje_object_part_text_set(o, "e.text.label", desk->name);
+   else
+     edje_object_part_text_set(o, "e.text.label", "");
+
    e_table_pack(p->o_table, o, xpos, ypos, 1, 1);
    e_table_pack_options_set(o, 1, 1, 1, 1, 0.5, 0.5, 0, 0, -1, -1);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _pager_desk_cb_mouse_down, pd);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _pager_desk_cb_mouse_up, pd);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _pager_desk_cb_mouse_move, pd);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL, _pager_desk_cb_mouse_wheel, pd);
 
+   evo = (Evas_Object *)edje_object_part_object_get(o, "e.eventarea");
+   if (!evo)
+     evo = o;
+
+   evas_object_event_callback_add(evo, EVAS_CALLBACK_MOUSE_DOWN,
+                                  _pager_desk_cb_mouse_down, pd);
+   evas_object_event_callback_add(evo, EVAS_CALLBACK_MOUSE_UP,
+                                  _pager_desk_cb_mouse_up, pd);
+   evas_object_event_callback_add(evo, EVAS_CALLBACK_MOUSE_MOVE,
+                                  _pager_desk_cb_mouse_move, pd);
+   evas_object_event_callback_add(evo, EVAS_CALLBACK_MOUSE_WHEEL,
+                                  _pager_desk_cb_mouse_wheel, pd);
    evas_object_show(o);
 
    o = e_layout_add(evas_object_evas_get(p->o_table));
@@ -387,7 +393,7 @@ _pager_desk_new(Pager *p, E_Desk *desk, int xpos, int ypos)
    bl = e_container_border_list_first(desk->zone->container);
    while ((bd = e_container_border_list_next(bl)))
      {
-	Pager_Win   *pw;
+	Pager_Win *pw;
 
 	if ((bd->new_client) || ((bd->desk != desk) && (!bd->sticky))) continue;
 	pw = _pager_window_new(pd, bd);
@@ -475,10 +481,10 @@ static void
 _pager_desk_switch(Pager_Desk *pd1, Pager_Desk *pd2)
 {
    int c;
-   E_Zone     *zone1, *zone2;
-   E_Desk     *desk1, *desk2;
-   Pager_Win  *pw;
-   Eina_List  *l;
+   E_Zone *zone1, *zone2;
+   E_Desk *desk1, *desk2;
+   Pager_Win *pw;
+   Eina_List *l;
 
    if ((!pd1) || (!pd2) || (!pd1->desk) || (!pd2->desk)) return;
    if (pd1 == pd2) return;
@@ -492,13 +498,13 @@ _pager_desk_switch(Pager_Desk *pd1, Pager_Desk *pd2)
    for (l = pd1->wins; l; l = l->next)
      {
 	pw = l->data;
-	if (!pw || !pw->border || pw->border->iconic) continue;
+	if ((!pw) || (!pw->border) || (pw->border->iconic)) continue;
 	e_border_desk_set(pw->border, desk2);
      }
    for (l = pd2->wins; l; l = l->next)
      {
 	pw = l->data;
-	if (!pw || !pw->border || pw->border->iconic) continue;
+	if ((!pw) || (!pw->border) || (pw->border->iconic)) continue;
 	e_border_desk_set(pw->border, desk1);
      }
 
@@ -575,9 +581,9 @@ _pager_desk_switch(Pager_Desk *pd1, Pager_Desk *pd2)
 static Pager_Win  *
 _pager_window_new(Pager_Desk *pd, E_Border *border)
 {
-   Pager_Win   *pw;
+   Pager_Win *pw;
    Evas_Object *o;
-   int          visible;
+   int visible;
 
    if (!border) return NULL;
    pw = E_NEW(Pager_Win, 1);
@@ -599,11 +605,16 @@ _pager_window_new(Pager_Desk *pd, E_Border *border)
    e_layout_pack(pd->o_layout, pw->o_window);
    e_layout_child_raise(pw->o_window);
 
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN,  _pager_window_cb_mouse_in,  pw);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT, _pager_window_cb_mouse_out, pw);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _pager_window_cb_mouse_down, pw);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _pager_window_cb_mouse_up, pw);
-   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _pager_window_cb_mouse_move, pw);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN,  
+                                  _pager_window_cb_mouse_in,  pw);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT, 
+                                  _pager_window_cb_mouse_out, pw);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, 
+                                  _pager_window_cb_mouse_down, pw);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, 
+                                  _pager_window_cb_mouse_up, pw);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, 
+                                  _pager_window_cb_mouse_move, pw);
 
    o = e_border_icon_add(border, evas_object_evas_get(pd->pager->o_table));
    if (o)
@@ -616,10 +627,8 @@ _pager_window_new(Pager_Desk *pd, E_Border *border)
    if (border->client.icccm.urgent)
      {
 	if (!(border->iconic))
-	  edje_object_signal_emit(pd->o_desk,
-				  "e,state,urgent", "e");
-	edje_object_signal_emit(pw->o_window,
-				"e,state,urgent", "e");
+	  edje_object_signal_emit(pd->o_desk, "e,state,urgent", "e");
+	edje_object_signal_emit(pw->o_window, "e,state,urgent", "e");
      }
 
    evas_object_show(o);
@@ -642,9 +651,10 @@ _pager_window_free(Pager_Win *pw)
 static void
 _pager_window_move(Pager_Win *pw)
 {
-   e_layout_child_move(pw->o_window,
-		       pw->border->x - pw->desk->desk->zone->x,
-		       pw->border->y - pw->desk->desk->zone->y);
+   int zx, zy;
+
+   e_zone_useful_geometry_get(pw->desk->desk->zone, &zx, &zy, NULL, NULL);
+   e_layout_child_move(pw->o_window, pw->border->x - zx, pw->border->y - zy);
    e_layout_child_resize(pw->o_window, pw->border->w, pw->border->h);
 }
 
@@ -668,11 +678,11 @@ _pager_window_find(Pager *p, E_Border *border)
 static Pager_Win *
 _pager_desk_window_find(Pager_Desk *pd, E_Border *border)
 {
-   Eina_List  *l;
+   Eina_List *l;
 
    for (l = pd->wins; l; l = l->next)
      {
-	Pager_Win  *pw;
+	Pager_Win *pw;
 
 	pw = l->data;
 	if (pw->border == border) return pw;
@@ -684,7 +694,7 @@ static Pager_Popup *
 _pager_popup_new(E_Zone *zone, int keyaction)
 {
    Pager_Popup *pp;
-   Evas_Coord w, h;
+   Evas_Coord w, h, zx, zy, zw, zh;
    int x, y, height, width;
    E_Desk *desk;
 
@@ -702,7 +712,6 @@ _pager_popup_new(E_Zone *zone, int keyaction)
 
    pp->pager = _pager_new(pp->popup->evas, zone);
    pp->pager->popup = pp;
-
    pp->urgent = 0;
 
    e_zone_desk_count_get(zone, &x, &y);
@@ -718,8 +727,7 @@ _pager_popup_new(E_Zone *zone, int keyaction)
    evas_object_resize(pp->pager->o_table, width, height);
 
    pp->o_bg = edje_object_add(pp->popup->evas);
-   e_theme_edje_object_set(pp->o_bg,
-			   "base/theme/modules/pager",
+   e_theme_edje_object_set(pp->o_bg, "base/theme/modules/pager",
 			   "e/modules/pager/popup");
    desk = e_desk_current_get(zone);
    if (desk)
@@ -734,8 +742,11 @@ _pager_popup_new(E_Zone *zone, int keyaction)
    evas_object_resize(pp->o_bg, w, h);
    e_popup_edje_bg_object_set(pp->popup, pp->o_bg);
    //e_popup_ignore_events_set(pp->popup, 1);
-   e_popup_move_resize(pp->popup, ((zone->w - w) / 2),
-		       ((zone->h - h) / 2), w, h);
+   e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh);
+   zx -= zone->x;
+   zy -= zone->y;
+   e_popup_move_resize(pp->popup,
+		       zx + ((zw - w) / 2), zy + ((zh - h) / 2), w, h);
    e_bindings_mouse_grab(E_BINDING_CONTEXT_POPUP, pp->popup->evas_win);
    e_bindings_wheel_grab(E_BINDING_CONTEXT_POPUP, pp->popup->evas_win);
 
@@ -767,8 +778,7 @@ _pager_popup_find(E_Zone *zone)
    for (l = pagers; l; l = l->next)
      {
 	p = l->data;
-	if (p->popup && p->zone == zone)
-	  return p->popup;
+	if ((p->popup) && (p->zone == zone)) return p->popup;
      }
    return NULL;
 }
@@ -815,7 +825,8 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 
 	e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);
 
-	e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, NULL, NULL);
+	e_gadcon_canvas_zone_geometry_get(inst->gcc->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,
@@ -856,7 +867,8 @@ _pager_inst_cb_menu_virtual_desktops_dialog(void *data, E_Menu *m, E_Menu_Item *
    Instance *inst;
 
    inst = data;
-   e_configure_registry_call("screen/virtual_desktops", inst->gcc->gadcon->zone->container, NULL);
+   e_configure_registry_call("screen/virtual_desktops", 
+                             inst->gcc->gadcon->zone->container, NULL);
 }
 
 static void
@@ -921,7 +933,7 @@ _pager_cb_event_border_move(void *data, int type, void *event)
 	  }
      }
 
-   if (act_popup && act_popup->pager->zone == ev->border->zone)
+   if ((act_popup) && (act_popup->pager->zone == ev->border->zone))
      {
 	for (l = act_popup->pager->desks; l; l = l->next)
 	  {
@@ -951,11 +963,9 @@ _pager_cb_event_border_add(void *data, int type, void *event)
 	    (_pager_window_find(p, ev->border)))
 	  continue;
 	pd = _pager_desk_find(p, ev->border->desk);
-	if (pd)
-	  {
-	     pw = _pager_window_new(pd, ev->border);
-	     if (pw) pd->wins = eina_list_append(pd->wins, pw);
-	  }
+        if (!pd) continue;
+        pw = _pager_window_new(pd, ev->border);
+        if (pw) pd->wins = eina_list_append(pd->wins, pw);
      }
    return 1;
 }
@@ -978,11 +988,9 @@ _pager_cb_event_border_remove(void *data, int type, void *event)
 	  {
 	     pd = l2->data;
 	     pw = _pager_desk_window_find(pd, ev->border);
-	     if (pw)
-	       {
-		  pd->wins = eina_list_remove(pd->wins, pw);
-		  _pager_window_free(pw);
-	       }
+             if (!pw) continue;
+             pd->wins = eina_list_remove(pd->wins, pw);
+             _pager_window_free(pw);
 	  }
      }
    return 1;
@@ -1006,12 +1014,10 @@ _pager_cb_event_border_iconify(void *data, int type, void *event)
 	  {
 	     pd = l2->data;
 	     pw = _pager_desk_window_find(pd, ev->border);
-	     if (pw)
-	       {
-		  if ((pw->drag.from_pager) && (pw->desk->pager->dragging))
-		    pw->desk->pager->dragging = 0;
-		  evas_object_hide(pw->o_window);
-	       }
+             if (!pw) continue;
+             if ((pw->drag.from_pager) && (pw->desk->pager->dragging))
+               pw->desk->pager->dragging = 0;
+             evas_object_hide(pw->o_window);
 	  }
      }
    return 1;
@@ -1035,7 +1041,7 @@ _pager_cb_event_border_uniconify(void *data, int type, void *event)
 	  {
 	     pd = l2->data;
 	     pw = _pager_desk_window_find(pd, ev->border);
-	     if (pw && !pw->skip_winlist) evas_object_show(pw->o_window);
+	     if ((pw) && (!pw->skip_winlist)) evas_object_show(pw->o_window);
 	  }
      }
    return 1;
@@ -1117,13 +1123,11 @@ _pager_window_desk_change(Pager *pager, E_Border *bd)
 	     pd = l->data;
 	     /* find this border in this desk */
 	     pw = _pager_desk_window_find(pd, bd);
-	     if (pw)
-	       {
-		  /* if it is found - remove it. it does not belong in this
-		   * pager as it probably moves zones */
-		  pd->wins = eina_list_remove(pd->wins, pw);
-		  _pager_window_free(pw);
-	       }
+             if (!pw) continue;
+             /* if it is found - remove it. it does not belong in this
+              * pager as it probably moves zones */
+             pd->wins = eina_list_remove(pd->wins, pw);
+             _pager_window_free(pw);
 	  }
 	return;
      }
@@ -1146,6 +1150,7 @@ _pager_window_desk_change(Pager *pager, E_Border *bd)
 	  {
 	     Pager_Win *pw2 = NULL;
 	     E_Border *bd;
+
 	     /* remove it from whatever desk it was on */
 	     pw->desk->wins = eina_list_remove(pw->desk->wins, pw);
 	     e_layout_unpack(pw->o_window);
@@ -1181,6 +1186,7 @@ _pager_window_desk_change(Pager *pager, E_Border *bd)
 		    {
 		       Pager_Win *pw2 = NULL;
 		       E_Border *bd;
+
 		       pd->wins = eina_list_append(pd->wins, pw);
 		       bd = e_util_desk_border_above(pw->border);
 		       if (bd)
@@ -1205,6 +1211,7 @@ _pager_window_desk_change(Pager *pager, E_Border *bd)
 		    {
 		       Pager_Win *pw2 = NULL;
 		       E_Border *bd;
+
 		       pd->wins = eina_list_append(pd->wins, pw);
 		       bd = e_util_desk_border_above(pw->border);
 		       if (bd)
@@ -1358,15 +1365,14 @@ _pager_cb_event_border_urgent_change(void *data, int type, void *event)
      {
 	pp = _pager_popup_find(zone);
 
-	if (!pp && urgent && !(ev->border->iconic))
+	if ((!pp) && (urgent) && !(ev->border->iconic))
 	  {
 	     pp = _pager_popup_new(zone, 0);
 
 	     if (pp && !pager_config->popup_urgent_stick)
 	       pp->timer = ecore_timer_add(pager_config->popup_urgent_speed,
 					   _pager_popup_cb_timeout, pp);
-	     if (pp)
-	       pp->urgent = 1;
+	     if (pp) pp->urgent = 1;
 	  }
      }
 
@@ -1384,7 +1390,8 @@ _pager_cb_event_border_urgent_change(void *data, int type, void *event)
 		    {
 		       if (!(ev->border->iconic))
 			 {
-			    if (pd->pager && pd->pager->inst && !pager_config->popup_urgent)
+			    if ((pd->pager) && (pd->pager->inst) && 
+                                (!pager_config->popup_urgent))
 			      e_gadcon_urgent_show(pd->pager->inst->gcc->gadcon);
 			    edje_object_signal_emit(pd->o_desk,
 						    "e,state,urgent", "e");
@@ -1637,21 +1644,15 @@ _pager_cb_event_desk_show(void *data, int type, void *event)
 	if (pd) _pager_desk_select(pd);
 
 	if (p->popup)
-	  {
-	     edje_object_part_text_set(p->popup->o_bg, "text", ev->desk->name);
-	  }
+          edje_object_part_text_set(p->popup->o_bg, "text", ev->desk->name);
      }
 
    if (pager_config->popup && !act_popup)
      {
 	if ((pp = _pager_popup_find(ev->desk->zone)))
-	  {
-	     ecore_timer_del(pp->timer);
-	  }
+          ecore_timer_del(pp->timer);
 	else
-	  {
-	     pp = _pager_popup_new(ev->desk->zone, 0);
-	  }
+          pp = _pager_popup_new(ev->desk->zone, 0);
 
 	if (pp)
 	  {
@@ -1690,8 +1691,14 @@ _pager_cb_event_desk_name_change(void *data, int type, void *event)
 	if (pager_config->show_desk_names)
 	  {
 	     if (pd)
-	       edje_object_part_text_set(pd->o_desk, "e.text.label", ev->desk->name);
+	       edje_object_part_text_set(pd->o_desk, "e.text.label", 
+                                         ev->desk->name);
 	  }
+        else 
+          {
+             if (pd)
+               edje_object_part_text_set(pd->o_desk, "e.text.label", "");
+          }
      }
    return 1;
 }
@@ -1760,6 +1767,7 @@ _pager_window_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_i
        (ev->button == pager_config->btn_noplace))
      {
 	Evas_Coord ox, oy;
+
 	evas_object_geometry_get(pw->o_window, &ox, &oy, NULL, NULL);
 	pw->drag.in_pager = 1;
 	pw->drag.x = ev->canvas.x;
@@ -1769,8 +1777,7 @@ _pager_window_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_i
 	pw->drag.start = 1;
 	pw->drag.no_place = 0;
 	pw->drag.button = ev->button;
-	if (ev->button == pager_config->btn_noplace)
-	  pw->drag.no_place = 1;
+	if (ev->button == pager_config->btn_noplace) pw->drag.no_place = 1;
      }
 }
 
@@ -1847,14 +1854,15 @@ _pager_window_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_i
 	pd = _pager_desk_at_coord(pw->desk->pager, mx, my);
 	if ((pd) && (!pw->drag.no_place))
 	  {
+	     int zx, zy;
+
+	     e_zone_useful_geometry_get(pd->desk->zone, &zx, &zy, NULL, NULL);
 	     e_layout_coord_canvas_to_virtual(pd->o_layout,
 					      mx + pw->drag.dx,
 					      my + pw->drag.dy, &vx, &vy);
 	     if (pd != pw->desk)
 	       e_border_desk_set(pw->border, pd->desk);
-	     e_border_move(pw->border,
-			   vx + pd->desk->zone->x,
-			   vy + pd->desk->zone->y);
+	     e_border_move(pw->border, vx + zx, vy + zy);
 	  }
 	else
 	  {
@@ -1915,6 +1923,8 @@ _pager_window_cb_drag_finished(E_Drag *drag, int dropped)
    evas_object_show(pw->o_window);
    if (!dropped)
      {
+	int zx, zy, zw, zh;
+
 	/* wasn't dropped (on pager). move it to position of mouse on screen */
 	cont = e_container_current_get(e_manager_current_get());
 	zone = e_zone_current_get(cont);
@@ -1928,28 +1938,29 @@ _pager_window_cb_drag_finished(E_Drag *drag, int dropped)
 	dx = (pw->border->w / 2);
 	dy = (pw->border->h / 2);
 
+	e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh);
+
 	/* offset so that center of window is on mouse, but keep within desk bounds */
 	if (dx < x)
 	  {
 	     x -= dx;
-	     if ((pw->border->w < zone->w) &&
-		 (x + pw->border->w > zone->x + zone->w))
-	       x -= x + pw->border->w - (zone->x + zone->w);
+	     if ((pw->border->w < zw) &&
+		 (x + pw->border->w > zx + zw))
+	       x -= x + pw->border->w - (zx + zw);
 	  }
 	else x = 0;
 
 	if (dy < y)
 	  {
 	     y -= dy;
-	     if ((pw->border->h < zone->h) &&
-		 (y + pw->border->h > zone->y + zone->h))
-	       y -= y + pw->border->h - (zone->y + zone->h);
+	     if ((pw->border->h < zh) &&
+		 (y + pw->border->h > zy + zh))
+	       y -= y + pw->border->h - (zy + zh);
 	  }
 	else y = 0;
 	e_border_move(pw->border, x, y);
 
-	if (!(pw->border->lock_user_stacking))
-	  e_border_raise(pw->border);
+	if (!(pw->border->lock_user_stacking)) e_border_raise(pw->border);
      }
    if (pw && pw->drag.from_pager) pw->drag.from_pager->dragging = 0;
    pw->drag.from_pager = NULL;
@@ -1957,7 +1968,6 @@ _pager_window_cb_drag_finished(E_Drag *drag, int dropped)
   if (act_popup)
      {
 	e_grabinput_get(input_window, 0, input_window);
-
 	if (!hold_count) _pager_popup_hide(1);
      }
 }
@@ -2037,9 +2047,7 @@ _pager_drop_cb_move(void *data, const char *type, void *event_info)
    _pager_update_drop_position(p, ev->x, ev->y);
 
    if (p->inst)
-     {
-	e_gadcon_client_autoscroll_update(p->inst->gcc, ev->x, ev->y);
-     }
+     e_gadcon_client_autoscroll_update(p->inst->gcc, ev->x, ev->y);
 }
 
 static void
@@ -2108,8 +2116,10 @@ _pager_drop_cb_drop(void *data, const char *type, void *event_info)
 	else if (!strcmp(type, "enlightenment/border"))
 	  {
 	     bd = ev->data;
-	     e_layout_coord_virtual_to_canvas(pd->o_layout, bd->x, bd->y, &wx, &wy);
-	     e_layout_coord_virtual_to_canvas(pd->o_layout, bd->x + bd->w, bd->y + bd->h, &wx2, &wy2);
+	     e_layout_coord_virtual_to_canvas(pd->o_layout, bd->x, bd->y, 
+                                              &wx, &wy);
+	     e_layout_coord_virtual_to_canvas(pd->o_layout, bd->x + bd->w, 
+                                              bd->y + bd->h, &wx2, &wy2);
 	     dx = (wx - wx2) / 2;
 	     dy = (wy - wy2) / 2;
 	  }
@@ -2128,11 +2138,16 @@ _pager_drop_cb_drop(void *data, const char *type, void *event_info)
 	     e_border_desk_set(bd, pd->desk);
 	     if ((!pw) || ((pw) && (!pw->drag.no_place)))
 	       {
+		  int zx, zy;
+
 		  e_layout_coord_canvas_to_virtual(pd->o_layout,
 						   ev->x + xx + x + dx,
 						   ev->y + yy + y + dy,
 						   &nx, &ny);
-		  e_border_move(bd, nx + pd->desk->zone->x, ny + pd->desk->zone->y);
+		  e_zone_useful_geometry_get(pd->desk->zone,
+					     &zx, &zy, NULL, NULL);
+
+		  e_border_move(bd, nx + zx, ny + zy);
 	       }
 	  }
      }
@@ -2198,10 +2213,7 @@ _pager_desk_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
      }
    pd->pager->just_dragged = 0;
 
-   if (p->popup && p->popup->urgent)
-     {
-	_pager_popup_free(p->popup);
-     }
+   if (p->popup && p->popup->urgent) _pager_popup_free(p->popup);
 }
 static void
 _pager_desk_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
@@ -2263,9 +2275,11 @@ _pager_desk_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf
 
 	for (l = pd->wins; l; l = l->next)
 	  {
+	     int zx, zy;
+
 	     pw = l->data;
-	     if (!pw || pw->border->iconic
-		 || pw->border->client.netwm.state.skip_pager)
+	     if ((!pw) || (pw->border->iconic)
+		 || (pw->border->client.netwm.state.skip_pager))
 	       continue;
 
 	     o = edje_object_add(drag->evas);
@@ -2273,9 +2287,9 @@ _pager_desk_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf
 				     "e/modules/pager/window");
 	     e_layout_pack(oo, o);
 	     e_layout_child_raise(o);
-	     e_layout_child_move(o,
-				 pw->border->x - pw->desk->desk->zone->x,
-				 pw->border->y - pw->desk->desk->zone->y);
+	     e_zone_useful_geometry_get(pw->desk->desk->zone,
+					&zx, &zy, NULL, NULL);
+	     e_layout_child_move(o, pw->border->x - zx, pw->border->y - zy);
 	     e_layout_child_resize(o, pw->border->w, pw->border->h);
 	     evas_object_show(o);
 
@@ -2326,10 +2340,9 @@ _pager_desk_cb_drag_finished(E_Drag *drag, int dropped)
      }
    pd->drag.from_pager = NULL;
 
-  if (act_popup)
+   if (act_popup)
      {
 	e_grabinput_get(input_window, 0, input_window);
-
 	if (!hold_count) _pager_popup_hide(1);
      }
 }
@@ -2418,8 +2431,10 @@ _pager_popup_show()
    e_bindings_key_grab(E_BINDING_CONTEXT_POPUP, act_popup->popup->evas_win);
 
    evas_event_freeze(act_popup->popup->evas);
-   evas_event_feed_mouse_in(act_popup->popup->evas, ecore_x_current_time_get(), NULL);
-   evas_event_feed_mouse_move(act_popup->popup->evas, -1000000, -1000000, ecore_x_current_time_get(), NULL);
+   evas_event_feed_mouse_in(act_popup->popup->evas, 
+                            ecore_x_current_time_get(), NULL);
+   evas_event_feed_mouse_move(act_popup->popup->evas, -1000000, -1000000, 
+                              ecore_x_current_time_get(), NULL);
    evas_event_thaw(act_popup->popup->evas);
 
    current_desk = e_desk_current_get(zone);
@@ -2591,7 +2606,7 @@ _pager_popup_cb_key_down(void *data, int type, void *event)
 
    ev = event;
    if (ev->window != input_window) return 1;
-   if      (!strcmp(ev->key, "Up"))
+   if (!strcmp(ev->key, "Up"))
      _pager_popup_desk_switch(0, -1);
    else if (!strcmp(ev->key, "Down"))
      _pager_popup_desk_switch(0, 1);
@@ -2612,14 +2627,20 @@ _pager_popup_cb_key_down(void *data, int type, void *event)
 
 	     bind = l->data;
 
-	     if (bind->action && strcmp(bind->action,"pager_switch")) continue;
+	     if ((bind->action) && (strcmp(bind->action,"pager_switch"))) 
+               continue;
 
-	     if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) mod |= E_BINDING_MODIFIER_SHIFT;
-	     if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL;
-	     if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT;
-	     if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
+	     if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) 
+               mod |= E_BINDING_MODIFIER_SHIFT;
+	     if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) 
+               mod |= E_BINDING_MODIFIER_CTRL;
+	     if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT) 
+               mod |= E_BINDING_MODIFIER_ALT;
+	     if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) 
+               mod |= E_BINDING_MODIFIER_WIN;
 
-	     if (bind->key && (!strcmp(bind->key, ev->keyname)) && ((bind->modifiers == mod)))
+	     if (bind->key && (!strcmp(bind->key, ev->keyname)) && 
+                 ((bind->modifiers == mod)))
 	       {
 		  E_Action *act;
 
@@ -2646,22 +2667,37 @@ _pager_popup_cb_key_up(void *data, int type, void *event)
 
    if (hold_mod)
      {
-	if      ((hold_mod & ECORE_EVENT_MODIFIER_SHIFT) && (!strcmp(ev->key, "Shift_L"))) hold_count--;
-	else if ((hold_mod & ECORE_EVENT_MODIFIER_SHIFT) && (!strcmp(ev->key, "Shift_R"))) hold_count--;
-	else if ((hold_mod & ECORE_EVENT_MODIFIER_CTRL) && (!strcmp(ev->key, "Control_L"))) hold_count--;
-	else if ((hold_mod & ECORE_EVENT_MODIFIER_CTRL) && (!strcmp(ev->key, "Control_R"))) hold_count--;
-	else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) && (!strcmp(ev->key, "Alt_L"))) hold_count--;
-	else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) && (!strcmp(ev->key, "Alt_R"))) hold_count--;
-	else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) && (!strcmp(ev->key, "Meta_L"))) hold_count--;
-	else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) && (!strcmp(ev->key, "Meta_R"))) hold_count--;
-	else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) && (!strcmp(ev->key, "Super_L"))) hold_count--;
-	else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) && (!strcmp(ev->key, "Super_R"))) hold_count--;
-	else if ((hold_mod & ECORE_EVENT_MODIFIER_WIN) && (!strcmp(ev->key, "Super_L"))) hold_count--;
-	else if ((hold_mod & ECORE_EVENT_MODIFIER_WIN) && (!strcmp(ev->key, "Super_R"))) hold_count--;
-	else if ((hold_mod & ECORE_EVENT_MODIFIER_WIN) && (!strcmp(ev->key, "Mode_switch"))) hold_count--;
-	else if ((hold_mod & ECORE_EVENT_MODIFIER_WIN) && (!strcmp(ev->key, "Meta_L"))) hold_count--;
-	else if ((hold_mod & ECORE_EVENT_MODIFIER_WIN) && (!strcmp(ev->key, "Meta_R"))) hold_count--;
-	if (hold_count <= 0 && !act_popup->pager->dragging)
+	if ((hold_mod & ECORE_EVENT_MODIFIER_SHIFT) && 
+            (!strcmp(ev->key, "Shift_L"))) hold_count--;
+	else if ((hold_mod & ECORE_EVENT_MODIFIER_SHIFT) && 
+                 (!strcmp(ev->key, "Shift_R"))) hold_count--;
+	else if ((hold_mod & ECORE_EVENT_MODIFIER_CTRL) && 
+                 (!strcmp(ev->key, "Control_L"))) hold_count--;
+	else if ((hold_mod & ECORE_EVENT_MODIFIER_CTRL) && 
+                 (!strcmp(ev->key, "Control_R"))) hold_count--;
+	else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) && 
+                 (!strcmp(ev->key, "Alt_L"))) hold_count--;
+	else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) && 
+                 (!strcmp(ev->key, "Alt_R"))) hold_count--;
+	else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) && 
+                 (!strcmp(ev->key, "Meta_L"))) hold_count--;
+	else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) && 
+                 (!strcmp(ev->key, "Meta_R"))) hold_count--;
+	else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) && 
+                 (!strcmp(ev->key, "Super_L"))) hold_count--;
+	else if ((hold_mod & ECORE_EVENT_MODIFIER_ALT) && 
+                 (!strcmp(ev->key, "Super_R"))) hold_count--;
+	else if ((hold_mod & ECORE_EVENT_MODIFIER_WIN) && 
+                 (!strcmp(ev->key, "Super_L"))) hold_count--;
+	else if ((hold_mod & ECORE_EVENT_MODIFIER_WIN) && 
+                 (!strcmp(ev->key, "Super_R"))) hold_count--;
+	else if ((hold_mod & ECORE_EVENT_MODIFIER_WIN) && 
+                 (!strcmp(ev->key, "Mode_switch"))) hold_count--;
+	else if ((hold_mod & ECORE_EVENT_MODIFIER_WIN) && 
+                 (!strcmp(ev->key, "Meta_L"))) hold_count--;
+	else if ((hold_mod & ECORE_EVENT_MODIFIER_WIN) && 
+                 (!strcmp(ev->key, "Meta_R"))) hold_count--;
+	if ((hold_count <= 0) && (!act_popup->pager->dragging))
 	  {
 	     _pager_popup_hide(1);
 	     return 1;
@@ -2675,8 +2711,7 @@ _pager_popup_cb_key_up(void *data, int type, void *event)
 /* module setup */
 EAPI E_Module_Api e_modapi =
 {
-   E_MODULE_API_VERSION,
-     "Pager"
+   E_MODULE_API_VERSION, "Pager"
 };
 
 EAPI void *
@@ -2805,16 +2840,21 @@ e_modapi_init(E_Module *m)
    if (act_popup_show)
      {
 	act_popup_show->func.go_key = _pager_popup_cb_action_show;
-	e_action_predef_name_set(N_("Pager"), N_("Show Pager Popup"), "pager_show", "<none>", NULL, 0);
+	e_action_predef_name_set(N_("Pager"), N_("Show Pager Popup"), 
+                                 "pager_show", "<none>", NULL, 0);
      }
    act_popup_switch = e_action_add("pager_switch");
    if (act_popup_switch)
      {
 	act_popup_switch->func.go_key = _pager_popup_cb_action_switch;
-	e_action_predef_name_set(N_("Pager"), N_("Popup Desk Right"), "pager_switch", "right", NULL, 0);
-	e_action_predef_name_set(N_("Pager"), N_("Popup Desk Left"),  "pager_switch", "left",  NULL, 0);
-	e_action_predef_name_set(N_("Pager"), N_("Popup Desk Up"),    "pager_switch", "up",    NULL, 0);
-	e_action_predef_name_set(N_("Pager"), N_("Popup Desk Down"),  "pager_switch", "down",  NULL, 0);
+	e_action_predef_name_set(N_("Pager"), N_("Popup Desk Right"), 
+                                 "pager_switch", "right", NULL, 0);
+	e_action_predef_name_set(N_("Pager"), N_("Popup Desk Left"),  
+                                 "pager_switch", "left",  NULL, 0);
+	e_action_predef_name_set(N_("Pager"), N_("Popup Desk Up"),    
+                                 "pager_switch", "up",    NULL, 0);
+	e_action_predef_name_set(N_("Pager"), N_("Popup Desk Down"),  
+                                 "pager_switch", "down",  NULL, 0);
      }
 
    return m;
@@ -2830,7 +2870,8 @@ e_modapi_shutdown(E_Module *m)
    while (pager_config->handlers)
      {
 	ecore_event_handler_del(pager_config->handlers->data);
-	pager_config->handlers = eina_list_remove_list(pager_config->handlers, pager_config->handlers);
+	pager_config->handlers = 
+          eina_list_remove_list(pager_config->handlers, pager_config->handlers);
      }
 
    if (pager_config->menu)
diff --git a/src/modules/pager/e_mod_main.h b/src/modules/pager/e_mod_main.h
index df80448..76d749b 100644
--- a/src/modules/pager/e_mod_main.h
+++ b/src/modules/pager/e_mod_main.h
@@ -4,7 +4,7 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-typedef struct _Config      Config;
+typedef struct _Config Config;
 typedef struct _Config_Item Config_Item;
 
 #define PAGER_RESIZE_NONE 0
@@ -12,44 +12,42 @@ typedef struct _Config_Item Config_Item;
 #define PAGER_RESIZE_VERT 2
 #define PAGER_RESIZE_BOTH 3
 
-#define PAGER_DESKNAME_NONE   0
-#define PAGER_DESKNAME_TOP    1
+#define PAGER_DESKNAME_NONE 0
+#define PAGER_DESKNAME_TOP 1
 #define PAGER_DESKNAME_BOTTOM 2
-#define PAGER_DESKNAME_LEFT   3
-#define PAGER_DESKNAME_RIGHT  4
+#define PAGER_DESKNAME_LEFT 3
+#define PAGER_DESKNAME_RIGHT 4
 
 struct _Config
 {
-   /* saved * loaded config values */
-   unsigned int    popup;
-   double          popup_speed;
-   unsigned int    popup_urgent;
-   unsigned int    popup_urgent_stick;
-   double          popup_urgent_speed;
-   unsigned int    show_desk_names;
-   int             popup_act_height; /*keyaction popup */
-   int             popup_height;    /* urgent/on-deskswitch popup*/
-   unsigned int    drag_resist;
-   unsigned int    btn_drag;
-   unsigned int    btn_noplace;
-   unsigned int    btn_desk;
-   unsigned int    flip_desk;
+   unsigned int popup;
+   double popup_speed;
+   unsigned int popup_urgent;
+   unsigned int popup_urgent_stick;
+   double popup_urgent_speed;
+   unsigned int show_desk_names;
+   int popup_act_height; /*keyaction popup */
+   int popup_height;    /* urgent/on-deskswitch popup*/
+   unsigned int drag_resist;
+   unsigned int btn_drag;
+   unsigned int btn_noplace;
+   unsigned int btn_desk;
+   unsigned int flip_desk;
 
    /* just config state */
-   E_Module        *module;
+   E_Module *module;
    E_Config_Dialog *config_dialog;
-   Eina_List       *instances;
-   E_Menu          *menu;
-   Eina_List       *handlers;
+   Eina_List *instances, *handlers;
+   E_Menu *menu;
 };
 
 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 *e_modapi_init(E_Module *m);
+EAPI int e_modapi_shutdown(E_Module *m);
+EAPI int e_modapi_save(E_Module *m);
 
-void  _pager_cb_config_updated(void);
+void _pager_cb_config_updated(void);
 void _config_pager_module(Config_Item *ci);
 extern Config *pager_config;
 
diff --git a/src/modules/start/Makefile.in b/src/modules/start/Makefile.in
index de085c8..79bc191 100644
--- a/src/modules/start/Makefile.in
+++ b/src/modules/start/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/syscon/Makefile.in b/src/modules/syscon/Makefile.in
index 1afd0d8..a26db84 100644
--- a/src/modules/syscon/Makefile.in
+++ b/src/modules/syscon/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/syscon/e_syscon.c b/src/modules/syscon/e_syscon.c
index d82da53..fcc9fde 100644
--- a/src/modules/syscon/e_syscon.c
+++ b/src/modules/syscon/e_syscon.c
@@ -47,7 +47,7 @@ e_syscon_show(E_Zone *zone, const char *defact)
 {
    Evas_Object *o, *o2;
    Evas_Coord mw, mh;
-   int x, y, w, h;
+   int x, y, w, h, zx, zy, zw, zh;
    int iw, ih;
    Eina_List *l;
 
@@ -239,7 +239,8 @@ e_syscon_show(E_Zone *zone, const char *defact)
    e_flowlayout_fill_set(o_flow_extra, 1);
    edje_object_part_swallow(o_bg, "e.swallow.extra", o_flow_extra);
 
-   evas_object_resize(o_bg, zone->w, zone->h);
+   e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh);
+   evas_object_resize(o_bg, zw, zh);
    edje_object_calc_force(o_bg);
 
    e_flowlayout_min_size_get(o_flow_main, &mw, &mh);
@@ -253,12 +254,13 @@ e_syscon_show(E_Zone *zone, const char *defact)
    edje_object_part_swallow(o_bg, "e.swallow.extra", o_flow_extra);
 
    edje_object_size_min_calc(o_bg, &mw, &mh);
+
    w = mw;
-   if (w > zone->w) w = zone->w;
-   x = (zone->w - w) / 2;
+   if (w > zw) w = zw;
+   x = zx - zone->x + (zw - w) / 2;
    h = mh;
-   if (h > zone->h) h = zone->h;
-   y = (zone->h - h) / 2;
+   if (h > zh) h = zh;
+   y = zy - zone->y + (zh - h) / 2;
 
    e_popup_move_resize(popup, x, y, w, h);
    evas_object_move(o_bg, 0, 0);
diff --git a/src/modules/syscon/module.desktop b/src/modules/syscon/module.desktop
index 4977da5..643fb50 100644
--- a/src/modules/syscon/module.desktop
+++ b/src/modules/syscon/module.desktop
@@ -2,12 +2,14 @@
 Type=Link
 Name=System Controls
 Name[cs]=Ovládací prvky
+Name[eo]=Kontroloj de sistemo
 Name[it]=Controlli di sistema
 Name[hu]=Rendszer felügyelő
 Name[fr]=Contrôles du système
 Icon=e-module-syscon
 Comment=<title>System Controls Module</title><br>This module provides a unified popup<br>dialog for all the system actions<br>in Enlightenment.
 Comment[cs]=<title>Modul Ovládací prvky</title><br>Poskytuje dialog pro všechny<br>systémové akce v Enlightenmentu.
+Comment[eo]=<title>Modulo Kontroloj de sistemo</title><br>Tiu modulo vidigas ŝprucfenestron<br>kunigantan ĉiujn sistemajn agadojn<br> en Enlightenment.
 Comment[it]=<title>Modulo controlli di sistema</title><br>Questo modulo fornisce una finestra di dialogo popup<br>unificata per tutte le azioni di sistema in Enlightenment.
 Comment[hu]=<title>Rendszer felügyelő modul</title><br>Ez a modul egy felugró ablakocskát<br>biztosít, amely segítségével az<br>e17 folyamatait kísérhetjük figyelemmel
 Comment[fr]=<title>Module Contrôles du système</title><br>Fournit une fenêtre de dialogue pop-up<br>regroupant toutes les actions système<br>dans Enlightenment.
diff --git a/src/modules/syscon/module.desktop.in b/src/modules/syscon/module.desktop.in
index 4977da5..643fb50 100644
--- a/src/modules/syscon/module.desktop.in
+++ b/src/modules/syscon/module.desktop.in
@@ -2,12 +2,14 @@
 Type=Link
 Name=System Controls
 Name[cs]=Ovládací prvky
+Name[eo]=Kontroloj de sistemo
 Name[it]=Controlli di sistema
 Name[hu]=Rendszer felügyelő
 Name[fr]=Contrôles du système
 Icon=e-module-syscon
 Comment=<title>System Controls Module</title><br>This module provides a unified popup<br>dialog for all the system actions<br>in Enlightenment.
 Comment[cs]=<title>Modul Ovládací prvky</title><br>Poskytuje dialog pro všechny<br>systémové akce v Enlightenmentu.
+Comment[eo]=<title>Modulo Kontroloj de sistemo</title><br>Tiu modulo vidigas ŝprucfenestron<br>kunigantan ĉiujn sistemajn agadojn<br> en Enlightenment.
 Comment[it]=<title>Modulo controlli di sistema</title><br>Questo modulo fornisce una finestra di dialogo popup<br>unificata per tutte le azioni di sistema in Enlightenment.
 Comment[hu]=<title>Rendszer felügyelő modul</title><br>Ez a modul egy felugró ablakocskát<br>biztosít, amely segítségével az<br>e17 folyamatait kísérhetjük figyelemmel
 Comment[fr]=<title>Module Contrôles du système</title><br>Fournit une fenêtre de dialogue pop-up<br>regroupant toutes les actions système<br>dans Enlightenment.
diff --git a/src/modules/systray/Makefile.am b/src/modules/systray/Makefile.am
new file mode 100644
index 0000000..a71d86f
--- /dev/null
+++ b/src/modules/systray/Makefile.am
@@ -0,0 +1,28 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = systray
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES               = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES        = module.la
+module_la_SOURCES      = e_mod_main.c \
+                         e_mod_main.h
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/systray/Makefile.in b/src/modules/systray/Makefile.in
new file mode 100644
index 0000000..d02409a
--- /dev/null
+++ b/src/modules/systray/Makefile.in
@@ -0,0 +1,676 @@
+# Makefile.in generated by automake 1.10.1 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/systray
+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
+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_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = systray
+
+# data files for the module
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)
+files_DATA = \
+e-module-$(MODULE).edj module.desktop
+
+EXTRA_DIST = $(files_DATA)
+
+# the module .so file
+INCLUDES = -I. \
+                         -I$(top_srcdir) \
+                         -I$(top_srcdir)/src/modules/$(MODULE) \
+                         -I$(top_srcdir)/src/bin \
+                         -I$(top_srcdir)/src/lib \
+                         -I$(top_srcdir)/src/modules \
+                         @e_cflags@
+
+pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES = module.la
+module_la_SOURCES = e_mod_main.c \
+                         e_mod_main.h
+
+module_la_LIBADD = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/modules/systray/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/modules/systray/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_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; nonemtpy = 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/ibar/e-module-ibar.edj b/src/modules/systray/e-module-systray.edj
similarity index 100%
copy from src/modules/ibar/e-module-ibar.edj
copy to src/modules/systray/e-module-systray.edj
diff --git a/src/modules/systray/e_mod_main.c b/src/modules/systray/e_mod_main.c
new file mode 100644
index 0000000..90f751a
--- /dev/null
+++ b/src/modules/systray/e_mod_main.c
@@ -0,0 +1,1138 @@
+/**
+ * systray implementation following freedesktop.org specification.
+ *
+ * @see: http://standards.freedesktop.org/systemtray-spec/latest/
+ *
+ * @todo: implement xembed, mostly done, at least relevant parts are done.
+ *        http://standards.freedesktop.org/xembed-spec/latest/
+ *
+ * @todo: implement messages/popup part of the spec (anyone using this at all?)
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <e.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include "e_mod_main.h"
+
+#define RETRY_TIMEOUT 2.0
+
+#define SYSTEM_TRAY_REQUEST_DOCK 0
+#define SYSTEM_TRAY_BEGIN_MESSAGE 1
+#define SYSTEM_TRAY_CANCEL_MESSAGE 2
+#define _NET_SYSTEM_TRAY_ORIENTATION_HORZ 0
+#define _NET_SYSTEM_TRAY_ORIENTATION_VERT 1
+
+/* XEMBED messages */
+#define XEMBED_EMBEDDED_NOTIFY		0
+#define XEMBED_WINDOW_ACTIVATE  	1
+#define XEMBED_WINDOW_DEACTIVATE  	2
+#define XEMBED_REQUEST_FOCUS	 	3
+#define XEMBED_FOCUS_IN 	 	4
+#define XEMBED_FOCUS_OUT  		5
+#define XEMBED_FOCUS_NEXT 		6
+#define XEMBED_FOCUS_PREV 		7
+/* 8-9 were used for XEMBED_GRAB_KEY/XEMBED_UNGRAB_KEY */
+#define XEMBED_MODALITY_ON 		10
+#define XEMBED_MODALITY_OFF 		11
+#define XEMBED_REGISTER_ACCELERATOR     12
+#define XEMBED_UNREGISTER_ACCELERATOR   13
+#define XEMBED_ACTIVATE_ACCELERATOR     14
+
+/* Details for  XEMBED_FOCUS_IN: */
+#define XEMBED_FOCUS_CURRENT		0
+#define XEMBED_FOCUS_FIRST 		1
+#define XEMBED_FOCUS_LAST		2
+
+typedef struct _Instance Instance;
+typedef struct _Icon Icon;
+
+struct _Icon
+{
+   Ecore_X_Window win;
+   Evas_Object *o;
+   Instance *inst;
+};
+
+struct _Instance
+{
+   E_Gadcon_Client *gcc;
+   E_Container *con;
+   Evas *evas;
+   struct
+   {
+      Ecore_X_Window parent;
+      Ecore_X_Window base;
+      Ecore_X_Window selection;
+   } win;
+   struct
+   {
+      Evas_Object *gadget;
+   } ui;
+   struct
+   {
+      Ecore_Event_Handler *message;
+      Ecore_Event_Handler *destroy;
+      Ecore_Event_Handler *show;
+      Ecore_Event_Handler *reparent;
+      Ecore_Event_Handler *sel_clear;
+   } handler;
+   struct
+   {
+      Ecore_Timer *retry;
+   } timer;
+   struct
+   {
+      Ecore_Idler *size_apply;
+   } idler;
+   Eina_List *icons;
+   E_Menu *menu;
+};
+
+static const char _Name[] = "Systray";
+static const char _name[] = "systray";
+static const char _group_gadget[] = "e/modules/systray/main";
+static const char _part_box[] = "e.box";
+static const char _part_size[] = "e.size";
+static const char _sig_source[] = "e";
+static const char _sig_enable[] = "e,action,enable";
+static const char _sig_disable[] = "e,action,disable";
+
+static Ecore_X_Atom _atom_manager = 0;
+static Ecore_X_Atom _atom_st_orient = 0;
+static Ecore_X_Atom _atom_st_visual = 0;
+static Ecore_X_Atom _atom_st_op_code = 0;
+static Ecore_X_Atom _atom_st_msg_data = 0;
+static Ecore_X_Atom _atom_xembed = 0;
+static Ecore_X_Atom _atom_xembed_info = 0;
+static Ecore_X_Atom _atom_st_num = 0;
+static int _last_st_num = -1;
+
+static E_Module *systray_mod = NULL;
+static Instance *instance = NULL; /* only one systray ever possible */
+static char tmpbuf[PATH_MAX]; /* general purpose buffer, just use immediately */
+
+static const char *
+_systray_theme_path(void)
+{
+#define TF "/e-module-systray.edj"
+   unsigned int dirlen;
+   const char *moddir = e_module_dir_get(systray_mod);
+
+   dirlen = strlen(moddir);
+   if (dirlen >= sizeof(tmpbuf) - sizeof(TF))
+     return NULL;
+
+   memcpy(tmpbuf, moddir, dirlen);
+   memcpy(tmpbuf + dirlen, TF, sizeof(TF));
+
+   return tmpbuf;
+#undef TF
+}
+
+static void
+_systray_menu_cb_post(void *data, E_Menu *menu __UNUSED__)
+{
+   Instance *inst = data;
+   if (!inst->menu) return;
+   e_object_del(E_OBJECT(inst->menu));
+   inst->menu = NULL;
+}
+
+static void
+_systray_menu_new(Instance *inst, Evas_Event_Mouse_Down *ev)
+{
+   E_Zone *zone;
+   E_Menu *mn;
+   int x, y;
+
+   zone = e_util_zone_current_get(e_manager_current_get());
+
+   mn = e_menu_new();
+   e_menu_post_deactivate_callback_set(mn, _systray_menu_cb_post, inst);
+   inst->menu = mn;
+
+   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);
+   evas_event_feed_mouse_up(inst->evas, ev->button,
+			    EVAS_BUTTON_NONE, ev->timestamp, NULL);
+}
+
+static void
+_systray_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
+{
+   Instance *inst = data;
+   Evas_Event_Mouse_Down *ev = event;
+
+   if ((ev->button == 3) && (!inst->menu))
+     _systray_menu_new(inst, ev);
+}
+
+static void
+_systray_size_apply_do(Instance *inst)
+{
+   const Evas_Object *o;
+   Evas_Coord x, y, w, h;
+
+   edje_object_message_signal_process(inst->ui.gadget);
+   o = edje_object_part_object_get(inst->ui.gadget, _part_box);
+   if (!o) return;
+   evas_object_size_hint_min_get(o, &w, &h);
+
+   if (w < 1) w = 1;
+   if (h < 1) h = 1;
+
+   e_gadcon_client_aspect_set(inst->gcc, w, h);
+   e_gadcon_client_min_size_set(inst->gcc, w, h);
+
+   evas_object_geometry_get(o, &x, &y, &w, &h);
+   ecore_x_window_move_resize(inst->win.base, x, y, w, h);
+}
+
+static int
+_systray_size_apply_delayed(void *data)
+{
+   Instance *inst = data;
+   _systray_size_apply_do(inst);
+   inst->idler.size_apply = NULL;
+   return 0;
+}
+
+static void
+_systray_size_apply(Instance *inst)
+{
+   if (inst->idler.size_apply) return;
+   inst->idler.size_apply = ecore_idler_add(_systray_size_apply_delayed, inst);
+}
+
+static void
+_systray_cb_move(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUSED__, void *event __UNUSED__)
+{
+   Instance *inst = data;
+   _systray_size_apply(inst);
+}
+
+static void
+_systray_cb_resize(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUSED__, void *event __UNUSED__)
+{
+   Instance *inst = data;
+   _systray_size_apply(inst);
+}
+
+static void
+_systray_icon_geometry_apply(Icon *icon)
+{
+   const Evas_Object *o;
+   Evas_Coord x, y, w, h, wx, wy;
+
+   o = edje_object_part_object_get(icon->inst->ui.gadget, _part_size);
+   if (!o) return;
+
+   evas_object_geometry_get(icon->o, &x, &y, &w, &h);
+   evas_object_geometry_get(o, &wx, &wy, NULL, NULL);
+   ecore_x_window_move_resize(icon->win, x - wx, y - wy, w, h);
+}
+
+static void
+_systray_icon_cb_move(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUSED__, void *event __UNUSED__)
+{
+   Icon *icon = data;
+   _systray_icon_geometry_apply(icon);
+}
+
+static void
+_systray_icon_cb_resize(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUSED__, void *event __UNUSED__)
+{
+   Icon *icon = data;
+   _systray_icon_geometry_apply(icon);
+}
+
+static Ecore_X_Gravity
+_systray_gravity(const Instance *inst)
+{
+   switch (inst->gcc->gadcon->orient)
+     {
+      case E_GADCON_ORIENT_FLOAT:
+	 return ECORE_X_GRAVITY_STATIC;
+      case E_GADCON_ORIENT_HORIZ:
+	 return ECORE_X_GRAVITY_CENTER;
+      case E_GADCON_ORIENT_VERT:
+	 return ECORE_X_GRAVITY_CENTER;
+      case E_GADCON_ORIENT_LEFT:
+	 return ECORE_X_GRAVITY_CENTER;
+      case E_GADCON_ORIENT_RIGHT:
+	 return ECORE_X_GRAVITY_CENTER;
+      case E_GADCON_ORIENT_TOP:
+	 return ECORE_X_GRAVITY_CENTER;
+      case E_GADCON_ORIENT_BOTTOM:
+	 return ECORE_X_GRAVITY_CENTER;
+      case E_GADCON_ORIENT_CORNER_TL:
+	 return ECORE_X_GRAVITY_S;
+      case E_GADCON_ORIENT_CORNER_TR:
+	 return ECORE_X_GRAVITY_S;
+      case E_GADCON_ORIENT_CORNER_BL:
+	 return ECORE_X_GRAVITY_N;
+      case E_GADCON_ORIENT_CORNER_BR:
+	 return ECORE_X_GRAVITY_N;
+      case E_GADCON_ORIENT_CORNER_LT:
+	 return ECORE_X_GRAVITY_E;
+      case E_GADCON_ORIENT_CORNER_RT:
+	 return ECORE_X_GRAVITY_W;
+      case E_GADCON_ORIENT_CORNER_LB:
+	 return ECORE_X_GRAVITY_E;
+      case E_GADCON_ORIENT_CORNER_RB:
+	 return ECORE_X_GRAVITY_W;
+      default:
+	 return ECORE_X_GRAVITY_STATIC;
+     }
+}
+
+static Evas_Coord
+_systray_icon_size_normalize(Evas_Coord size)
+{
+   const Evas_Coord *itr, sizes[] = {
+     16, 22, 24, 32, 36, 48, 64, 72, 96, 128, 192, 256, -1
+   };
+   for (itr = sizes; *itr > 0; itr++)
+     if (*itr == size)
+       return size;
+     else if (*itr > size)
+       {
+	  if (itr > sizes)
+	    return itr[-1];
+	  else
+	    return sizes[0];
+       }
+   return sizes[0];
+}
+
+static Icon *
+_systray_icon_add(Instance *inst, const Ecore_X_Window win)
+{
+   Ecore_X_Gravity gravity;
+   Evas_Object *o;
+   Evas_Coord w, h;
+   Icon *icon;
+
+   edje_object_part_geometry_get(inst->ui.gadget, _part_size,
+				 NULL, NULL, &w, &h);
+   if (w > h)
+     w = h;
+   else
+     h = w;
+
+   w = h = _systray_icon_size_normalize(w);
+
+   o = evas_object_rectangle_add(inst->evas);
+   if (!o)
+     return NULL;
+   evas_object_color_set(o, 0, 0, 0, 0);
+   evas_object_resize(o, w, h);
+   evas_object_show(o);
+
+   icon = malloc(sizeof(*icon));
+   if (!icon)
+     {
+	evas_object_del(o);
+	return NULL;
+     }
+   icon->win = win;
+   icon->inst = inst;
+   icon->o = o;
+
+   gravity = _systray_gravity(inst);
+   ecore_x_icccm_size_pos_hints_set(win, 1, gravity,
+				    w, h, w, h, w, h, 0, 0,
+				    1.0, (double)w / (double)h);
+
+   ecore_x_window_reparent(win, inst->win.base, 0, 0);
+   ecore_x_window_resize(win, w, h);
+   ecore_x_window_raise(win);
+   ecore_x_window_client_manage(win);
+   ecore_x_window_save_set_add(win);
+   ecore_x_window_shape_events_select(win, 1);
+
+   ecore_x_window_geometry_get(win, NULL, NULL, &w, &h);
+
+   evas_object_event_callback_add
+     (o, EVAS_CALLBACK_MOVE, _systray_icon_cb_move, icon);
+   evas_object_event_callback_add
+     (o, EVAS_CALLBACK_RESIZE, _systray_icon_cb_resize, icon);
+
+   inst->icons = eina_list_append(inst->icons, icon);
+   edje_object_part_box_append(inst->ui.gadget, _part_box, o);
+   _systray_size_apply_do(inst);
+   _systray_icon_geometry_apply(icon);
+
+   ecore_x_window_show(win);
+
+   return icon;
+}
+
+static void
+_systray_icon_del_list(Instance *inst, Eina_List *l, Icon *icon)
+{
+   inst->icons = eina_list_remove_list(inst->icons, l);
+
+   ecore_x_window_save_set_del(icon->win);
+   ecore_x_window_reparent(icon->win, None, 0, 0);
+   evas_object_del(icon->o);
+   free(icon);
+
+   _systray_size_apply(inst);
+}
+
+static Ecore_X_Atom
+_systray_atom_st_get(int screen_num)
+{
+   if ((_last_st_num == -1) || (_last_st_num != screen_num))
+     {
+	char buf[32];
+	snprintf(buf, sizeof(buf), "_NET_SYSTEM_TRAY_S%d", screen_num);
+	_atom_st_num = ecore_x_atom_get(buf);
+	_last_st_num = screen_num;
+     }
+
+   return _atom_st_num;
+}
+
+/* XXX TODO: should be in ecore_x */
+static Eina_Bool
+_systray_selection_owner_set(int screen_num, Ecore_X_Window win)
+{
+   Ecore_X_Atom atom;
+   Ecore_X_Display *disp = ecore_x_display_get();
+   Ecore_X_Window cur_selection;
+   Eina_Bool ret;
+
+   atom = _systray_atom_st_get(screen_num);
+   XSetSelectionOwner(disp, atom, win, ecore_x_current_time_get());
+   ecore_x_sync();
+   cur_selection = XGetSelectionOwner(disp, atom);
+
+   ret = (cur_selection == win);
+   if (!ret)
+     fprintf(stderr, "SYSTRAY: tried to set selection to %#x, but got %#x\n",
+	     win, cur_selection);
+
+   return ret;
+}
+
+static Eina_Bool
+_systray_selection_owner_set_current(Instance *inst)
+{
+   return _systray_selection_owner_set
+     (inst->con->manager->num, inst->win.selection);
+}
+
+static void
+_systray_deactivate(Instance *inst)
+{
+   Ecore_X_Window old;
+
+   if (inst->win.selection == None) return;
+
+   edje_object_signal_emit(inst->ui.gadget, _sig_disable, _sig_source);
+
+   while (inst->icons)
+     _systray_icon_del_list(inst, inst->icons, inst->icons->data);
+
+   old = inst->win.selection;
+   inst->win.selection = None;
+   _systray_selection_owner_set_current(inst);
+   ecore_x_sync();
+   ecore_x_window_free(old);
+   ecore_x_window_free(inst->win.base);
+   inst->win.base = None;
+}
+
+static Eina_Bool
+_systray_base_create(Instance *inst)
+{
+   const Evas_Object *o;
+   Evas_Coord x, y, w, h;
+   unsigned short r, g, b;
+   const char *color;
+
+   color = edje_object_data_get(inst->ui.gadget, inst->gcc->style);
+   if (!color)
+     color = edje_object_data_get(inst->ui.gadget, "default");
+
+   if (color && (sscanf(color, "%hu %hu %hu", &r, &g, &b) == 3))
+     {
+	r = (65535 * (unsigned int)r) / 255;
+	g = (65535 * (unsigned int)g) / 255;
+	b = (65535 * (unsigned int)b) / 255;
+     }
+   else
+     r = g = b = (unsigned short)65535;
+
+   o = edje_object_part_object_get(inst->ui.gadget, _part_size);
+   if (!o)
+     return 0;
+
+   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);
+   ecore_x_window_background_color_set(inst->win.base, r, g, b);
+   ecore_x_window_show(inst->win.base);
+   return 1;
+}
+
+static Eina_Bool
+_systray_activate(Instance *inst)
+{
+   unsigned int visual;
+   Ecore_X_Atom atom;
+   Ecore_X_Window old_win;
+   Ecore_X_Window_Attributes attr;
+   Ecore_X_Display *dpy;
+
+   if (inst->win.selection != None) return 1;
+
+   atom = _systray_atom_st_get(inst->con->manager->num);
+   dpy = ecore_x_display_get();
+   old_win = XGetSelectionOwner(dpy, atom);
+   if (old_win != None) return 0;
+
+   if (inst->win.base == None)
+     {
+	if (!_systray_base_create(inst))
+	  return 0;
+     }
+
+   inst->win.selection = ecore_x_window_input_new(inst->win.base, 0, 0, 1, 1);
+   if (inst->win.selection == None)
+     {
+	ecore_x_window_free(inst->win.base);
+	inst->win.base = None;
+	return 0;
+     }
+
+   if (!_systray_selection_owner_set_current(inst))
+     {
+	ecore_x_window_free(inst->win.selection);
+	inst->win.selection = None;
+	ecore_x_window_free(inst->win.base);
+	inst->win.base = None;
+	return 0;
+     }
+
+   ecore_x_window_attributes_get(inst->win.base, &attr);
+
+   visual = XVisualIDFromVisual(attr.visual);
+   XChangeProperty(dpy, inst->win.selection, _atom_st_visual, XA_VISUALID,
+		   32, PropModeReplace, (void *)&visual, 1);
+
+   ecore_x_client_message32_send(inst->con->manager->root, _atom_manager,
+				 ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
+				 ecore_x_current_time_get(), atom,
+				 inst->win.selection, 0, 0);
+
+   edje_object_signal_emit(inst->ui.gadget, _sig_enable, _sig_source);
+
+   return 1;
+}
+
+static int
+_systray_activate_retry(void *data)
+{
+   Instance *inst = data;
+   Eina_Bool ret;
+
+   fputs("SYSTRAY: reactivate...\n", stderr);
+   ret = _systray_activate(inst);
+   if (ret)
+     fputs("SYSTRAY: activate success!\n", stderr);
+   else
+     fprintf(stderr, "SYSTRAY: activate failure! retrying in %0.1f seconds\n",
+	     RETRY_TIMEOUT);
+
+   if (!ret)
+     return 1;
+
+   inst->timer.retry = NULL;
+   return 0;
+}
+
+static void
+_systray_retry(Instance *inst)
+{
+   if (inst->timer.retry) return;
+   inst->timer.retry = ecore_timer_add
+     (RETRY_TIMEOUT, _systray_activate_retry, inst);
+}
+
+static int
+_systray_activate_retry_first(void *data)
+{
+   Instance *inst = data;
+   Eina_Bool ret;
+
+   fputs("SYSTRAY: reactivate (first time)...\n", stderr);
+   ret = _systray_activate(inst);
+   if (ret)
+     {
+	fputs("SYSTRAY: activate success!\n", stderr);
+	inst->timer.retry = NULL;
+	return 0;
+     }
+
+   edje_object_signal_emit(inst->ui.gadget, _sig_disable, _sig_source);
+
+   fprintf(stderr, "SYSTRAY: activate failure! retrying in %0.1f seconds\n",
+	   RETRY_TIMEOUT);
+
+   inst->timer.retry = NULL;
+   _systray_retry(inst);
+   return 0;
+}
+
+static void
+_systray_handle_request_dock(Instance *inst, Ecore_X_Event_Client_Message *ev)
+{
+   Ecore_X_Window win = (Ecore_X_Window)ev->data.l[2];
+   Ecore_X_Time time;
+   Ecore_X_Window_Attributes attr;
+   const Eina_List *l;
+   Icon *icon;
+   unsigned int val[2];
+   int r;
+
+   EINA_LIST_FOREACH(inst->icons, l, icon)
+     if (icon->win == win)
+       return;
+
+   if (!ecore_x_window_attributes_get(win, &attr))
+     {
+	fprintf(stderr, "SYSTRAY: could not get attributes of win %#x\n", win);
+	return;
+     }
+
+   icon = _systray_icon_add(inst, win);
+   if (!icon)
+     return;
+
+   r  = ecore_x_window_prop_card32_get(win, _atom_xembed_info, val, 2);
+   if (r < 2)
+     {
+	/*
+	fprintf(stderr, "SYSTRAY: win %#x does not support _XEMBED_INFO (%d)\n",
+		win, r);
+	*/
+	return;
+     }
+
+   time = ecore_x_current_time_get();
+   ecore_x_client_message32_send(win, _atom_xembed,
+				 ECORE_X_EVENT_MASK_NONE,
+				 time, XEMBED_EMBEDDED_NOTIFY, 0,
+				 inst->win.selection, 0);
+}
+
+static void
+_systray_handle_op_code(Instance *inst, Ecore_X_Event_Client_Message *ev)
+{
+   unsigned long message = ev->data.l[1];
+
+   switch (message)
+     {
+      case SYSTEM_TRAY_REQUEST_DOCK:
+	 _systray_handle_request_dock(inst, ev);
+	 break;
+      case SYSTEM_TRAY_BEGIN_MESSAGE:
+      case SYSTEM_TRAY_CANCEL_MESSAGE:
+	 fputs("SYSTRAY TODO: handle messages (anyone uses this?)\n", stderr);
+	 break;
+      default:
+	 fprintf(stderr,
+		 "SYSTRAY: error, unknown message op code: %ld, win: %#lx\n",
+		 message, ev->data.l[2]);
+     }
+}
+
+static void
+_systray_handle_message(Instance *inst __UNUSED__, Ecore_X_Event_Client_Message *ev)
+{
+   fprintf(stderr, "SYSTRAY TODO: message op: %ld, data: %ld, %ld, %ld\n",
+	   ev->data.l[1], ev->data.l[2], ev->data.l[3], ev->data.l[4]);
+}
+
+static void
+_systray_handle_xembed(Instance *inst __UNUSED__, Ecore_X_Event_Client_Message *ev __UNUSED__)
+{
+   unsigned long message = ev->data.l[1];
+
+   switch (message)
+     {
+      case XEMBED_EMBEDDED_NOTIFY:
+      case XEMBED_WINDOW_ACTIVATE:
+      case XEMBED_WINDOW_DEACTIVATE:
+      case XEMBED_REQUEST_FOCUS:
+      case XEMBED_FOCUS_IN:
+      case XEMBED_FOCUS_OUT:
+      case XEMBED_FOCUS_NEXT:
+      case XEMBED_FOCUS_PREV:
+      case XEMBED_MODALITY_ON:
+      case XEMBED_MODALITY_OFF:
+      case XEMBED_REGISTER_ACCELERATOR:
+      case XEMBED_UNREGISTER_ACCELERATOR:
+      case XEMBED_ACTIVATE_ACCELERATOR:
+      default:
+	 fprintf(stderr,
+		 "SYSTRAY: unsupported xembed: %#lx, %#lx, %#lx, %#lx\n",
+		 ev->data.l[1], ev->data.l[2], ev->data.l[3], ev->data.l[4]);
+     }
+}
+
+static int
+_systray_cb_client_message(void *data, int type __UNUSED__, void *event)
+{
+   Ecore_X_Event_Client_Message *ev = event;
+   Instance *inst = data;
+
+   if (ev->message_type == _atom_st_op_code)
+     _systray_handle_op_code(inst, ev);
+   else if (ev->message_type == _atom_st_msg_data)
+     _systray_handle_message(inst, ev);
+   else if (ev->message_type == _atom_xembed)
+     _systray_handle_xembed(inst, ev);
+
+   return 1;
+}
+
+static int
+_systray_cb_window_destroy(void *data, int type __UNUSED__, void *event)
+{
+   Ecore_X_Event_Window_Destroy *ev = event;
+   Instance *inst = data;
+   Icon *icon;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(inst->icons, l, icon)
+     if (icon->win == ev->win)
+       {
+	  _systray_icon_del_list(inst, l, icon);
+	  break;
+       }
+
+   return 1;
+}
+
+static int
+_systray_cb_window_show(void *data, int type __UNUSED__, void *event)
+{
+   Ecore_X_Event_Window_Show *ev = event;
+   Instance *inst = data;
+   Icon *icon;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(inst->icons, l, icon)
+     if (icon->win == ev->win)
+       {
+	  _systray_icon_geometry_apply(icon);
+	  break;
+       }
+
+   return 1;
+}
+
+static int
+_systray_cb_reparent_notify(void *data, int type __UNUSED__, void *event)
+{
+   Ecore_X_Event_Window_Reparent *ev = event;
+   Instance *inst = data;
+   Icon *icon;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(inst->icons, l, icon)
+     if ((icon->win == ev->win) && (ev->parent != inst->win.base))
+       {
+	  _systray_icon_del_list(inst, l, icon);
+	  break;
+       }
+
+   return 1;
+}
+
+static int
+_systray_cb_selection_clear(void *data, int type __UNUSED__, void *event)
+{
+   Ecore_X_Event_Selection_Clear *ev = event;
+   Instance *inst = data;
+
+   if ((ev->win == inst->win.selection) && (inst->win.selection != None) &&
+       (ev->atom == _systray_atom_st_get(inst->con->manager->num)))
+     {
+	edje_object_signal_emit(inst->ui.gadget, _sig_disable, _sig_source);
+
+	while (inst->icons)
+	  _systray_icon_del_list(inst, inst->icons, inst->icons->data);
+
+	ecore_x_window_free(inst->win.selection);
+	inst->win.selection = None;
+	ecore_x_window_free(inst->win.base);
+	inst->win.base = None;
+	_systray_retry(inst);
+     }
+   return 1;
+}
+
+static void
+_systray_theme(Evas_Object *o, const char *shelf_style, const char *gc_style)
+{
+   const char base_theme[] = "base/theme/modules/systray";
+   const char *path = _systray_theme_path();
+   char buf[128], *p;
+   size_t len, avail;
+
+   len = ecore_strlcpy(buf, _group_gadget, sizeof(buf));
+   if (len >= sizeof(buf))
+     goto fallback;
+   p = buf + len;
+   *p = '/';
+   p++;
+   avail = sizeof(buf) - len - 1;
+
+   if (shelf_style && gc_style)
+     {
+	size_t r;
+	r = snprintf(p, avail, "%s/%s", shelf_style, gc_style);
+	if (r < avail && e_theme_edje_object_set(o, base_theme, buf))
+	  return;
+     }
+
+   if (shelf_style)
+     {
+	size_t r;
+	r = ecore_strlcpy(p, shelf_style, avail);
+	if (r < avail && e_theme_edje_object_set(o, base_theme, buf))
+	  return;
+     }
+
+   if (gc_style)
+     {
+	size_t r;
+	r = ecore_strlcpy(p, gc_style, avail);
+	if (r < avail && e_theme_edje_object_set(o, base_theme, buf))
+	  return;
+     }
+
+   if (e_theme_edje_object_set(o, base_theme, _group_gadget))
+     return;
+
+   if (shelf_style && gc_style)
+     {
+	size_t r;
+	r = snprintf(p, avail, "%s/%s", shelf_style, gc_style);
+	if (r < avail && edje_object_file_set(o, path, buf))
+	  return;
+     }
+
+   if (shelf_style)
+     {
+	size_t r;
+	r = ecore_strlcpy(p, shelf_style, avail);
+	if (r < avail && edje_object_file_set(o, path, buf))
+	  return;
+     }
+
+   if (gc_style)
+     {
+	size_t r;
+	r = ecore_strlcpy(p, gc_style, avail);
+	if (r < avail && edje_object_file_set(o, path, buf))
+	  return;
+     }
+
+ fallback:
+   edje_object_file_set(o, path, _group_gadget);
+}
+
+
+static E_Gadcon_Client *
+_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
+{
+   Instance *inst;
+
+   fprintf(stderr, "SYSTRAY: init name=%s, id=%s, style=%s\n", name, id, style);
+
+   if (!systray_mod)
+     return NULL;
+   if ((!id) || (instance))
+     {
+	e_util_dialog_internal
+	  (_("Another systray exists"),
+	   _("There can be only one systray gadget and "
+	     "another one already exists."));
+	return NULL;
+     }
+
+   inst = E_NEW(Instance, 1);
+   if (!inst)
+     return NULL;
+   inst->evas = gc->evas;
+   inst->con = e_container_current_get(e_manager_current_get());
+   if (!inst->con)
+     {
+	E_FREE(inst);
+	return NULL;
+     }
+   if ((gc->shelf) && (gc->shelf->popup))
+     inst->win.parent = gc->shelf->popup->evas_win;
+   else
+     inst->win.parent = inst->con->bg_win;
+
+   inst->win.base = None;
+   inst->win.selection = None;
+
+   inst->ui.gadget = edje_object_add(inst->evas);
+
+   _systray_theme(inst->ui.gadget, gc->shelf ? gc->shelf->style : NULL, style);
+
+   inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->ui.gadget);
+   if (!inst->gcc)
+     {
+	evas_object_del(inst->ui.gadget);
+	E_FREE(inst);
+	return NULL;
+     }
+
+   inst->gcc->data = inst;
+
+   if (!_systray_activate(inst))
+     {
+	if (!inst->timer.retry)
+	  inst->timer.retry = ecore_timer_add
+	    (0.1, _systray_activate_retry_first, inst);
+	else
+	  edje_object_signal_emit(inst->ui.gadget, _sig_disable, _sig_source);
+     }
+
+   evas_object_event_callback_add(inst->ui.gadget, EVAS_CALLBACK_MOUSE_DOWN,
+				  _systray_cb_mouse_down, inst);
+   evas_object_event_callback_add(inst->ui.gadget, EVAS_CALLBACK_MOVE,
+				  _systray_cb_move, inst);
+   evas_object_event_callback_add(inst->ui.gadget, EVAS_CALLBACK_RESIZE,
+				  _systray_cb_resize, inst);
+
+   inst->handler.message = ecore_event_handler_add
+     (ECORE_X_EVENT_CLIENT_MESSAGE, _systray_cb_client_message, inst);
+   inst->handler.destroy = ecore_event_handler_add
+     (ECORE_X_EVENT_WINDOW_DESTROY, _systray_cb_window_destroy, inst);
+   inst->handler.show = ecore_event_handler_add
+     (ECORE_X_EVENT_WINDOW_SHOW, _systray_cb_window_show, inst);
+   inst->handler.reparent = ecore_event_handler_add
+     (ECORE_X_EVENT_WINDOW_REPARENT, _systray_cb_reparent_notify, inst);
+   inst->handler.sel_clear = ecore_event_handler_add
+     (ECORE_X_EVENT_SELECTION_CLEAR, _systray_cb_selection_clear, inst);
+
+   instance = inst;
+   return inst->gcc;
+}
+
+/* Called when Gadget_Container says stop */
+static void
+_gc_shutdown(E_Gadcon_Client *gcc)
+{
+   Instance *inst = gcc->data;
+
+   fprintf(stderr, "SYSTRAY: shutdown %p, inst=%p\n", gcc, inst);
+
+   if (!inst)
+     return;
+
+   if (inst->menu)
+     {
+	e_menu_post_deactivate_callback_set(inst->menu, NULL, NULL);
+	e_object_del(E_OBJECT(inst->menu));
+     }
+
+   _systray_deactivate(inst);
+   evas_object_del(inst->ui.gadget);
+
+   if (inst->handler.message)
+     ecore_event_handler_del(inst->handler.message);
+   if (inst->handler.destroy)
+     ecore_event_handler_del(inst->handler.destroy);
+   if (inst->handler.show)
+     ecore_event_handler_del(inst->handler.show);
+   if (inst->handler.reparent)
+     ecore_event_handler_del(inst->handler.reparent);
+   if (inst->handler.sel_clear)
+     ecore_event_handler_del(inst->handler.sel_clear);
+   if (inst->timer.retry)
+     ecore_timer_del(inst->timer.retry);
+   if (inst->idler.size_apply)
+     ecore_idler_del(inst->idler.size_apply);
+
+   if (instance == inst)
+     instance = NULL;
+
+   E_FREE(inst);
+   gcc->data = NULL;
+}
+
+static void
+_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
+{
+   Instance *inst = gcc->data;
+   const char *signal;
+   unsigned int systray_orient;
+
+   if (!inst)
+     return;
+
+   switch (orient)
+     {
+      case E_GADCON_ORIENT_FLOAT:
+	 signal = "e,action,orient,float";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
+	 break;
+      case E_GADCON_ORIENT_HORIZ:
+	 signal = "e,action,orient,horiz";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
+	 break;
+      case E_GADCON_ORIENT_VERT:
+	 signal = "e,action,orient,vert";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_VERT;
+	 break;
+      case E_GADCON_ORIENT_LEFT:
+	 signal = "e,action,orient,left";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_VERT;
+	 break;
+      case E_GADCON_ORIENT_RIGHT:
+	 signal = "e,action,orient,right";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_VERT;
+	 break;
+      case E_GADCON_ORIENT_TOP:
+	 signal = "e,action,orient,top";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
+	 break;
+      case E_GADCON_ORIENT_BOTTOM:
+	 signal = "e,action,orient,bottom";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
+	 break;
+      case E_GADCON_ORIENT_CORNER_TL:
+	 signal = "e,action,orient,corner_tl";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
+	 break;
+      case E_GADCON_ORIENT_CORNER_TR:
+	 signal = "e,action,orient,corner_tr";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
+	 break;
+      case E_GADCON_ORIENT_CORNER_BL:
+	 signal = "e,action,orient,corner_bl";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
+	 break;
+      case E_GADCON_ORIENT_CORNER_BR:
+	 signal = "e,action,orient,corner_br";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
+	 break;
+      case E_GADCON_ORIENT_CORNER_LT:
+	 signal = "e,action,orient,corner_lt";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
+	 break;
+      case E_GADCON_ORIENT_CORNER_RT:
+	 signal = "e,action,orient,corner_rt";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
+	 break;
+      case E_GADCON_ORIENT_CORNER_LB:
+	 signal = "e,action,orient,corner_lb";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
+	 break;
+      case E_GADCON_ORIENT_CORNER_RB:
+	 signal = "e,action,orient,corner_rb";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
+	 break;
+      default:
+	 signal = "e,action,orient,horiz";
+	 systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
+     }
+
+   ecore_x_window_prop_card32_set
+     (inst->win.selection, _atom_st_orient, &systray_orient, 1);
+
+   edje_object_signal_emit(inst->ui.gadget, signal, _sig_source);
+   edje_object_message_signal_process(inst->ui.gadget);
+   _systray_size_apply(inst);
+}
+
+static char *
+_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
+{
+   return _("Systray");
+}
+
+static Evas_Object *
+_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
+{
+   Evas_Object *o;
+
+   o = edje_object_add(evas);
+   edje_object_file_set(o, _systray_theme_path(), "icon");
+   return o;
+}
+
+static const char *
+_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
+{
+   if (!instance)
+     return _name;
+   else
+     return NULL;
+}
+
+static const E_Gadcon_Client_Class _gc_class =
+{
+  GADCON_CLIENT_CLASS_VERSION, _name,
+  {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL},
+  E_GADCON_CLIENT_STYLE_INSET
+};
+
+EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, _Name};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   systray_mod = m;
+
+   e_gadcon_provider_register(&_gc_class);
+
+   if (!_atom_manager)
+     _atom_manager = ecore_x_atom_get("MANAGER");
+   if (!_atom_st_orient)
+     _atom_st_orient = ecore_x_atom_get("_NET_SYSTEM_TRAY_ORIENTATION");
+   if (!_atom_st_visual)
+     _atom_st_visual = ecore_x_atom_get("_NET_SYSTEM_TRAY_VISUAL");
+   if (!_atom_st_op_code)
+     _atom_st_op_code = ecore_x_atom_get("_NET_SYSTEM_TRAY_OPCODE");
+   if (!_atom_st_msg_data)
+     _atom_st_msg_data = ecore_x_atom_get("_NET_SYSTEM_TRAY_MESSAGE_DATA");
+   if (!_atom_xembed)
+     _atom_xembed = ecore_x_atom_get("_XEMBED");
+   if (!_atom_xembed_info)
+     _atom_xembed_info = ecore_x_atom_get("_XEMBED_INFO");
+
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m __UNUSED__)
+{
+   e_gadcon_provider_unregister(&_gc_class);
+   systray_mod = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m __UNUSED__)
+{
+   return 1;
+}
diff --git a/src/modules/gadman/e_mod_main.h b/src/modules/systray/e_mod_main.h
similarity index 100%
copy from src/modules/gadman/e_mod_main.h
copy to src/modules/systray/e_mod_main.h
diff --git a/src/modules/systray/module.desktop b/src/modules/systray/module.desktop
new file mode 100644
index 0000000..bd726c5
--- /dev/null
+++ b/src/modules/systray/module.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Link
+Name=Systray
+Name[eo]=Taskopleto
+Name[fr]=Zone de notification
+Name[cs]=Upozorňovací oblast
+Icon=e-module-systray
+Comment=<title>System Tray:</title><br>system tray that hold applications icons like Skype, Pidgin, Kopete and others.
+Comment[cs]=<title>Upozorňovací oblast:</title><br>spravuje aplikace jako Skype, Pidgin, Kopete a jiné.
+Comment[eo]=<title>Taskopleto:</title><br>zono kiu vidigas la piktogramojn de aplikaĵoj kiel Skajpo, Pidgin, Kopete kaj aliaj.
+Comment[fr]=<title>Zone de notification :</title><br>Une zone qui reçoit les icones des applications comme Skype, Pidgin, Kopete et autres.
+Comment[it]=<title>Vassoio di sistema:</title><br>Un'area che contiene le icone di notifica di applicazioni come Skype, Pidgin, Kopete e altre.
+X-Enlightenment-ModuleType=shelf
diff --git a/src/modules/systray/module.desktop.in b/src/modules/systray/module.desktop.in
new file mode 100644
index 0000000..bd726c5
--- /dev/null
+++ b/src/modules/systray/module.desktop.in
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Link
+Name=Systray
+Name[eo]=Taskopleto
+Name[fr]=Zone de notification
+Name[cs]=Upozorňovací oblast
+Icon=e-module-systray
+Comment=<title>System Tray:</title><br>system tray that hold applications icons like Skype, Pidgin, Kopete and others.
+Comment[cs]=<title>Upozorňovací oblast:</title><br>spravuje aplikace jako Skype, Pidgin, Kopete a jiné.
+Comment[eo]=<title>Taskopleto:</title><br>zono kiu vidigas la piktogramojn de aplikaĵoj kiel Skajpo, Pidgin, Kopete kaj aliaj.
+Comment[fr]=<title>Zone de notification :</title><br>Une zone qui reçoit les icones des applications comme Skype, Pidgin, Kopete et autres.
+Comment[it]=<title>Vassoio di sistema:</title><br>Un'area che contiene le icone di notifica di applicazioni come Skype, Pidgin, Kopete e altre.
+X-Enlightenment-ModuleType=shelf
diff --git a/src/modules/temperature/Makefile.in b/src/modules/temperature/Makefile.in
index da52f7c..0c41bb0 100644
--- a/src/modules/temperature/Makefile.in
+++ b/src/modules/temperature/Makefile.in
@@ -261,6 +261,7 @@ 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@
@@ -273,6 +274,7 @@ 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@
diff --git a/src/modules/winlist/Makefile.in b/src/modules/winlist/Makefile.in
index 3234569..ce79e92 100644
--- a/src/modules/winlist/Makefile.in
+++ b/src/modules/winlist/Makefile.in
@@ -253,6 +253,7 @@ 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@
@@ -265,6 +266,7 @@ 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@
diff --git a/src/modules/wizard/Makefile.in b/src/modules/wizard/Makefile.in
index d66dc92..99936a8 100644
--- a/src/modules/wizard/Makefile.in
+++ b/src/modules/wizard/Makefile.in
@@ -294,6 +294,7 @@ 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@
@@ -306,6 +307,7 @@ 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@
diff --git a/src/preload/Makefile.in b/src/preload/Makefile.in
index a78c2c0..d1dc3cf 100644
--- a/src/preload/Makefile.in
+++ b/src/preload/Makefile.in
@@ -249,6 +249,7 @@ 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@
@@ -261,6 +262,7 @@ 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@

-- 
Enlightenment 17



More information about the Pkg-e-commits mailing list