diff --git a/data/themes/default_shelf.edc b/data/themes/default_shelf.edc
index 4b34bfa0d..bb3c58f1e 100644
--- a/data/themes/default_shelf.edc
+++ b/data/themes/default_shelf.edc
@@ -11,105 +11,16 @@ group {
    name: "e/shelf/default/base";
    data {
       // this tells e the border is shaped
-      item: "shaped" "1";
+      //item: "shaped" "1";
+        item: "hidden_state_size" "6";
    }
    parts {
-      part {
-	 name:          "item_clip_bottom";
-	 type:          RECT;
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    color: 255 255 255 0;
-	 }
-	 description {
-	    state:    "hidden" 0.0;
-	    inherit: "default" 0.0;
-	    rel1 {
-	       relative: 0.0 1.0;
-	       offset: 0 -2;
-	    }
-	    rel2 {
-	       relative: 1.0 2.0;
-	       offset: -1 -3;
-	    }
-	 }
-      }
-      part {
-	 name:          "item_clip_top";
-	 type:          RECT;
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    color: 255 255 255 0;
-	 }
-	 description {
-	    state:    "hidden" 0.0;
-	    inherit: "default" 0.0;
-	    rel1 {
-	       relative: 0.0 -1.0;
-	       offset: 0 2;
-	    }
-	    rel2 {
-	       relative: 1.0 0.0;
-	       offset: -1 1;
-	    }
-	 }
-      }
-      part {
-	 name:          "item_clip_left";
-	 type:          RECT;
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    color: 255 255 255 0;
-	 }
-	 description {
-	    state:    "hidden" 0.0;
-	    inherit: "default" 0.0;
-	    rel1 {
-	       relative: -1.0 0.0;
-	       offset: 2 0;
-	    }
-	    rel2 {
-	       relative: 0.0 1.0;
-	       offset: 1 -1;
-	    }
-	 }
-      }
-      part {
-	 name:          "item_clip_right";
-	 type:          RECT;
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    color: 255 255 255 0;
-	 }
-	 description {
-	    state:    "hidden" 0.0;
-	    inherit: "default" 0.0;
-	    rel1 {
-	       relative: 1.0 0.0;
-	       offset: -2 0;
-	    }
-	    rel2 {
-	       relative: 2.0 1.0;
-	       offset: -3 -1;
-	    }
-	 }
-      }
+     
       part {
 	 name:          "base";
 	 mouse_events:  0;
-//	 clip_to:       "item_clip";
 	 description {
 	    state:    "default" 0.0;
-	    rel1 {
-	       to: "item_clip_top";
-	    }
-	    rel2 {
-	       to: "item_clip_top";
-	    }
 	    image {
 	       normal: "e17_shelf_bg_h.png";
 	       border: 19 19 9 9;
@@ -126,12 +37,6 @@ group {
 	 description {
 	    state:    "top_left" 0.0;
 	    inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_top";
-	    }
-	    rel2 {
-	       to: "item_clip_top";
-	    }
 	    fill {
 	       origin {
 		  offset: -16 -6;
@@ -144,12 +49,6 @@ group {
 	 description {
 	    state:    "top_right" 0.0;
 	    inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_top";
-	    }
-	    rel2 {
-	       to: "item_clip_top";
-	    }
 	    fill {
 	       origin {
 		  offset: 0 -6;
@@ -162,12 +61,6 @@ group {
 	 description {
 	    state:    "bottom" 0.0;
 	    inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_bottom";
-	    }
-	    rel2 {
-	       to: "item_clip_bottom";
-	    }
 	    fill {
 	       origin {
 		  offset: 0 0;
@@ -180,12 +73,6 @@ group {
 	 description {
 	    state:    "bottom_left" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_bottom";
-	    }
-	    rel2 {
-	       to: "item_clip_bottom";
-	    }
 	    fill {
 	       origin {
 		  offset: -16 0;
@@ -198,12 +85,6 @@ group {
 	 description {
 	    state:    "bottom_right" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_bottom";
-	    }
-	    rel2 {
-	       to: "item_clip_bottom";
-	    }
 	    fill {
 	       origin {
 		  offset: 0 0;
@@ -216,12 +97,6 @@ group {
 	 description {
 	    state:    "left" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_left";
-	    }
-	    rel2 {
-	       to: "item_clip_left";
-	    }
 	    image {
 	       normal: "e17_shelf_bg_v.png";
 	       border: 9 9 19 19;
@@ -238,12 +113,6 @@ group {
 	 description {
 	    state:    "left_top" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_left";
-	    }
-	    rel2 {
-	       to: "item_clip_left";
-	    }
 	    image {
 	       normal: "e17_shelf_bg_v.png";
 	       border: 9 9 19 19;
@@ -260,12 +129,6 @@ group {
 	 description {
 	    state:    "left_bottom" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_left";
-	    }
-	    rel2 {
-	       to: "item_clip_left";
-	    }
 	    image {
 	       normal: "e17_shelf_bg_v.png";
 	       border: 9 9 19 19;
@@ -282,12 +145,6 @@ group {
 	 description {
 	    state:    "right" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_right";
-	    }
-	    rel2 {
-	       to: "item_clip_right";
-	    }
 	    image {
 	       normal: "e17_shelf_bg_v.png";
 	       border: 9 9 19 19;
@@ -304,12 +161,6 @@ group {
 	 description {
 	    state:    "right_top" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_right";
-	    }
-	    rel2 {
-	       to: "item_clip_right";
-	    }
 	    image {
 	       normal: "e17_shelf_bg_v.png";
 	       border: 9 9 19 19;
@@ -326,12 +177,6 @@ group {
 	 description {
 	    state:    "right_bottom" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_right";
-	    }
-	    rel2 {
-	       to: "item_clip_right";
-	    }
 	    image {
 	       normal: "e17_shelf_bg_v.png";
 	       border: 9 9 19 19;
@@ -353,12 +198,10 @@ group {
 	 description {
 	    state:    "default" 0.0;
 	    rel1 {
-	       to: "item_clip_top";
 	       relative: 0.0  0.0;
 	       offset:   18   2;
 	    }
 	    rel2 {
-	       to: "item_clip_top";
 	       relative: 1.0  1.0;
 	       offset:   -19   -3;
 	    }
@@ -367,12 +210,10 @@ group {
 	    state:    "top_left" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_top";
 	       relative: 0.0  0.0;
 	       offset:   2    2;
 	    }
 	    rel2 {
-	       to: "item_clip_top";
 	       relative: 1.0  1.0;
 	       offset:   -19   -3;
 	    }
@@ -381,12 +222,10 @@ group {
 	    state:    "top_right" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_top";
 	       relative: 0.0  0.0;
 	       offset:   18   2;
 	    }
 	    rel2 {
-	       to: "item_clip_top";
 	       relative: 1.0  1.0;
 	       offset:   -3   -3;
 	    }
@@ -395,12 +234,10 @@ group {
 	    state:    "bottom" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_bottom";
 	       relative: 0.0  0.0;
 	       offset:   18   2;
 	    }
 	    rel2 {
-	       to: "item_clip_bottom";
 	       relative: 1.0  1.0;
 	       offset:   -19   -3;
 	    }
@@ -409,12 +246,10 @@ group {
 	    state:    "bottom_left" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_bottom";
 	       relative: 0.0  0.0;
 	       offset:   2   2;
 	    }
 	    rel2 {
-	       to: "item_clip_bottom";
 	       relative: 1.0  1.0;
 	       offset:   -19   -3;
 	    }
@@ -423,12 +258,10 @@ group {
 	    state:    "bottom_right" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_bottom";
 	       relative: 0.0  0.0;
 	       offset:   18   2;
 	    }
 	    rel2 {
-	       to: "item_clip_bottom";
 	       relative: 1.0  1.0;
 	       offset:   -3   -3;
 	    }
@@ -437,12 +270,10 @@ group {
 	    state:    "left" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_left";
 	       relative: 0.0  0.0;
 	       offset:   2    18;
 	    }
 	    rel2 {
-	       to: "item_clip_left";
 	       relative: 1.0  1.0;
 	       offset:   -3   -19;
 	    }
@@ -451,12 +282,10 @@ group {
 	    state:    "left_top" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_left";
 	       relative: 0.0  0.0;
 	       offset:   2    2;
 	    }
 	    rel2 {
-	       to: "item_clip_left";
 	       relative: 1.0  1.0;
 	       offset:   -3   -19;
 	    }
@@ -465,12 +294,10 @@ group {
 	    state:    "left_bottom" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_left";
 	       relative: 0.0  0.0;
 	       offset:   2    18;
 	    }
 	    rel2 {
-	       to: "item_clip_left";
 	       relative: 1.0  1.0;
 	       offset:   -3   -3;
 	    }
@@ -479,12 +306,10 @@ group {
 	    state:    "right" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_right";
 	       relative: 0.0  0.0;
 	       offset:   2    18;
 	    }
 	    rel2 {
-	       to: "item_clip_right";
 	       relative: 1.0  1.0;
 	       offset:   -3   -19;
 	    }
@@ -493,12 +318,10 @@ group {
 	    state:    "right_top" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_right";
 	       relative: 0.0  0.0;
 	       offset:   2    2;
 	    }
 	    rel2 {
-	       to: "item_clip_right";
 	       relative: 1.0  1.0;
 	       offset:   -3   -19;
 	    }
@@ -507,12 +330,10 @@ group {
 	    state:    "right_bottom" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_right";
 	       relative: 0.0  0.0;
 	       offset:   2    18;
 	    }
 	    rel2 {
-	       to: "item_clip_right";
 	       relative: 1.0  1.0;
 	       offset:   -3   -3;
 	    }
@@ -520,28 +341,7 @@ group {
       }
    }
    programs {
-      program {
-	 name:    "hide";
-	 signal:  "e,state,hidden";
-	 source:  "e";
-	 action:  STATE_SET "hidden" 0.0;
-	 transition: ACCELERATE 0.3;
-	 target:  "item_clip_bottom";
-	 target:  "item_clip_top";
-	 target:  "item_clip_left";
-	 target:  "item_clip_right";
-      }
-      program {
-	 name:    "show";
-	 signal:  "e,state,visible";
-	 source:  "e";
-	 transition: DECELERATE 0.3;
-	 action:  STATE_SET "default" 0.0;
-	 target:  "item_clip_bottom";
-	 target:  "item_clip_top";
-	 target:  "item_clip_left";
-	 target:  "item_clip_right";
-      }
+
       program {
 	 name:    "orient1";
 	 signal:  "e,state,orientation,top";
@@ -777,104 +577,15 @@ group {
    data {
       // this tells e the border is shaped
       item: "shaped" "1";
+      item: "hidden_state_size" "6";
    }
    parts {
-      part {
-	 name:          "item_clip_bottom";
-	 type:          RECT;
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    color: 255 255 255 0;
-	 }
-	 description {
-	    state:    "hidden" 0.0;
-	    inherit: "default" 0.0;
-	    rel1 {
-	       relative: 0.0 1.0;
-	       offset: 0 -2;
-	    }
-	    rel2 {
-	       relative: 1.0 2.0;
-	       offset: -1 -3;
-	    }
-	 }
-      }
-      part {
-	 name:          "item_clip_top";
-	 type:          RECT;
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    color: 255 255 255 0;
-	 }
-	 description {
-	    state:    "hidden" 0.0;
-	    inherit: "default" 0.0;
-	    rel1 {
-	       relative: 0.0 -1.0;
-	       offset: 0 2;
-	    }
-	    rel2 {
-	       relative: 1.0 0.0;
-	       offset: -1 1;
-	    }
-	 }
-      }
-      part {
-	 name:          "item_clip_left";
-	 type:          RECT;
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    color: 255 255 255 0;
-	 }
-	 description {
-	    state:    "hidden" 0.0;
-	    inherit: "default" 0.0;
-	    rel1 {
-	       relative: -1.0 0.0;
-	       offset: 2 0;
-	    }
-	    rel2 {
-	       relative: 0.0 1.0;
-	       offset: 1 -1;
-	    }
-	 }
-      }
-      part {
-	 name:          "item_clip_right";
-	 type:          RECT;
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    color: 255 255 255 0;
-	 }
-	 description {
-	    state:    "hidden" 0.0;
-	    inherit: "default" 0.0;
-	    rel1 {
-	       relative: 1.0 0.0;
-	       offset: -2 0;
-	    }
-	    rel2 {
-	       relative: 2.0 1.0;
-	       offset: -3 -1;
-	    }
-	 }
-      }
+     
       part {
 	 name:          "base";
 	 mouse_events:  0;
-//	 clip_to:       "item_clip";
 	 description {
 	    state:    "default" 0.0;
-	    rel1 {
-	       to: "item_clip_top";
-	    }
-	    rel2 {
-	       to: "item_clip_top";
-	    }
 	    image {
 	       normal: "e17_shelf_bg2_h.png";
 	       border: 19 19 9 9;
@@ -891,12 +602,6 @@ group {
 	 description {
 	    state:    "top_left" 0.0;
 	    inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_top";
-	    }
-	    rel2 {
-	       to: "item_clip_top";
-	    }
 	    fill {
 	       origin {
 		  offset: -16 -6;
@@ -909,12 +614,6 @@ group {
 	 description {
 	    state:    "top_right" 0.0;
 	    inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_top";
-	    }
-	    rel2 {
-	       to: "item_clip_top";
-	    }
 	    fill {
 	       origin {
 		  offset: 0 -6;
@@ -927,12 +626,6 @@ group {
 	 description {
 	    state:    "bottom" 0.0;
 	    inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_bottom";
-	    }
-	    rel2 {
-	       to: "item_clip_bottom";
-	    }
 	    fill {
 	       origin {
 		  offset: 0 0;
@@ -945,12 +638,6 @@ group {
 	 description {
 	    state:    "bottom_left" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_bottom";
-	    }
-	    rel2 {
-	       to: "item_clip_bottom";
-	    }
 	    fill {
 	       origin {
 		  offset: -16 0;
@@ -963,12 +650,6 @@ group {
 	 description {
 	    state:    "bottom_right" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_bottom";
-	    }
-	    rel2 {
-	       to: "item_clip_bottom";
-	    }
 	    fill {
 	       origin {
 		  offset: 0 0;
@@ -981,12 +662,6 @@ group {
 	 description {
 	    state:    "left" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_left";
-	    }
-	    rel2 {
-	       to: "item_clip_left";
-	    }
 	    image {
 	       normal: "e17_shelf_bg2_v.png";
 	       border: 9 9 19 19;
@@ -1003,12 +678,6 @@ group {
 	 description {
 	    state:    "left_top" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_left";
-	    }
-	    rel2 {
-	       to: "item_clip_left";
-	    }
 	    image {
 	       normal: "e17_shelf_bg2_v.png";
 	       border: 9 9 19 19;
@@ -1025,12 +694,6 @@ group {
 	 description {
 	    state:    "left_bottom" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_left";
-	    }
-	    rel2 {
-	       to: "item_clip_left";
-	    }
 	    image {
 	       normal: "e17_shelf_bg2_v.png";
 	       border: 9 9 19 19;
@@ -1047,12 +710,6 @@ group {
 	 description {
 	    state:    "right" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_right";
-	    }
-	    rel2 {
-	       to: "item_clip_right";
-	    }
 	    image {
 	       normal: "e17_shelf_bg2_v.png";
 	       border: 9 9 19 19;
@@ -1069,12 +726,6 @@ group {
 	 description {
 	    state:    "right_top" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_right";
-	    }
-	    rel2 {
-	       to: "item_clip_right";
-	    }
 	    image {
 	       normal: "e17_shelf_bg2_v.png";
 	       border: 9 9 19 19;
@@ -1091,12 +742,6 @@ group {
 	 description {
 	    state:    "right_bottom" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_right";
-	    }
-	    rel2 {
-	       to: "item_clip_right";
-	    }
 	    image {
 	       normal: "e17_shelf_bg2_v.png";
 	       border: 9 9 19 19;
@@ -1114,16 +759,13 @@ group {
       part {
 	 name:          "e.swallow.content";
 	 type:          SWALLOW;
-//	 clip_to:       "item_clip";
 	 description {
 	    state:    "default" 0.0;
 	    rel1 {
-	       to: "item_clip_top";
 	       relative: 0.0  0.0;
 	       offset:   18   2;
 	    }
 	    rel2 {
-	       to: "item_clip_top";
 	       relative: 1.0  1.0;
 	       offset:   -19   -3;
 	    }
@@ -1132,12 +774,10 @@ group {
 	    state:    "top_left" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_top";
 	       relative: 0.0  0.0;
 	       offset:   2    2;
 	    }
 	    rel2 {
-	       to: "item_clip_top";
 	       relative: 1.0  1.0;
 	       offset:   -19   -3;
 	    }
@@ -1146,12 +786,10 @@ group {
 	    state:    "top_right" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_top";
 	       relative: 0.0  0.0;
 	       offset:   18   2;
 	    }
-	    rel2 {
-	       to: "item_clip_top";
+	    rel2 {;
 	       relative: 1.0  1.0;
 	       offset:   -3   -3;
 	    }
@@ -1160,12 +798,10 @@ group {
 	    state:    "bottom" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_bottom";
 	       relative: 0.0  0.0;
 	       offset:   18   2;
 	    }
 	    rel2 {
-	       to: "item_clip_bottom";
 	       relative: 1.0  1.0;
 	       offset:   -19   -3;
 	    }
@@ -1174,12 +810,10 @@ group {
 	    state:    "bottom_left" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_bottom";
 	       relative: 0.0  0.0;
 	       offset:   2   2;
 	    }
 	    rel2 {
-	       to: "item_clip_bottom";
 	       relative: 1.0  1.0;
 	       offset:   -19   -3;
 	    }
@@ -1188,12 +822,10 @@ group {
 	    state:    "bottom_right" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_bottom";
 	       relative: 0.0  0.0;
 	       offset:   18   2;
 	    }
 	    rel2 {
-	       to: "item_clip_bottom";
 	       relative: 1.0  1.0;
 	       offset:   -3   -3;
 	    }
@@ -1202,12 +834,10 @@ group {
 	    state:    "left" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_left";
 	       relative: 0.0  0.0;
 	       offset:   2    18;
 	    }
 	    rel2 {
-	       to: "item_clip_left";
 	       relative: 1.0  1.0;
 	       offset:   -3   -19;
 	    }
@@ -1216,12 +846,10 @@ group {
 	    state:    "left_top" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_left";
 	       relative: 0.0  0.0;
 	       offset:   2    2;
 	    }
 	    rel2 {
-	       to: "item_clip_left";
 	       relative: 1.0  1.0;
 	       offset:   -3   -19;
 	    }
@@ -1230,12 +858,10 @@ group {
 	    state:    "left_bottom" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_left";
 	       relative: 0.0  0.0;
 	       offset:   2    18;
 	    }
 	    rel2 {
-	       to: "item_clip_left";
 	       relative: 1.0  1.0;
 	       offset:   -3   -3;
 	    }
@@ -1244,12 +870,10 @@ group {
 	    state:    "right" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_right";
 	       relative: 0.0  0.0;
 	       offset:   2    18;
 	    }
 	    rel2 {
-	       to: "item_clip_right";
 	       relative: 1.0  1.0;
 	       offset:   -3   -19;
 	    }
@@ -1258,12 +882,10 @@ group {
 	    state:    "right_top" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_right";
 	       relative: 0.0  0.0;
 	       offset:   2    2;
 	    }
 	    rel2 {
-	       to: "item_clip_right";
 	       relative: 1.0  1.0;
 	       offset:   -3   -19;
 	    }
@@ -1272,12 +894,10 @@ group {
 	    state:    "right_bottom" 0.0;
 	    inherit:  "default" 0.0;
 	    rel1 {
-	       to: "item_clip_right";
 	       relative: 0.0  0.0;
 	       offset:   2    18;
 	    }
 	    rel2 {
-	       to: "item_clip_right";
 	       relative: 1.0  1.0;
 	       offset:   -3   -3;
 	    }
@@ -1285,7 +905,7 @@ group {
       }
    }
    programs {
-      program {
+    /*  program {
 	 name:    "hide";
 	 signal:  "e,state,hidden";
 	 source:  "e";
@@ -1306,7 +926,7 @@ group {
 	 target:  "item_clip_top";
 	 target:  "item_clip_left";
 	 target:  "item_clip_right";
-      }
+      }*/
       program {
 	 name:    "orient1";
 	 signal:  "e,state,orientation,top";
@@ -1531,96 +1151,13 @@ group {
    data {
       // this tells e the border is shaped
       item: "shaped" "1";
+      item: "hidden_state_size" "6";
    }
    parts {
-      part {
-	 name:          "item_clip_bottom";
-	 type:          RECT;
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    color: 255 255 255 0;
-	 }
-	 description {
-	    state:    "hidden" 0.0;
-	    inherit: "default" 0.0;
-	    rel1 {
-	       relative: 0.0 1.0;
-	       offset: 0 -2;
-	    }
-	    rel2 {
-	       relative: 1.0 2.0;
-	       offset: -1 -3;
-	    }
-	 }
-      }
-      part {
-	 name:          "item_clip_top";
-	 type:          RECT;
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    color: 255 255 255 0;
-	 }
-	 description {
-	    state:    "hidden" 0.0;
-	    inherit: "default" 0.0;
-	    rel1 {
-	       relative: 0.0 -1.0;
-	       offset: 0 2;
-	    }
-	    rel2 {
-	       relative: 1.0 0.0;
-	       offset: -1 1;
-	    }
-	 }
-      }
-      part {
-	 name:          "item_clip_left";
-	 type:          RECT;
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    color: 255 255 255 0;
-	 }
-	 description {
-	    state:    "hidden" 0.0;
-	    inherit: "default" 0.0;
-	    rel1 {
-	       relative: -1.0 0.0;
-	       offset: 2 0;
-	    }
-	    rel2 {
-	       relative: 0.0 1.0;
-	       offset: 1 -1;
-	    }
-	 }
-      }
-      part {
-	 name:          "item_clip_right";
-	 type:          RECT;
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    color: 255 255 255 0;
-	 }
-	 description {
-	    state:    "hidden" 0.0;
-	    inherit: "default" 0.0;
-	    rel1 {
-	       relative: 1.0 0.0;
-	       offset: -2 0;
-	    }
-	    rel2 {
-	       relative: 2.0 1.0;
-	       offset: -3 -1;
-	    }
-	 }
-      }
+    
       part {
 	 name:          "e.swallow.content";
 	 type:          SWALLOW;
-//	 clip_to:       "item_clip";
 	 description {
 	    state:    "default" 0.0;
 	    rel1 {
@@ -1636,131 +1173,58 @@ group {
 	 mouse_events:  1;
 	 type:          RECT;
 	 repeat_events: 1;
-//	 clip_to:       "item_clip";
 	 description {
 	    state:    "default" 0.0;
 	    color:    255 255 255 0;
-	    rel1 {
-	       to: "item_clip_top";
-	    }
-	    rel2 {
-	       to: "item_clip_top";
-	    }
 	 }
 	 description {
 	    state:    "top_left" 0.0;
 	    inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_top";
-	    }
-	    rel2 {
-	       to: "item_clip_top";
-	    }
 	 }
 	 description {
 	    state:    "top_right" 0.0;
 	    inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_top";
-	    }
-	    rel2 {
-	       to: "item_clip_top";
-	    }
 	 }
 	 description {
 	    state:    "bottom" 0.0;
 	    inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_bottom";
-	    }
-	    rel2 {
-	       to: "item_clip_bottom";
-	    }
 	 }
 	 description {
 	    state:    "bottom_left" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_bottom";
-	    }
-	    rel2 {
-	       to: "item_clip_bottom";
-	    }
 	 }
 	 description {
 	    state:    "bottom_right" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_bottom";
-	    }
-	    rel2 {
-	       to: "item_clip_bottom";
-	    }
 	 }
 	 description {
 	    state:    "left" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_left";
-	    }
-	    rel2 {
-	       to: "item_clip_left";
-	    }
 	 }
 	 description {
 	    state:    "left_top" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_left";
-	    }
-	    rel2 {
-	       to: "item_clip_left";
-	    }
 	 }
 	 description {
 	    state:    "left_bottom" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_left";
-	    }
-	    rel2 {
-	       to: "item_clip_left";
-	    }
 	 }
 	 description {
 	    state:    "right" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_right";
-	    }
-	    rel2 {
-	       to: "item_clip_right";
-	    }
 	 }
 	 description {
 	    state:    "right_top" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_right";
-	    }
-	    rel2 {
-	       to: "item_clip_right";
-	    }
 	 }
 	 description {
 	    state:    "right_bottom" 0.0;
             inherit:  "default" 0.0;
-	    rel1 {
-	       to: "item_clip_right";
-	    }
-	    rel2 {
-	       to: "item_clip_right";
-	    }
 	 }
       }
    }
    programs {
-      program {
+     /* program {
 	 name:    "hide";
 	 signal:  "e,state,hidden";
 	 source:  "e";
@@ -1781,7 +1245,7 @@ group {
 	 target:  "item_clip_top";
 	 target:  "item_clip_left";
 	 target:  "item_clip_right";
-      }
+      }*/
       program {
 	 name:    "orient1";
 	 signal:  "e,state,orientation,top";
diff --git a/po/bg.po b/po/bg.po
index d12e25dd9..fe9f14dd2 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,34 +7,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2006-12-04 10:14+0900\n"
-"PO-Revision-Date: 2006-12-02 00:54+0200\n"
+"POT-Creation-Date: 2007-02-14 23:25+0200\n"
+"PO-Revision-Date: 2007-02-12 00:24+0200\n"
 "Last-Translator: Viktor Kojouharov <vkojouharov@abv.bg>\n"
 "Language-Team: English <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/bin/e_apps.c:676 src/bin/e_apps.c:689 src/bin/e_utils.c:236
+#: src/bin/e_apps.c:671 src/bin/e_apps.c:686 src/bin/e_utils.c:237
+#: src/bin/e_int_config_imc.c:280 src/bin/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Грешка при изпълнение"
 
-#: src/bin/e_apps.c:677
+#: src/bin/e_apps.c:672
 #, c-format
 msgid "Enlightenment was unable to process a command line:<br><br>%s %s<br>"
 msgstr "Enlightenment не е могъл да обработи командата:<br><br>%s %s<br>"
 
-#: src/bin/e_apps.c:690
+#: src/bin/e_apps.c:687
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s %s<br>"
 msgstr ""
 "Enlightenment не е могъл да създаде отделен дъщерен процес:<br><br>%s %s<br>"
 
-#: src/bin/e_apps.c:2871
+#: src/bin/e_apps.c:2814
 msgid "Application run error"
 msgstr "Грешка при изпълнение"
 
-#: src/bin/e_apps.c:2873
+#: src/bin/e_apps.c:2816
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -43,22 +44,23 @@ msgstr ""
 "Enlightenment·не успя да пусне програмата:<br><br>%s<br><br>Програмата не "
 "успя да се стартира."
 
-#: src/bin/e_apps.c:2881 src/bin/e_module.c:405 src/bin/e_utils.c:576
-#: src/bin/e_config_dialog.c:218 src/bin/e_int_border_remember.c:248
-#: src/bin/e_int_border_remember.c:323 src/bin/e_int_border_remember.c:365
-#: src/bin/e_eap_editor.c:502 src/bin/e_sys.c:392 src/bin/e_sys.c:437
-#: src/bin/e_entry_dialog.c:56 src/bin/e_fm.c:4783 src/bin/e_fm.c:4896
-#: src/bin/e_fm.c:5495 src/bin/e_fm.c:5555 src/bin/e_fm.c:5593
+#: src/bin/e_apps.c:2824 src/bin/e_module.c:407 src/bin/e_utils.c:577
+#: src/bin/e_config_dialog.c:218 src/bin/e_int_config_imc_import.c:113
+#: src/bin/e_int_border_remember.c:248 src/bin/e_int_border_remember.c:323
+#: src/bin/e_int_border_remember.c:365 src/bin/e_eap_editor.c:502
+#: src/bin/e_sys.c:392 src/bin/e_sys.c:437 src/bin/e_entry_dialog.c:56
+#: src/bin/e_fm.c:5039 src/bin/e_fm.c:5152 src/bin/e_fm.c:5747
+#: src/bin/e_fm.c:5807 src/bin/e_fm.c:5846
 #: src/bin/e_int_config_mime_edit.c:277
 #: src/bin/e_int_config_wallpaper_import.c:187
-#: src/bin/e_int_config_wallpaper_gradient.c:199
+#: src/bin/e_int_config_wallpaper_gradient.c:197
 #: src/bin/e_int_config_theme_import.c:113
 #: src/modules/battery/e_mod_main.c:306 src/modules/cpufreq/e_mod_main.c:334
 #: src/modules/cpufreq/e_mod_main.c:361 src/modules/cpufreq/e_mod_main.c:380
 msgid "OK"
 msgstr "Добре"
 
-#: src/bin/e_config.c:517
+#: src/bin/e_config.c:540
 msgid ""
 "Configuration data needed upgrading. Your old configuration<br>has been "
 "wiped and a new set of defaults initialized. This<br>will happen regularly "
@@ -75,7 +77,7 @@ msgstr ""
 "Сега<br>може да конфигурирате Е както ви харесва. Извиняваме се за това "
 "неудобство.<br>"
 
-#: src/bin/e_config.c:531
+#: src/bin/e_config.c:554
 msgid ""
 "Your configuration is NEWER than Enlightenment. This is very<br>strange. "
 "This should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -89,16 +91,16 @@ msgstr ""
 "лошо, и затова конфигурацията е възстановена по<br>подразбиране. Извиняваме "
 "се за това неудобство.<br>"
 
-#: src/bin/e_config.c:554
+#: src/bin/e_config.c:576
 #, c-format
 msgid "Desktop %i, %i"
 msgstr "Поле %i, %i"
 
-#: src/bin/e_config.c:1970
+#: src/bin/e_config.c:2028
 msgid "Configuration Upgraded"
 msgstr "Конфигурацията е подновена"
 
-#: src/bin/e_config.c:1985
+#: src/bin/e_config.c:2042
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>configuration to disk. The "
@@ -106,7 +108,7 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1996
+#: src/bin/e_config.c:2053
 #, c-format
 msgid ""
 "Enlightenment's configuration files are too big<br>for the file system they "
@@ -116,7 +118,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2009
+#: src/bin/e_config.c:2066
 #, c-format
 msgid ""
 "An output error occured when writing the configuration<br>files for "
@@ -125,7 +127,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2020
+#: src/bin/e_config.c:2077
 #, c-format
 msgid ""
 "Enlightenment cannot write its configuration file<br>because it ran out of "
@@ -134,7 +136,7 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2032
+#: src/bin/e_config.c:2089
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the configuration file<br>it was writing "
@@ -142,7 +144,7 @@ msgid ""
 "was:<br>%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:2048
+#: src/bin/e_config.c:2105
 msgid "Enlightenment Configration Write Problems"
 msgstr "Проблем при запазване на конфигурацията на E17"
 
@@ -151,6 +153,12 @@ msgstr "Проблем при запазване на конфигурацият
 msgid "Container %d"
 msgstr "Контейнер %d"
 
+#: src/bin/e_hints.c:126
+msgid ""
+"A previous instance of Enlightenment is still active\n"
+"on this screen. Aborting startup.\n"
+msgstr ""
+
 #: src/bin/e_init.c:48
 #, c-format
 msgid "X reports there are no root windows and %i screens!\n"
@@ -179,8 +187,8 @@ msgstr "Главно"
 msgid "Favorite Applications"
 msgstr "Предпочитани програми"
 
-#: src/bin/e_int_menus.c:103 src/bin/e_configure.c:404
-#: src/bin/e_int_config_apps.c:83
+#: src/bin/e_int_menus.c:103 src/bin/e_configure.c:406
+#: src/bin/e_int_config_apps.c:86
 msgid "Applications"
 msgstr "Програми"
 
@@ -188,29 +196,29 @@ msgstr "Програми"
 msgid "Files"
 msgstr "Файлове"
 
-#: src/bin/e_int_menus.c:115 src/bin/e_configure.c:441
+#: src/bin/e_int_menus.c:115 src/bin/e_configure.c:443
 msgid "Run Command"
 msgstr "Стартиране на програма"
 
-#: src/bin/e_int_menus.c:125 src/bin/e_actions.c:1861 src/bin/e_actions.c:1862
-#: src/bin/e_actions.c:1863 src/bin/e_actions.c:1864 src/bin/e_actions.c:1865
-#: src/bin/e_actions.c:1870 src/bin/e_actions.c:1875 src/bin/e_actions.c:1880
-#: src/bin/e_actions.c:1885 src/bin/e_actions.c:1887 src/bin/e_actions.c:1889
-#: src/bin/e_actions.c:1891 src/bin/e_actions.c:1893 src/bin/e_actions.c:1895
-#: src/bin/e_actions.c:1897 src/bin/e_actions.c:1899 src/bin/e_actions.c:1901
-#: src/bin/e_actions.c:1903 src/bin/e_actions.c:1905 src/bin/e_actions.c:1907
-#: src/bin/e_actions.c:1909 src/bin/e_actions.c:2025 src/bin/e_actions.c:2029
-#: src/modules/ibox/e_mod_config.c:142
+#: src/bin/e_int_menus.c:125 src/bin/e_actions.c:1955 src/bin/e_actions.c:1956
+#: src/bin/e_actions.c:1957 src/bin/e_actions.c:1958 src/bin/e_actions.c:1959
+#: src/bin/e_actions.c:1964 src/bin/e_actions.c:1969 src/bin/e_actions.c:1974
+#: src/bin/e_actions.c:1979 src/bin/e_actions.c:1981 src/bin/e_actions.c:1983
+#: src/bin/e_actions.c:1985 src/bin/e_actions.c:1987 src/bin/e_actions.c:1989
+#: src/bin/e_actions.c:1991 src/bin/e_actions.c:1993 src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1997 src/bin/e_actions.c:1999 src/bin/e_actions.c:2001
+#: src/bin/e_actions.c:2003 src/bin/e_actions.c:2124 src/bin/e_actions.c:2128
+#: src/modules/ibox/e_mod_config.c:139
 msgid "Desktop"
 msgstr "Поле"
 
-#: src/bin/e_int_menus.c:133 src/bin/e_int_menus.c:919
-#: src/bin/e_configure.c:418
+#: src/bin/e_int_menus.c:133 src/bin/e_int_menus.c:940
+#: src/bin/e_configure.c:422
 msgid "Windows"
 msgstr "Прозорци"
 
-#: src/bin/e_int_menus.c:150 src/bin/e_main.c:790 src/bin/e_actions.c:1993
-#: src/bin/e_actions.c:1996 src/bin/e_actions.c:1999 src/bin/e_actions.c:2002
+#: src/bin/e_int_menus.c:150 src/bin/e_main.c:806 src/bin/e_actions.c:2092
+#: src/bin/e_actions.c:2095 src/bin/e_actions.c:2098 src/bin/e_actions.c:2101
 #: src/bin/e_about.c:51
 msgid "Enlightenment"
 msgstr "Enlightenment"
@@ -220,32 +228,33 @@ msgid "About"
 msgstr "За"
 
 #: src/bin/e_int_menus.c:161 src/bin/e_int_menus.c:763
-#: src/bin/e_configure.c:395
+#: src/bin/e_configure.c:397
 msgid "Theme"
 msgstr "Тема"
 
-#: src/bin/e_int_menus.c:169 src/bin/e_actions.c:1993
-#: src/bin/e_int_config_apps.c:113
+#: src/bin/e_int_menus.c:169 src/bin/e_actions.c:2092
+#: src/bin/e_int_config_apps.c:138
 msgid "Restart"
 msgstr "Рестартиране"
 
-#: src/bin/e_int_menus.c:174 src/bin/e_actions.c:1996
+#: src/bin/e_int_menus.c:174 src/bin/e_actions.c:2095
 msgid "Exit"
 msgstr "Изход"
 
-#: src/bin/e_int_menus.c:184 src/bin/e_module.c:474
+#: src/bin/e_int_menus.c:184 src/bin/e_module.c:477
 #: src/modules/battery/e_mod_main.c:175 src/modules/ibar/e_mod_main.c:297
-#: src/modules/ibar/e_mod_main.c:922 src/modules/ibox/e_mod_main.c:289
-#: src/modules/ibox/e_mod_main.c:680 src/modules/pager/e_mod_main.c:629
-#: src/modules/temperature/e_mod_main.c:145
+#: src/modules/ibar/e_mod_main.c:922 src/modules/ibox/e_mod_main.c:290
+#: src/modules/ibox/e_mod_main.c:690 src/modules/pager/e_mod_main.c:622
+#: src/modules/temperature/e_mod_main.c:166
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: src/bin/e_int_menus.c:194 src/bin/e_actions.c:2005 src/bin/e_actions.c:2008
-#: src/bin/e_actions.c:2011 src/bin/e_actions.c:2014
-#: src/bin/e_int_config_theme.c:362 src/bin/e_int_config_startup.c:273
-#: src/bin/e_int_config_desklock.c:564 src/bin/e_int_config_wallpaper.c:460
-#: src/bin/e_int_config_wallpaper.c:615 src/bin/e_fdo_menu_to_order.c:361
+#: src/bin/e_int_menus.c:194 src/bin/e_actions.c:2104 src/bin/e_actions.c:2107
+#: src/bin/e_actions.c:2110 src/bin/e_actions.c:2113
+#: src/bin/e_int_config_imc.c:825 src/bin/e_int_config_theme.c:361
+#: src/bin/e_int_config_startup.c:273 src/bin/e_int_config_desklock.c:507
+#: src/bin/e_int_config_wallpaper.c:458 src/bin/e_int_config_wallpaper.c:610
+#: src/bin/e_fdo_menu_to_order.c:361
 msgid "System"
 msgstr "Системни"
 
@@ -254,7 +263,7 @@ msgid "Virtual"
 msgstr "Виртуални"
 
 #: src/bin/e_int_menus.c:234 src/bin/e_int_menus.c:773
-#: src/bin/e_configure.c:447
+#: src/bin/e_configure.c:449
 msgid "Shelves"
 msgstr "Рафтове"
 
@@ -262,7 +271,7 @@ msgstr "Рафтове"
 msgid "Show/Hide All Windows"
 msgstr "Показване/скриване на всички прозорци"
 
-#: src/bin/e_int_menus.c:574
+#: src/bin/e_int_menus.c:575
 msgid "(No Applications)"
 msgstr "(Няма програми)"
 
@@ -274,21 +283,21 @@ msgstr "Конфигурация на виртуалните полета"
 msgid "Configuration Panel"
 msgstr "Конфигурационен панел"
 
-#: src/bin/e_int_menus.c:758 src/bin/e_configure.c:394
+#: src/bin/e_int_menus.c:758 src/bin/e_configure.c:396
 msgid "Wallpaper"
 msgstr "Тапет"
 
-#: src/bin/e_int_menus.c:768 src/bin/e_configure.c:446
+#: src/bin/e_int_menus.c:768 src/bin/e_configure.c:448
 #: src/bin/e_int_config_modules.c:245 src/bin/e_int_config_paths.c:88
 #: src/bin/e_int_config_color_classes.c:83
 msgid "Modules"
 msgstr "Модули"
 
-#: src/bin/e_int_menus.c:779 src/bin/e_configure.c:425
+#: src/bin/e_int_menus.c:779 src/bin/e_configure.c:429
 msgid "Application Menus"
 msgstr "Програмно меню"
 
-#: src/bin/e_int_menus.c:781 src/bin/e_configure.c:427
+#: src/bin/e_int_menus.c:781 src/bin/e_configure.c:431
 msgid "Applications Menu"
 msgstr "Меню на програмите"
 
@@ -296,7 +305,7 @@ msgstr "Меню на програмите"
 msgid "Lock Screen"
 msgstr "Заключване на екрана"
 
-#: src/bin/e_int_menus.c:846 src/bin/e_actions.c:2011
+#: src/bin/e_int_menus.c:846 src/bin/e_actions.c:2110
 msgid "Suspend"
 msgstr "Временно изключване"
 
@@ -304,11 +313,11 @@ msgstr "Временно изключване"
 msgid "Hibernate"
 msgstr ""
 
-#: src/bin/e_int_menus.c:860 src/bin/e_actions.c:2008
+#: src/bin/e_int_menus.c:860 src/bin/e_actions.c:2107
 msgid "Reboot"
 msgstr "Рестартиране на компютъра"
 
-#: src/bin/e_int_menus.c:867 src/bin/e_actions.c:2005
+#: src/bin/e_int_menus.c:867 src/bin/e_actions.c:2104
 msgid "Shut Down"
 msgstr "Изключване на компютъра"
 
@@ -316,35 +325,36 @@ msgstr "Изключване на компютъра"
 msgid "Logout"
 msgstr "Изход"
 
-#: src/bin/e_int_menus.c:925 src/bin/e_int_menus.c:1084
+#: src/bin/e_int_menus.c:946 src/bin/e_int_menus.c:1114
 msgid "(No Windows)"
 msgstr "(Няма прозорци)"
 
-#: src/bin/e_int_menus.c:955 src/bin/e_actions.c:2029
+#: src/bin/e_int_menus.c:986 src/bin/e_actions.c:2128
 msgid "Cleanup Windows"
 msgstr "Изчистване на прозорци"
 
-#: src/bin/e_int_menus.c:968
+#: src/bin/e_int_menus.c:999
 msgid "Lost Windows"
 msgstr "Изгубени прозорци"
 
-#: src/bin/e_int_menus.c:989 src/bin/e_int_menus.c:1098
+#: src/bin/e_int_menus.c:1020 src/bin/e_int_menus.c:1128
 msgid "No name!!"
 msgstr "Няма име!!"
 
-#: src/bin/e_int_menus.c:1204
+#: src/bin/e_int_menus.c:1235
 msgid "(No Shelves)"
 msgstr "(Няма рафтове)"
 
-#: src/bin/e_int_menus.c:1219 src/bin/e_int_config_shelf.c:132
+#: src/bin/e_int_menus.c:1249 src/bin/e_shelf.c:812
+#: src/bin/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Рафт №"
 
-#: src/bin/e_int_menus.c:1272
+#: src/bin/e_int_menus.c:1302
 msgid "Add A Shelf"
 msgstr "Добавяне на рафт"
 
-#: src/bin/e_int_menus.c:1276
+#: src/bin/e_int_menus.c:1308
 msgid "Delete A Shelf"
 msgstr "Изтриване на рафт"
 
@@ -693,14 +703,24 @@ msgid "Enlightenment cannot set up its exebuf system."
 msgstr "Enlightenment не може да настрои системата си за exebuf"
 
 #: src/bin/e_main.c:776
+#, fuzzy
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr "Enlightenment не може да настрои настройките за запомняне"
+
+#: src/bin/e_main.c:784
+#, fuzzy
+msgid "Enlightenment cannot configure the X screensaver."
+msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
+
+#: src/bin/e_main.c:792
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment не може да настрои заключващата си система"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:808
 msgid "Enlightenment Starting. Please wait."
 msgstr "Enlightenment стартира. Моля изчакайте."
 
-#: src/bin/e_module.c:113
+#: src/bin/e_module.c:115
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -709,11 +729,11 @@ msgstr ""
 "Имало е грешка при зареждане на модула %s<br>Не е бил намерен модул с име %"
 "s<br>в папките за търсене на модули<br>"
 
-#: src/bin/e_module.c:117 src/bin/e_module.c:130 src/bin/e_module.c:159
+#: src/bin/e_module.c:119 src/bin/e_module.c:132 src/bin/e_module.c:161
 msgid "Error loading Module"
 msgstr "Грешка при зареждане на модул"
 
-#: src/bin/e_module.c:124 src/bin/e_module.c:153
+#: src/bin/e_module.c:126 src/bin/e_module.c:155
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -725,11 +745,11 @@ msgstr ""
 "Съобщената грешка е:\n"
 "%s"
 
-#: src/bin/e_module.c:158
+#: src/bin/e_module.c:160
 msgid "Module does not contain all needed functions"
 msgstr "Модулът не съдържа всички нужни функции"
 
-#: src/bin/e_module.c:174
+#: src/bin/e_module.c:176
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -737,38 +757,38 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:179
+#: src/bin/e_module.c:181
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment·%s·Модул"
 
-#: src/bin/e_module.c:459
+#: src/bin/e_module.c:462
 msgid "About..."
 msgstr "За..."
 
-#: src/bin/e_module.c:463 src/bin/e_int_config_modules.c:262
+#: src/bin/e_module.c:466 src/bin/e_int_config_modules.c:262
 #: src/bin/e_int_config_color_classes.c:350
 #: src/bin/e_int_config_color_classes.c:358
 #: src/bin/e_int_config_color_classes.c:366
-#: src/bin/e_int_config_color_classes.c:451
+#: src/bin/e_int_config_color_classes.c:450
 msgid "Enabled"
 msgstr "Включване"
 
-#: src/bin/e_module.c:544
+#: src/bin/e_module.c:548
 msgid "Would you like to unload this module?<br>"
 msgstr "Искате ли да изключите този модул?<br>"
 
-#: src/bin/e_module.c:549 src/bin/e_actions.c:1421 src/bin/e_actions.c:1482
-#: src/bin/e_actions.c:1531 src/bin/e_actions.c:1580 src/bin/e_actions.c:1629
-#: src/bin/e_actions.c:1678 src/bin/e_int_config_display.c:215
-#: src/bin/e_confirm_dialog.c:69 src/bin/e_fm.c:4968
+#: src/bin/e_module.c:553 src/bin/e_actions.c:1515 src/bin/e_actions.c:1576
+#: src/bin/e_actions.c:1625 src/bin/e_actions.c:1674 src/bin/e_actions.c:1723
+#: src/bin/e_actions.c:1772 src/bin/e_int_config_display.c:215
+#: src/bin/e_confirm_dialog.c:69 src/bin/e_fm.c:5224
 msgid "Yes"
 msgstr "Да"
 
-#: src/bin/e_module.c:550 src/bin/e_actions.c:1423 src/bin/e_actions.c:1484
-#: src/bin/e_actions.c:1533 src/bin/e_actions.c:1582 src/bin/e_actions.c:1631
-#: src/bin/e_actions.c:1680 src/bin/e_int_config_display.c:216
-#: src/bin/e_confirm_dialog.c:70 src/bin/e_fm.c:4969
+#: src/bin/e_module.c:554 src/bin/e_actions.c:1517 src/bin/e_actions.c:1578
+#: src/bin/e_actions.c:1627 src/bin/e_actions.c:1676 src/bin/e_actions.c:1725
+#: src/bin/e_actions.c:1774 src/bin/e_int_config_display.c:216
+#: src/bin/e_confirm_dialog.c:70 src/bin/e_fm.c:5225
 msgid "No"
 msgstr "Не"
 
@@ -777,17 +797,18 @@ msgstr "Не"
 msgid "Starting %s"
 msgstr "Стартиране на %s"
 
-#: src/bin/e_utils.c:237
+#: src/bin/e_utils.c:238 src/bin/e_int_config_imc.c:281
+#: src/bin/e_int_config_imc.c:519
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 "Enlightenment не е могъл да създаде отделен дъщерен процес:<br><br>%s<br>"
 
-#: src/bin/e_utils.c:281
+#: src/bin/e_utils.c:282
 msgid "Cannot exit - immortal windows."
 msgstr "Няма изход - безсмъртен прозорец."
 
-#: src/bin/e_utils.c:282
+#: src/bin/e_utils.c:283
 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 "
@@ -797,388 +818,452 @@ msgstr ""
 "спрян, докато тези прозорци не бъдат затворени, или не се "
 "премахне<br>забраната им за изход."
 
-#: src/bin/e_intl.c:357
+#: src/bin/e_utils.c:727
+#, c-format
+msgid "%'.0f Bytes"
+msgstr "%'.0f Байтове"
+
+#: src/bin/e_utils.c:731
+#, c-format
+msgid "%'.0f KB"
+msgstr "%'.0f КБ"
+
+#: src/bin/e_utils.c:735
+#, c-format
+msgid "%'.0f MB"
+msgstr "%'.0f МБ"
+
+#: src/bin/e_utils.c:739
+#, c-format
+msgid "%'.1f GB"
+msgstr "%'.1f ГБ"
+
+#: src/bin/e_utils.c:758
+#, c-format
+msgid "In the Future"
+msgstr "В бъдещето"
+
+#: src/bin/e_utils.c:763
+#, c-format
+msgid "In the last Minute"
+msgstr "В последната минута"
+
+#: src/bin/e_utils.c:765
+#, c-format
+msgid "%li Years ago"
+msgstr "Преди %li години"
+
+#: src/bin/e_utils.c:767
+#, c-format
+msgid "%li Months ago"
+msgstr "Преди %li месеца"
+
+#: src/bin/e_utils.c:769
+#, c-format
+msgid "%li Weeks ago"
+msgstr "Преди %li седмици"
+
+#: src/bin/e_utils.c:771
+#, c-format
+msgid "%li Days ago"
+msgstr "Преди %li дни"
+
+#: src/bin/e_utils.c:773
+#, c-format
+msgid "%li Hours ago"
+msgstr "Преди %li часа"
+
+#: src/bin/e_utils.c:775
+#, c-format
+msgid "%li Minutes ago"
+msgstr "Преди %li минути"
+
+#: src/bin/e_utils.c:781 src/bin/e_int_config_keybindings.c:1132
+msgid "Unknown"
+msgstr "Незнаен"
+
+#: src/bin/e_intl.c:362
 msgid "Input Method Error"
 msgstr "Грешка във входовия метод"
 
-#: src/bin/e_intl.c:358
+#: src/bin/e_intl.c:363
 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_actions.c:1414
+#: src/bin/e_actions.c:1508
 msgid "Are you sure you want to exit?"
 msgstr "Сигурни ли сте, че искате да излезнете?"
 
-#: src/bin/e_actions.c:1416
+#: src/bin/e_actions.c:1510
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Искате да излезете от Enlightenment.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:1475
+#: src/bin/e_actions.c:1569
 msgid "Are you sure you want to log out?"
 msgstr "Сигурни ли сте, че искате да излезнете?"
 
-#: src/bin/e_actions.c:1477
+#: src/bin/e_actions.c:1571
 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:1524 src/bin/e_actions.c:1622
+#: src/bin/e_actions.c:1618 src/bin/e_actions.c:1716
 msgid "Are you sure you want to turn off?"
 msgstr "Сигурни ли сте, че искате да изключите компютъра?"
 
-#: src/bin/e_actions.c:1526
+#: src/bin/e_actions.c:1620
 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:1573
+#: src/bin/e_actions.c:1667
 msgid "Are you sure you want to reboot?"
 msgstr "Сигурни ли сте, че искате да рестартирате компютъра?"
 
-#: src/bin/e_actions.c:1575
+#: src/bin/e_actions.c:1669
 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:1624
+#: src/bin/e_actions.c:1718
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "Искате да изключите временно компютъра.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:1671
+#: src/bin/e_actions.c:1765
 msgid "Are you sure you want to hibernate?"
 msgstr ""
 
-#: src/bin/e_actions.c:1673
+#: src/bin/e_actions.c:1767
 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:1760 src/bin/e_actions.c:1769 src/bin/e_actions.c:1785
-#: src/bin/e_actions.c:1789 src/bin/e_actions.c:1793 src/bin/e_actions.c:1797
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1935 src/bin/e_actions.c:1940
-#: src/bin/e_actions.c:1945
+#: src/bin/e_actions.c:1854 src/bin/e_actions.c:1863 src/bin/e_actions.c:1879
+#: src/bin/e_actions.c:1883 src/bin/e_actions.c:1887 src/bin/e_actions.c:1891
+#: src/bin/e_actions.c:2025 src/bin/e_actions.c:2029 src/bin/e_actions.c:2034
+#: src/bin/e_actions.c:2039 src/bin/e_actions.c:2044
 msgid "Window : Actions"
 msgstr "Прозорец: Действия"
 
-#: src/bin/e_actions.c:1760
+#: src/bin/e_actions.c:1854
 msgid "Move"
 msgstr "Преместване"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1863
 msgid "Resize"
 msgstr "Оразмеряване"
 
-#: src/bin/e_actions.c:1778 src/bin/e_actions.c:1964 src/bin/e_actions.c:1966
-#: src/bin/e_actions.c:1968 src/bin/e_actions.c:1969 src/bin/e_actions.c:1970
-#: src/bin/e_int_config_mousebindings.c:375 src/bin/e_int_config_apps.c:725
+#: src/bin/e_actions.c:1872 src/bin/e_actions.c:2063 src/bin/e_actions.c:2065
+#: src/bin/e_actions.c:2067 src/bin/e_actions.c:2068 src/bin/e_actions.c:2069
+#: src/bin/e_int_config_mousebindings.c:345 src/bin/e_int_config_apps.c:751
 msgid "Menu"
 msgstr "Меню"
 
-#: src/bin/e_actions.c:1778
+#: src/bin/e_actions.c:1872
 msgid "Window Menu"
 msgstr "Меню на прозореца"
 
-#: src/bin/e_actions.c:1785 src/bin/e_int_border_menu.c:319
+#: src/bin/e_actions.c:1879 src/bin/e_int_border_menu.c:301
 msgid "Raise"
 msgstr "Повдигане"
 
-#: src/bin/e_actions.c:1789 src/bin/e_int_border_menu.c:327
+#: src/bin/e_actions.c:1883 src/bin/e_int_border_menu.c:309
 msgid "Lower"
 msgstr "По-ниско"
 
-#: src/bin/e_actions.c:1793 src/bin/e_configure.c:113
-#: src/bin/e_config_dialog.c:226 src/bin/e_int_border_menu.c:301
-#: src/bin/e_fwin.c:776 src/bin/e_int_border_prop.c:83
+#: src/bin/e_actions.c:1887 src/bin/e_configure.c:113
+#: src/bin/e_config_dialog.c:226 src/bin/e_int_border_menu.c:283
+#: src/bin/e_fwin.c:779 src/bin/e_int_border_prop.c:81
 msgid "Close"
 msgstr "Затваряне"
 
-#: src/bin/e_actions.c:1797 src/bin/e_int_border_menu.c:290
+#: src/bin/e_actions.c:1891 src/bin/e_int_border_menu.c:272
 msgid "Kill"
 msgstr "Убиване"
 
-#: src/bin/e_actions.c:1801 src/bin/e_actions.c:1808 src/bin/e_actions.c:1815
-#: src/bin/e_actions.c:1822 src/bin/e_actions.c:1824 src/bin/e_actions.c:1826
-#: src/bin/e_actions.c:1828 src/bin/e_actions.c:1830 src/bin/e_actions.c:1832
-#: src/bin/e_actions.c:1834 src/bin/e_actions.c:1841 src/bin/e_actions.c:1843
-#: src/bin/e_actions.c:1845 src/bin/e_actions.c:1847 src/bin/e_actions.c:1849
-#: src/bin/e_actions.c:1856
+#: src/bin/e_actions.c:1895 src/bin/e_actions.c:1902 src/bin/e_actions.c:1909
+#: src/bin/e_actions.c:1916 src/bin/e_actions.c:1918 src/bin/e_actions.c:1920
+#: src/bin/e_actions.c:1922 src/bin/e_actions.c:1924 src/bin/e_actions.c:1926
+#: src/bin/e_actions.c:1928 src/bin/e_actions.c:1935 src/bin/e_actions.c:1937
+#: src/bin/e_actions.c:1939 src/bin/e_actions.c:1941 src/bin/e_actions.c:1943
+#: src/bin/e_actions.c:1950
 msgid "Window : State"
 msgstr "Прозорец : Състояния"
 
-#: src/bin/e_actions.c:1801
+#: src/bin/e_actions.c:1895
 msgid "Sticky Mode Toggle"
 msgstr "Режим на залепване"
 
-#: src/bin/e_actions.c:1808
+#: src/bin/e_actions.c:1902
 msgid "Iconic Mode Toggle"
 msgstr "Режим на скриване"
 
-#: src/bin/e_actions.c:1815
+#: src/bin/e_actions.c:1909
 msgid "Fullscreen Mode Toggle"
 msgstr "Режим на Цял Екран"
 
-#: src/bin/e_actions.c:1822 src/bin/e_int_border_menu.c:96
-#: src/bin/e_int_border_menu.c:202
+#: src/bin/e_actions.c:1916 src/bin/e_int_border_menu.c:95
+#: src/bin/e_int_border_menu.c:201
 msgid "Maximize"
 msgstr "Уголемяване"
 
-#: src/bin/e_actions.c:1824
+#: src/bin/e_actions.c:1918
 msgid "Maximize Vertically"
 msgstr "Уголемяване вертикално"
 
-#: src/bin/e_actions.c:1826
+#: src/bin/e_actions.c:1920
 msgid "Maximize Horizontally"
 msgstr "Уголемяване хоризонтално"
 
-#: src/bin/e_actions.c:1828
+#: src/bin/e_actions.c:1922
 msgid "Maximize Fullscreen"
 msgstr "Уголемяване на цял екран"
 
-#: src/bin/e_actions.c:1830
+#: src/bin/e_actions.c:1924
 msgid "Maximize Mode \"Smart\""
 msgstr "Режим на уголемяване \"Умен\""
 
-#: src/bin/e_actions.c:1832
+#: src/bin/e_actions.c:1926
 msgid "Maximize Mode \"Expand\""
 msgstr "Режим на уголемяване \"Разширяване\""
 
-#: src/bin/e_actions.c:1834
+#: src/bin/e_actions.c:1928
 msgid "Maximize Mode \"Fill\""
 msgstr "Режим на уголемяване \"Запълване\""
 
-#: src/bin/e_actions.c:1841
+#: src/bin/e_actions.c:1935
 msgid "Shade Up Mode Toggle"
 msgstr "Режим на навиване нагоре"
 
-#: src/bin/e_actions.c:1843
+#: src/bin/e_actions.c:1937
 msgid "Shade Down Mode Toggle"
 msgstr "Режим на навиване надолу"
 
-#: src/bin/e_actions.c:1845
+#: src/bin/e_actions.c:1939
 msgid "Shade Left Mode Toggle"
 msgstr "Режим на навиване наляво"
 
-#: src/bin/e_actions.c:1847
+#: src/bin/e_actions.c:1941
 msgid "Shade Right Mode Toggle"
 msgstr "Режим на навиване надясно"
 
-#: src/bin/e_actions.c:1849
+#: src/bin/e_actions.c:1943
 msgid "Shade Mode Toggle"
 msgstr "Режим на навиване"
 
-#: src/bin/e_actions.c:1856
+#: src/bin/e_actions.c:1950
 msgid "Toggle Borderless State"
 msgstr "Премахване на рамката"
 
-#: src/bin/e_actions.c:1861
+#: src/bin/e_actions.c:1955
 msgid "Flip Desktop Left"
 msgstr "Прелистване полето наляво"
 
-#: src/bin/e_actions.c:1862
+#: src/bin/e_actions.c:1956
 msgid "Flip Desktop Right"
 msgstr "Прелистване полето надясно"
 
-#: src/bin/e_actions.c:1863
+#: src/bin/e_actions.c:1957
 msgid "Flip Desktop Up"
 msgstr "Прелистване полето нагоре"
 
-#: src/bin/e_actions.c:1864
+#: src/bin/e_actions.c:1958
 msgid "Flip Desktop Down"
 msgstr "Прелистване полето надолу"
 
-#: src/bin/e_actions.c:1865
+#: src/bin/e_actions.c:1959
 msgid "Flip Desktop By..."
 msgstr "Прелистване полето по..."
 
-#: src/bin/e_actions.c:1870
+#: src/bin/e_actions.c:1964
 msgid "Show The Desktop"
 msgstr "Показване на полето"
 
-#: src/bin/e_actions.c:1875
+#: src/bin/e_actions.c:1969
 msgid "Flip Desktop To..."
 msgstr "Прелистване полето до..."
 
-#: src/bin/e_actions.c:1880
+#: src/bin/e_actions.c:1974
 msgid "Flip Desktop Linearly..."
 msgstr "Прелистване полето линейно..."
 
-#: src/bin/e_actions.c:1885
+#: src/bin/e_actions.c:1979
 msgid "Switch To Desktop 0"
 msgstr "Преминаване до поле 0"
 
-#: src/bin/e_actions.c:1887
+#: src/bin/e_actions.c:1981
 msgid "Switch To Desktop 1"
 msgstr "Преминаване до поле 1"
 
-#: src/bin/e_actions.c:1889
+#: src/bin/e_actions.c:1983
 msgid "Switch To Desktop 2"
 msgstr "Преминаване до поле 2"
 
-#: src/bin/e_actions.c:1891
+#: src/bin/e_actions.c:1985
 msgid "Switch To Desktop 3"
 msgstr "Преминаване до поле 3"
 
-#: src/bin/e_actions.c:1893
+#: src/bin/e_actions.c:1987
 msgid "Switch To Desktop 4"
 msgstr "Преминаване до поле 4"
 
-#: src/bin/e_actions.c:1895
+#: src/bin/e_actions.c:1989
 msgid "Switch To Desktop 5"
 msgstr "Преминаване до поле 5"
 
-#: src/bin/e_actions.c:1897
+#: src/bin/e_actions.c:1991
 msgid "Switch To Desktop 6"
 msgstr "Преминаване до поле 6"
 
-#: src/bin/e_actions.c:1899
+#: src/bin/e_actions.c:1993
 msgid "Switch To Desktop 7"
 msgstr "Преминаване до поле 7"
 
-#: src/bin/e_actions.c:1901
+#: src/bin/e_actions.c:1995
 msgid "Switch To Desktop 8"
 msgstr "Преминаване до поле 8"
 
-#: src/bin/e_actions.c:1903
+#: src/bin/e_actions.c:1997
 msgid "Switch To Desktop 9"
 msgstr "Преминаване до поле 9"
 
-#: src/bin/e_actions.c:1905
+#: src/bin/e_actions.c:1999
 msgid "Switch To Desktop 10"
 msgstr "Преминаване до поле 10"
 
-#: src/bin/e_actions.c:1907
+#: src/bin/e_actions.c:2001
 msgid "Switch To Desktop 11"
 msgstr "Преминаване до поле 11"
 
-#: src/bin/e_actions.c:1909
+#: src/bin/e_actions.c:2003
 msgid "Switch To Desktop..."
 msgstr "Изпращане до поле..."
 
-#: src/bin/e_actions.c:1914 src/bin/e_actions.c:1916 src/bin/e_actions.c:1918
-#: src/bin/e_actions.c:1922 src/bin/e_actions.c:1924 src/bin/e_actions.c:1926
-#: src/bin/e_configure.c:409
+#: src/bin/e_actions.c:2008 src/bin/e_actions.c:2010 src/bin/e_actions.c:2012
+#: src/bin/e_actions.c:2016 src/bin/e_actions.c:2018 src/bin/e_actions.c:2020
+#: src/bin/e_configure.c:411
 msgid "Screen"
 msgstr "Екран"
 
-#: src/bin/e_actions.c:1914
+#: src/bin/e_actions.c:2008
 msgid "Send Mouse To Screen 0"
 msgstr "Изпращане на мишката до екран 0"
 
-#: src/bin/e_actions.c:1916
+#: src/bin/e_actions.c:2010
 msgid "Send Mouse To Screen 1"
 msgstr "Изпращане на мишката до екран 1"
 
-#: src/bin/e_actions.c:1918
+#: src/bin/e_actions.c:2012
 msgid "Send Mouse To Screen..."
 msgstr "Изпращане на мишката до екран..."
 
-#: src/bin/e_actions.c:1922
+#: src/bin/e_actions.c:2016
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Изпращане на мишката напред 1 екран "
 
-#: src/bin/e_actions.c:1924
+#: src/bin/e_actions.c:2018
 msgid "Send Mouse Back 1 Screen"
 msgstr "Изпращане на мишката назад 1 екран "
 
-#: src/bin/e_actions.c:1926
+#: src/bin/e_actions.c:2020
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Изпращане на мишката напред/назад екрани..."
 
-#: src/bin/e_actions.c:1950 src/bin/e_actions.c:1952 src/bin/e_actions.c:1954
-#: src/bin/e_actions.c:1959
+#: src/bin/e_actions.c:2049 src/bin/e_actions.c:2051 src/bin/e_actions.c:2053
+#: src/bin/e_actions.c:2058
 msgid "Window : Moving"
 msgstr "Прозорец : Движения"
 
-#: src/bin/e_actions.c:1950
+#: src/bin/e_actions.c:2049
 msgid "To Next Desktop"
 msgstr "До следващото поле"
 
-#: src/bin/e_actions.c:1952
+#: src/bin/e_actions.c:2051
 msgid "To Previous Desktop"
 msgstr "До предишното поле"
 
-#: src/bin/e_actions.c:1954
+#: src/bin/e_actions.c:2053
 msgid "By Desktop #..."
 msgstr "По поле #..."
 
-#: src/bin/e_actions.c:1959
+#: src/bin/e_actions.c:2058
 msgid "To Desktop..."
 msgstr "До поле..."
 
-#: src/bin/e_actions.c:1964
+#: src/bin/e_actions.c:2063
 msgid "Show Main Menu"
 msgstr "Показване на главното меню"
 
-#: src/bin/e_actions.c:1966
+#: src/bin/e_actions.c:2065
 msgid "Show Favorites Menu"
 msgstr "Показване на предпочитаното меню"
 
-#: src/bin/e_actions.c:1968
+#: src/bin/e_actions.c:2067
 msgid "Show All Applications Menu"
 msgstr "Показване на меню \"Всички програми\""
 
-#: src/bin/e_actions.c:1969
+#: src/bin/e_actions.c:2068
 msgid "Show Clients Menu"
 msgstr "Показване на клиентско меню"
 
-#: src/bin/e_actions.c:1970
+#: src/bin/e_actions.c:2069
 msgid "Show Menu..."
 msgstr "Показване на меню..."
 
-#: src/bin/e_actions.c:1977 src/bin/e_actions.c:1982 src/bin/e_actions.c:2021
+#: src/bin/e_actions.c:2076 src/bin/e_actions.c:2081 src/bin/e_actions.c:2120
 msgid "Launch"
 msgstr "Стартиране"
 
-#: src/bin/e_actions.c:1977
+#: src/bin/e_actions.c:2076
 msgid "Defined Command"
 msgstr "Дефинирани команди"
 
-#: src/bin/e_actions.c:1982
+#: src/bin/e_actions.c:2081
 msgid "Application"
 msgstr "Програма"
 
-#: src/bin/e_actions.c:1987 src/bin/e_actions.c:1988
+#: src/bin/e_actions.c:2086 src/bin/e_actions.c:2087
 msgid "Window : List"
 msgstr "Прозорец : Списък"
 
-#: src/bin/e_actions.c:1987
+#: src/bin/e_actions.c:2086
 msgid "Next Window"
 msgstr "Следващ прозорец"
 
-#: src/bin/e_actions.c:1988
+#: src/bin/e_actions.c:2087
 msgid "Previous Window"
 msgstr "Предишен прозорец"
 
-#: src/bin/e_actions.c:1999
+#: src/bin/e_actions.c:2098
 msgid "Log Out"
 msgstr "Изход"
 
-#: src/bin/e_actions.c:2002
+#: src/bin/e_actions.c:2101
 msgid "Exit Immediately"
 msgstr "Незабавен изход"
 
-#: src/bin/e_actions.c:2014
+#: src/bin/e_actions.c:2113
 msgid "Suspend to Disk"
 msgstr ""
 
-#: src/bin/e_actions.c:2021
+#: src/bin/e_actions.c:2120
 msgid "Run Command Dialog"
 msgstr "Диалог за стартиране на програми"
 
-#: src/bin/e_actions.c:2025
+#: src/bin/e_actions.c:2124
 msgid "Desktop Lock"
 msgstr "Заключване на екрана"
 
-#: src/bin/e_winlist.c:134
+#: src/bin/e_winlist.c:136
 msgid "Select a window"
 msgstr "Избиране на прозорец"
 
@@ -1194,142 +1279,148 @@ msgstr ""
 msgid "Configuration Items"
 msgstr "Конфигурационни елементи"
 
-#: src/bin/e_configure.c:393 src/bin/e_gadcon.c:1136
+#: src/bin/e_configure.c:395 src/bin/e_gadcon.c:1259
 msgid "Appearance"
 msgstr "Изглед"
 
-#: src/bin/e_configure.c:396 src/bin/e_int_config_color_classes.c:124
+#: src/bin/e_configure.c:398 src/bin/e_int_config_color_classes.c:124
 msgid "Colors"
 msgstr "Цветове"
 
-#: src/bin/e_configure.c:397 src/bin/e_int_config_fonts.c:321
+#: src/bin/e_configure.c:399 src/bin/e_int_config_fonts.c:315
 #: src/bin/e_int_config_paths.c:80
 msgid "Fonts"
 msgstr "Шрифтове"
 
-#: src/bin/e_configure.c:398 src/bin/e_int_border_menu.c:164
+#: src/bin/e_configure.c:400 src/bin/e_int_border_menu.c:163
 msgid "Borders"
 msgstr "Рамки"
 
-#: src/bin/e_configure.c:399 src/bin/e_eap_editor.c:425
+#: src/bin/e_configure.c:401 src/bin/e_eap_editor.c:425
 #: src/bin/e_int_config_icon_themes.c:218
 msgid "Icon Theme"
 msgstr "Тема за икони"
 
-#: src/bin/e_configure.c:400
+#: src/bin/e_configure.c:402
 msgid "Mouse Cursor"
 msgstr "Показалец"
 
-#: src/bin/e_configure.c:401 src/bin/e_int_config_transitions.c:150
+#: src/bin/e_configure.c:403 src/bin/e_int_config_transitions.c:146
 msgid "Transitions"
 msgstr "Преходни ефекти"
 
-#: src/bin/e_configure.c:402 src/bin/e_int_config_apps.c:123
-#: src/bin/e_int_config_transitions.c:139
+#: src/bin/e_configure.c:404 src/bin/e_int_config_apps.c:148
+#: src/bin/e_int_config_transitions.c:135
 msgid "Startup"
 msgstr "Настройки при зареждане"
 
-#: src/bin/e_configure.c:405
+#: src/bin/e_configure.c:407 src/bin/e_int_config_apps.c:93
 #, fuzzy
 msgid "IBar Applications"
 msgstr "Програми"
 
-#: src/bin/e_configure.c:406
+#: src/bin/e_configure.c:408 src/bin/e_int_config_apps.c:107
 #, fuzzy
 msgid "Restart Applications"
 msgstr "Добавяне на стартер при рестартиране"
 
-#: src/bin/e_configure.c:407
+#: src/bin/e_configure.c:409 src/bin/e_int_config_apps.c:100
 #, fuzzy
 msgid "Startup Applications"
 msgstr "Добавяне на начален стартер"
 
-#: src/bin/e_configure.c:410
+#: src/bin/e_configure.c:412
 msgid "Virtual Desktops"
 msgstr "Виртуални полета"
 
-#: src/bin/e_configure.c:411
+#: src/bin/e_configure.c:413
 msgid "Screen Resolution"
 msgstr "Разделителна способност"
 
-#: src/bin/e_configure.c:412
+#: src/bin/e_configure.c:414
 msgid "Screen Lock"
 msgstr "Заключване на екрана"
 
-#: src/bin/e_configure.c:414
+#: src/bin/e_configure.c:415
+#, fuzzy
+msgid "Screen Saver"
+msgstr "Екранна зона"
+
+#: src/bin/e_configure.c:416
+#, fuzzy
+msgid "DPMS Settings"
+msgstr "Настройки на менюта"
+
+#: src/bin/e_configure.c:418
 msgid "Keyboard & Mouse"
 msgstr "Клавиатура и мишка"
 
-#: src/bin/e_configure.c:415 src/bin/e_int_config_keybindings.c:223
+#: src/bin/e_configure.c:419 src/bin/e_int_config_keybindings.c:223
 msgid "Key Bindings"
 msgstr "Бързи клавиши"
 
-#: src/bin/e_configure.c:416 src/bin/e_int_config_mousebindings.c:304
+#: src/bin/e_configure.c:420 src/bin/e_int_config_mousebindings.c:295
 msgid "Mouse Bindings"
 msgstr "Бутони на мишката"
 
-#: src/bin/e_configure.c:419 src/bin/e_int_config_window_display.c:52
+#: src/bin/e_configure.c:423 src/bin/e_int_config_window_display.c:54
 msgid "Window Display"
 msgstr "Изглед на прозорците"
 
-#: src/bin/e_configure.c:420
+#: src/bin/e_configure.c:424
 msgid "Window Focus"
 msgstr "Фокус на прозорци"
 
-#: src/bin/e_configure.c:421 src/bin/e_int_config_window_manipulation.c:51
+#: src/bin/e_configure.c:425 src/bin/e_int_config_window_manipulation.c:51
 msgid "Window Manipulation"
 msgstr "Манипулации на прозорци"
 
-#: src/bin/e_configure.c:423 src/bin/e_int_config_apps.c:723
+#: src/bin/e_configure.c:427 src/bin/e_int_config_apps.c:749
 msgid "Menus"
 msgstr "Менюта"
 
-#: src/bin/e_configure.c:429 src/bin/e_int_config_menus.c:41
+#: src/bin/e_configure.c:433 src/bin/e_int_config_menus.c:41
 #: src/bin/e_int_config_menus.c:92 src/bin/e_int_config_menus.c:133
 msgid "Menu Settings"
 msgstr "Настройки на менюта"
 
-#: src/bin/e_configure.c:431
+#: src/bin/e_configure.c:435
 msgid "Language"
 msgstr "Език"
 
-#: src/bin/e_configure.c:432
+#: src/bin/e_configure.c:436
 msgid "Language Settings"
 msgstr "Настройки на езика"
 
-#: src/bin/e_configure.c:433
+#: src/bin/e_configure.c:437
 msgid "Input Method Settings"
 msgstr "Настройка на входящите методи"
 
-#: src/bin/e_configure.c:435
-msgid "Miscellaneous"
-msgstr "Разни"
-
-#: src/bin/e_configure.c:436
-msgid "Configuration Dialogs"
-msgstr "Конфигурационни диалози"
-
-#: src/bin/e_configure.c:438 src/bin/e_config_dialog.c:189
+#: src/bin/e_configure.c:439 src/bin/e_config_dialog.c:189
 msgid "Advanced"
 msgstr "Сложни"
 
-#: src/bin/e_configure.c:439
+#: src/bin/e_configure.c:440
+msgid "Configuration Dialogs"
+msgstr "Конфигурационни диалози"
+
+#: src/bin/e_configure.c:441
 msgid "Performance"
 msgstr "Бързодействието"
 
-#: src/bin/e_configure.c:440
+#: src/bin/e_configure.c:442
 msgid "Window List"
 msgstr "Списък с прозорци"
 
-#: src/bin/e_configure.c:442
+#: src/bin/e_configure.c:444
 msgid "Search Directories"
 msgstr "Директории за търсене"
 
-#: src/bin/e_configure.c:443 src/bin/e_int_config_mime.c:63
+#: src/bin/e_configure.c:445 src/bin/e_int_config_mime.c:63
 msgid "File Icons"
 msgstr "Файлови икони"
 
-#: src/bin/e_configure.c:445
+#: src/bin/e_configure.c:447
 msgid "Extensions"
 msgstr "Разширения"
 
@@ -1338,8 +1429,9 @@ msgid "About Enlightenment"
 msgstr "За Enlightenment"
 
 #: src/bin/e_about.c:56
+#, fuzzy
 msgid ""
-"Copyright &copy; 1999-2006, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2007, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -2873,15 +2965,15 @@ msgstr "Зимбабве"
 msgid "Language Configuration"
 msgstr "Настройки на езика"
 
-#: src/bin/e_int_config_intl.c:895 src/bin/e_int_config_intl.c:988
+#: src/bin/e_int_config_intl.c:893 src/bin/e_int_config_intl.c:984
 msgid "Language Selector"
 msgstr "Избор на езика"
 
-#: src/bin/e_int_config_intl.c:954 src/bin/e_int_config_intl.c:1053
+#: src/bin/e_int_config_intl.c:952 src/bin/e_int_config_intl.c:1049
 msgid "Locale Selected"
 msgstr "Локалът е избран"
 
-#: src/bin/e_int_config_intl.c:956 src/bin/e_int_config_intl.c:1055
+#: src/bin/e_int_config_intl.c:954 src/bin/e_int_config_intl.c:1051
 msgid "Locale"
 msgstr "Локал"
 
@@ -2969,17 +3061,107 @@ msgstr "Префокусиране последният фокусиран пр
 msgid "Revert focus when hiding or closing a window"
 msgstr "Връщане на фокуса при скриване или затваряне на прозорец"
 
-#: src/bin/e_int_config_imc.c:46
+#: src/bin/e_int_config_imc.c:107
 #, fuzzy
 msgid "Input Method Configuration"
 msgstr "Start Конфигурация"
 
-#: src/bin/e_int_config_imc.c:130
+#: src/bin/e_int_config_imc.c:299
 #, fuzzy
 msgid "Input Method Selector"
 msgstr "Грешка във входовия метод"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:148
+#: src/bin/e_int_config_imc.c:302 src/bin/e_int_config_imc.c:893
+#, fuzzy
+msgid "Use No Input Method"
+msgstr "Входящи методи"
+
+#: src/bin/e_int_config_imc.c:307 src/bin/e_int_config_imc.c:958
+#, fuzzy
+msgid "Setup Selected Input Method"
+msgstr "Входящи методи"
+
+#: src/bin/e_int_config_imc.c:820 src/bin/e_int_config_theme.c:356
+#: src/bin/e_int_config_startup.c:268 src/bin/e_int_config_desklock.c:502
+#: src/bin/e_int_config_wallpaper.c:454 src/bin/e_int_config_wallpaper.c:606
+msgid "Personal"
+msgstr "Лични"
+
+#: src/bin/e_int_config_imc.c:832 src/bin/e_int_config_theme.c:369
+#: src/bin/e_int_config_startup.c:281 src/bin/e_int_config_desklock.c:514
+#: src/bin/e_widget_fsel.c:294 src/bin/e_int_config_wallpaper.c:465
+#: src/bin/e_int_config_wallpaper.c:617 src/bin/e_int_config_icon_themes.c:226
+#: src/bin/e_int_config_apps.c:661 src/bin/e_int_config_apps.c:754
+msgid "Go up a Directory"
+msgstr "Една директория нагоре"
+
+#: src/bin/e_int_config_imc.c:900
+msgid "New"
+msgstr "Нова"
+
+#: src/bin/e_int_config_imc.c:902 src/bin/e_int_config_theme.c:427
+msgid "Import..."
+msgstr "Внасяне..."
+
+#: src/bin/e_int_config_imc.c:907
+#, fuzzy
+msgid "Input Method Parameters"
+msgstr "Грешка във входовия метод"
+
+#: src/bin/e_int_config_imc.c:909 src/bin/e_eap_editor.c:338
+#: src/bin/e_int_border_prop.c:422 src/bin/e_int_border_prop.c:469
+msgid "Name"
+msgstr "Име"
+
+#: src/bin/e_int_config_imc.c:916
+#, fuzzy
+msgid "Execute Command"
+msgstr "Командно поле"
+
+#: src/bin/e_int_config_imc.c:923
+#, fuzzy
+msgid "Setup Command"
+msgstr "Стартиране на програма"
+
+#: src/bin/e_int_config_imc.c:932
+msgid "Exported Environment Variables"
+msgstr ""
+
+#: src/bin/e_int_config_imc_import.c:65
+#, fuzzy
+msgid "Select an Input Method Configuration..."
+msgstr "Start Конфигурация"
+
+#: src/bin/e_int_config_imc_import.c:117 src/bin/e_eap_editor.c:503
+#: src/bin/e_entry_dialog.c:57 src/bin/e_int_config_mime_edit.c:278
+#: src/bin/e_int_config_wallpaper_import.c:190
+#: src/bin/e_int_config_wallpaper_gradient.c:198
+#: src/bin/e_int_config_theme_import.c:117
+msgid "Cancel"
+msgstr "Отказ"
+
+#: src/bin/e_int_config_imc_import.c:282 src/bin/e_int_config_imc_import.c:297
+#, fuzzy
+msgid "Input Method Config Import Error"
+msgstr "Start Конфигурация"
+
+#: src/bin/e_int_config_imc_import.c:283
+#, fuzzy
+msgid ""
+"Enlightenment was unable to import the configuration.<br><br>Are you sure "
+"this is really a valid configuration?"
+msgstr ""
+"Enlightenment не е могъл да внесе темата.<br>Сигурни ли сте, че темата е "
+"валидна?"
+
+#: src/bin/e_int_config_imc_import.c:298
+#, fuzzy
+msgid ""
+"Enlightenment was unable to import the configuration<br>due to a copy error."
+msgstr ""
+"Enlightenment не е могъл да внесе темата <br>заради грешка в копирането."
+
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:147
 msgid "Window Locks"
 msgstr "Забрани на прозорци"
 
@@ -3024,8 +3206,8 @@ msgid "Size"
 msgstr "Размер"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_remember.c:490 src/bin/e_int_border_menu.c:190
-#: src/bin/e_int_shelf_config.c:439 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_remember.c:490 src/bin/e_int_border_menu.c:189
+#: src/bin/e_int_shelf_config.c:439 src/bin/e_int_border_prop.c:471
 msgid "Stacking"
 msgstr "Ниво"
 
@@ -3154,7 +3336,7 @@ msgstr "Запомняне с"
 msgid "Window name and class"
 msgstr "Име и клас на прозореца"
 
-#: src/bin/e_int_border_remember.c:455 src/bin/e_int_border_prop.c:423
+#: src/bin/e_int_border_remember.c:455 src/bin/e_int_border_prop.c:421
 msgid "Title"
 msgstr "Заглавие"
 
@@ -3182,8 +3364,8 @@ msgstr "Виртуални полета"
 msgid "Screen zone"
 msgstr "Екранна зона"
 
-#: src/bin/e_int_border_remember.c:504
-msgid "Window list skip"
+#: src/bin/e_int_border_remember.c:504 src/bin/e_int_border_menu.c:221
+msgid "Skip Window List"
 msgstr "Списък за пропускане на прозорци"
 
 #: src/bin/e_int_border_remember.c:508
@@ -3198,8 +3380,8 @@ msgstr "Стартиране на тази програма при влизан
 msgid "Application Editor"
 msgstr "Редактор на стартери"
 
-#: src/bin/e_eap_editor.c:320 src/bin/e_int_config_fonts.c:77
-#: src/bin/e_int_config_mime_edit.c:144
+#: src/bin/e_eap_editor.c:320 src/bin/e_int_config_fonts.c:76
+#: src/bin/e_fm_prop.c:315 src/bin/e_int_config_mime_edit.c:144
 msgid "Icon"
 msgstr "Икона"
 
@@ -3207,11 +3389,6 @@ msgstr "Икона"
 msgid "Basic Info"
 msgstr "Основна информация"
 
-#: src/bin/e_eap_editor.c:338 src/bin/e_int_border_prop.c:424
-#: src/bin/e_int_border_prop.c:471
-msgid "Name"
-msgstr "Име"
-
 #: src/bin/e_eap_editor.c:347
 msgid "Executable"
 msgstr "Изпълним файл"
@@ -3268,14 +3445,6 @@ msgstr "Изчакване изход"
 msgid "Select an Icon"
 msgstr "Избиране на икона"
 
-#: src/bin/e_eap_editor.c:503 src/bin/e_entry_dialog.c:57
-#: src/bin/e_int_config_mime_edit.c:278
-#: src/bin/e_int_config_wallpaper_import.c:190
-#: src/bin/e_int_config_wallpaper_gradient.c:200
-#: src/bin/e_int_config_theme_import.c:117
-msgid "Cancel"
-msgstr "Отказ"
-
 #: src/bin/e_int_config_borders.c:29 src/bin/e_int_config_borders.c:180
 msgid "Default Border Style"
 msgstr "Стил на рамка по подразбиране"
@@ -3288,73 +3457,69 @@ msgstr "Рамки на прозорци"
 msgid "Remember this Border for this window next time it appears"
 msgstr "Запомняне стила на рамката за този прозорец"
 
-#: src/bin/e_int_border_menu.c:53
+#: src/bin/e_int_border_menu.c:52
 msgid "Always On Top"
 msgstr "Винаги отгоре"
 
-#: src/bin/e_int_border_menu.c:64 src/bin/e_int_config_fonts.c:81
-#: src/modules/temperature/e_mod_config.c:174
+#: src/bin/e_int_border_menu.c:63 src/bin/e_int_config_fonts.c:80
+#: src/modules/temperature/e_mod_config.c:225
 msgid "Normal"
 msgstr "Нормално"
 
-#: src/bin/e_int_border_menu.c:75
+#: src/bin/e_int_border_menu.c:74
 msgid "Always Below"
 msgstr "Винаги отдолу"
 
-#: src/bin/e_int_border_menu.c:107
+#: src/bin/e_int_border_menu.c:106
 msgid "Maximize vertically"
 msgstr "Вертикално уголемяване"
 
-#: src/bin/e_int_border_menu.c:118
+#: src/bin/e_int_border_menu.c:117
 msgid "Maximize horizontally"
 msgstr "Хоризонтално уголемяване"
 
-#: src/bin/e_int_border_menu.c:129
+#: src/bin/e_int_border_menu.c:128
 msgid "Unmaximize"
 msgstr "Връщане от уголемяване"
 
-#: src/bin/e_int_border_menu.c:155
+#: src/bin/e_int_border_menu.c:154
 msgid "Remember"
 msgstr "Запомняне"
 
-#: src/bin/e_int_border_menu.c:178
+#: src/bin/e_int_border_menu.c:177
 msgid "Send to Desktop"
 msgstr "Изпращане до поле"
 
-#: src/bin/e_int_border_menu.c:211 src/bin/e_int_border_prop.c:437
-#: src/bin/e_int_config_color_classes.c:448
+#: src/bin/e_int_border_menu.c:210 src/bin/e_int_border_prop.c:435
+#: src/bin/e_int_config_color_classes.c:447
 msgid "State"
 msgstr "Фаза"
 
 #: src/bin/e_int_border_menu.c:239
-msgid "Skip Window List"
-msgstr "Списък за пропускане на прозорци"
-
-#: src/bin/e_int_border_menu.c:257
 msgid "Edit Icon"
 msgstr "Редактиране на икона"
 
-#: src/bin/e_int_border_menu.c:264
+#: src/bin/e_int_border_menu.c:246
 msgid "Create Icon"
 msgstr "Създаване на икона"
 
-#: src/bin/e_int_border_menu.c:268
+#: src/bin/e_int_border_menu.c:250
 msgid "Add App To Launcher"
 msgstr "Добавяне на стартер до лента"
 
-#: src/bin/e_int_border_menu.c:277 src/bin/e_int_border_prop.c:77
+#: src/bin/e_int_border_menu.c:259 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Характеристики на прозореца"
 
-#: src/bin/e_int_border_menu.c:338
+#: src/bin/e_int_border_menu.c:320
 msgid "Iconify"
 msgstr "Скриване"
 
-#: src/bin/e_int_border_menu.c:596
+#: src/bin/e_int_border_menu.c:578
 msgid "Incomplete Window Properties"
 msgstr "Непълни характеристики на прозореца"
 
-#: src/bin/e_int_border_menu.c:597
+#: src/bin/e_int_border_menu.c:579
 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 "
@@ -3363,18 +3528,18 @@ msgid ""
 "same at<br>the time the window starts up, and does not<br>change."
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:887 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:841 src/bin/e_int_border_prop.c:475
 msgid "Shaded"
 msgstr "Навиване"
 
-#: src/bin/e_int_border_menu.c:900 src/bin/e_int_border_prop.c:476
+#: src/bin/e_int_border_menu.c:854 src/bin/e_int_border_prop.c:474
 msgid "Sticky"
 msgstr "Залепване"
 
-#: src/bin/e_int_border_menu.c:913
+#: src/bin/e_int_border_menu.c:867
 #: src/bin/e_int_config_window_manipulation.c:148
 #: src/bin/e_int_config_window_manipulation.c:207
-#: src/bin/e_int_border_prop.c:481
+#: src/bin/e_int_border_prop.c:479
 msgid "Fullscreen"
 msgstr "Цял екран"
 
@@ -3382,188 +3547,200 @@ msgstr "Цял екран"
 msgid "Desk Settings"
 msgstr "Настройки на полетата"
 
-#: src/bin/e_int_config_desk.c:142
+#: src/bin/e_int_config_desk.c:143
 msgid "Desktop Name"
 msgstr "Име на полето"
 
-#: src/bin/e_int_config_desk.c:143
-#: src/bin/e_int_config_wallpaper_gradient.c:121
+#: src/bin/e_int_config_desk.c:144
+#: src/bin/e_int_config_wallpaper_gradient.c:119
 msgid "Name:"
 msgstr "Име:"
 
-#: src/bin/e_int_config_desk.c:149
+#: src/bin/e_int_config_desk.c:150
 msgid "Desktop Wallpaper"
 msgstr "Тапет на полето"
 
-#: src/bin/e_int_config_desk.c:155 src/bin/e_int_config_modules.c:276
+#: src/bin/e_int_config_desk.c:156 src/bin/e_int_config_modules.c:276
 #: src/bin/e_int_config_shelf.c:85 src/bin/e_int_config_mime.c:202
+#: src/modules/ibar/e_mod_config.c:110
 msgid "Configure"
 msgstr "Конфигурация"
 
 #: src/bin/e_int_config_desks.c:56
-msgid "Desktop Settings"
-msgstr "Настройки на полетата"
+#, fuzzy
+msgid "Virtual Desktops Settings"
+msgstr "Виртуални полета"
 
-#: src/bin/e_int_config_desks.c:190 src/bin/e_int_config_desks.c:230
+#: src/bin/e_int_config_desks.c:189 src/bin/e_int_config_desks.c:229
 msgid "Number of Desktops"
 msgstr "Брой от полета"
 
-#: src/bin/e_int_config_desks.c:198 src/bin/e_int_config_desks.c:202
-#: src/bin/e_int_config_desks.c:237 src/bin/e_int_config_desks.c:241
-#: src/bin/e_int_config_desklock.c:713 src/bin/e_int_config_exebuf.c:113
+#: src/bin/e_int_config_desks.c:197 src/bin/e_int_config_desks.c:201
+#: src/bin/e_int_config_desks.c:236 src/bin/e_int_config_desks.c:240
+#: src/bin/e_int_config_desklock.c:651 src/bin/e_int_config_exebuf.c:113
 #: src/bin/e_int_config_exebuf.c:117 src/bin/e_int_config_exebuf.c:121
-#: src/bin/e_int_config_exebuf.c:169 src/bin/e_int_config_exebuf.c:173
-#: src/bin/e_int_config_exebuf.c:177
+#: src/bin/e_int_config_exebuf.c:166 src/bin/e_int_config_exebuf.c:170
+#: src/bin/e_int_config_exebuf.c:174
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: src/bin/e_int_config_desks.c:209
-msgid "Desktop Flip"
-msgstr "Прелистване на полетата"
+#: src/bin/e_int_config_desks.c:208 src/bin/e_int_config_desks.c:247
+msgid "Desktop Mouse Flip"
+msgstr "Прелистване с мишката"
 
-#: src/bin/e_int_config_desks.c:210
+#: src/bin/e_int_config_desks.c:209
 msgid "Flip desktops when mouse at screen edge"
 msgstr "Прелистване на екраните когато мишката е на ръба на екрана"
 
-#: src/bin/e_int_config_desks.c:212
+#: src/bin/e_int_config_desks.c:211
 msgid "Animated flip"
 msgstr "Анимирано прелистване"
 
 #: src/bin/e_int_config_desks.c:248
-msgid "Desktop Mouse Flip"
-msgstr "Прелистване с мишката"
-
-#: src/bin/e_int_config_desks.c:249
 msgid "Flip when moving mouse to the screen edge"
 msgstr "Прелистване на екраните когато мишката е на ръба на екрана"
 
-#: src/bin/e_int_config_desks.c:251
+#: src/bin/e_int_config_desks.c:250
 msgid "Flip when dragging objects to the screen edge"
 msgstr "Прелистване на екраните когато влачите обекти до ръба"
 
-#: src/bin/e_int_config_desks.c:253
+#: src/bin/e_int_config_desks.c:252
 msgid "Time the mouse is at the edge before flipping:"
 msgstr "Отнетото време на ръба, преди прелистване:"
 
-#: src/bin/e_int_config_desks.c:255 src/bin/e_int_config_desks.c:269
+#: src/bin/e_int_config_desks.c:254 src/bin/e_int_config_desks.c:268
 #: src/bin/e_int_config_window_manipulation.c:176
 #, c-format
 msgid "%1.1f sec"
 msgstr "%1.1f·сек"
 
-#: src/bin/e_int_config_desks.c:257
+#: src/bin/e_int_config_desks.c:256
 msgid "Wrap desktops around when flipping"
 msgstr "Застъпване на полетата при прелистване"
 
-#: src/bin/e_int_config_desks.c:261
+#: src/bin/e_int_config_desks.c:260
 msgid "Flip Animation"
 msgstr "Анимация на прелистване"
 
-#: src/bin/e_int_config_desks.c:263
+#: src/bin/e_int_config_desks.c:262
 msgid "Off"
 msgstr "Изключено"
 
-#: src/bin/e_int_config_desks.c:265
+#: src/bin/e_int_config_desks.c:264
 msgid "Pane"
 msgstr "Плъзгане"
 
-#: src/bin/e_int_config_desks.c:267
+#: src/bin/e_int_config_desks.c:266
 msgid "Zoom"
 msgstr "Приближаване"
 
-#: src/bin/e_int_config_window_display.c:149
+#: src/bin/e_int_config_window_display.c:156
 msgid "Display"
 msgstr "Екран"
 
-#: src/bin/e_int_config_window_display.c:150
+#: src/bin/e_int_config_window_display.c:157
 msgid "Show window geometry information when moving or resizing"
 msgstr "Показване на геометричните данни на прозореца при местене/оразмеряване"
 
-#: src/bin/e_int_config_window_display.c:152
-#: src/bin/e_int_config_window_display.c:210
+#: src/bin/e_int_config_window_display.c:159
+#: src/bin/e_int_config_window_display.c:219
 msgid "Animate the shading and unshading of windows"
 msgstr "Анимиране на навинането на прозорци"
 
-#: src/bin/e_int_config_window_display.c:156
-#: src/bin/e_int_config_window_display.c:225
+#: src/bin/e_int_config_window_display.c:163
+#: src/bin/e_int_config_window_display.c:234
 msgid "Automatic New Window Placement"
 msgstr "Автоматична слагане на нови прозорци"
 
-#: src/bin/e_int_config_window_display.c:158
-#: src/bin/e_int_config_window_display.c:228
+#: src/bin/e_int_config_window_display.c:165
+#: src/bin/e_int_config_window_display.c:237
 msgid "Smart Placement"
 msgstr "Умно поставяне"
 
-#: src/bin/e_int_config_window_display.c:160
-#: src/bin/e_int_config_window_display.c:230
+#: src/bin/e_int_config_window_display.c:167
+#: src/bin/e_int_config_window_display.c:239
 msgid "Don't hide Gadgets"
 msgstr "Да не се скриват модули"
 
-#: src/bin/e_int_config_window_display.c:162
-#: src/bin/e_int_config_window_display.c:232
+#: src/bin/e_int_config_window_display.c:169
+#: src/bin/e_int_config_window_display.c:241
 msgid "Place at mouse pointer"
 msgstr "Поставяне под показалеца"
 
-#: src/bin/e_int_config_window_display.c:164
-#: src/bin/e_int_config_window_display.c:234
+#: src/bin/e_int_config_window_display.c:171
+#: src/bin/e_int_config_window_display.c:243
 msgid "Place manually with the mouse"
 msgstr "Ръчно поставяне с мишката"
 
-#: src/bin/e_int_config_window_display.c:192
+#: src/bin/e_int_config_window_display.c:173
+#: src/bin/e_int_config_window_display.c:245
+msgid "Automatically switch to desktop of new window"
+msgstr ""
+
+#: src/bin/e_int_config_window_display.c:201
 msgid "Window Move Geometry"
 msgstr "Мърдане на прзорци"
 
-#: src/bin/e_int_config_window_display.c:194
-#: src/bin/e_int_config_window_display.c:202
+#: src/bin/e_int_config_window_display.c:203
+#: src/bin/e_int_config_window_display.c:211
 msgid "Display information"
 msgstr "Показване на данните"
 
-#: src/bin/e_int_config_window_display.c:196
+#: src/bin/e_int_config_window_display.c:205
 msgid "Follow the window as it moves"
 msgstr "Следене на прозореца при мърдане"
 
-#: src/bin/e_int_config_window_display.c:200
+#: src/bin/e_int_config_window_display.c:209
 msgid "Window Resize Geometry"
 msgstr "Оразмеряване на прозорци"
 
-#: src/bin/e_int_config_window_display.c:204
+#: src/bin/e_int_config_window_display.c:213
 msgid "Follow the window as it resizes"
 msgstr "Следене на прозореца при оразмеряване"
 
-#: src/bin/e_int_config_window_display.c:208
+#: src/bin/e_int_config_window_display.c:217
 msgid "Window Shading"
 msgstr "Навиване на прозорци"
 
-#: src/bin/e_int_config_window_display.c:212 src/bin/e_int_config_menus.c:160
+#: src/bin/e_int_config_window_display.c:221 src/bin/e_int_config_menus.c:160
 #, c-format
 msgid "%4.0f pixels/sec"
 msgstr "%4.0f·пиксела/сек"
 
-#: src/bin/e_int_config_window_display.c:215
+#: src/bin/e_int_config_window_display.c:224
 msgid "Linear"
 msgstr "Линейно"
 
-#: src/bin/e_int_config_window_display.c:217
+#: src/bin/e_int_config_window_display.c:226
 msgid "Smooth accelerate and decelerate"
 msgstr "Плавно ускорение и забавяне"
 
-#: src/bin/e_int_config_window_display.c:219
+#: src/bin/e_int_config_window_display.c:228
 msgid "Accelerate"
 msgstr "Ускорение"
 
-#: src/bin/e_int_config_window_display.c:221
+#: src/bin/e_int_config_window_display.c:230
 msgid "Decelerate"
 msgstr "Забавяне"
 
-#: src/bin/e_int_config_window_display.c:238
+#: src/bin/e_int_config_window_display.c:249
 msgid "Window Frame"
 msgstr "Рамка"
 
-#: src/bin/e_int_config_window_display.c:240
+#: src/bin/e_int_config_window_display.c:251
 msgid "Use application provided icon instead"
 msgstr "Използване на икони, добити от програмата"
 
+#: src/bin/e_int_config_window_display.c:255
+#, fuzzy
+msgid "Internal Windows"
+msgstr "Под прозорците"
+
+#: src/bin/e_int_config_window_display.c:257
+msgid "Always remember internal windows"
+msgstr ""
+
 #: src/bin/e_int_config_window_manipulation.c:139
 #: src/bin/e_int_config_menus.c:153
 msgid "Miscellaneous Options"
@@ -3652,12 +3829,12 @@ msgid "Both directions"
 msgstr "В двете посоки"
 
 #: src/bin/e_int_config_window_manipulation.c:219
-#: src/bin/e_int_config_wallpaper_gradient.c:168
+#: src/bin/e_int_config_wallpaper_gradient.c:166
 msgid "Horizontal"
 msgstr "Хоризонтално"
 
 #: src/bin/e_int_config_window_manipulation.c:221
-#: src/bin/e_int_config_wallpaper_gradient.c:173
+#: src/bin/e_int_config_wallpaper_gradient.c:171
 msgid "Vertical"
 msgstr "Вертикално"
 
@@ -3707,8 +3884,8 @@ msgid "Click Drag Timeout"
 msgstr "Прекъсване при влачене"
 
 #: src/bin/e_int_config_menus.c:164
-#, c-format
-msgid "%2.1f seconds"
+#, fuzzy, c-format
+msgid "%2.2f seconds"
 msgstr "%2.1f·секунди"
 
 #: src/bin/e_int_config_modules.c:65
@@ -3722,7 +3899,7 @@ msgstr "Състояние"
 #: src/bin/e_int_config_modules.c:267 src/bin/e_int_config_color_classes.c:352
 #: src/bin/e_int_config_color_classes.c:360
 #: src/bin/e_int_config_color_classes.c:368
-#: src/bin/e_int_config_color_classes.c:456
+#: src/bin/e_int_config_color_classes.c:455
 msgid "Disabled"
 msgstr "Недостъпен"
 
@@ -3734,24 +3911,6 @@ msgstr "Действия"
 msgid "Theme Selector"
 msgstr "Избиране на теми"
 
-#: src/bin/e_int_config_theme.c:357 src/bin/e_int_config_startup.c:268
-#: src/bin/e_int_config_desklock.c:559 src/bin/e_int_config_wallpaper.c:455
-#: src/bin/e_int_config_wallpaper.c:610
-msgid "Personal"
-msgstr "Лични"
-
-#: src/bin/e_int_config_theme.c:370 src/bin/e_int_config_startup.c:281
-#: src/bin/e_int_config_desklock.c:572 src/bin/e_widget_fsel.c:294
-#: src/bin/e_int_config_wallpaper.c:468 src/bin/e_int_config_wallpaper.c:623
-#: src/bin/e_int_config_icon_themes.c:226 src/bin/e_int_config_apps.c:634
-#: src/bin/e_int_config_apps.c:728
-msgid "Go up a Directory"
-msgstr "Една директория нагоре"
-
-#: src/bin/e_int_config_theme.c:428
-msgid "Import..."
-msgstr "Внасяне..."
-
 #: src/bin/e_int_config_startup.c:39
 msgid "Startup Settings"
 msgstr "Настройки при стартиране"
@@ -3765,9 +3924,9 @@ msgid "Performance Settings"
 msgstr "Настройки на бързодействието"
 
 #: src/bin/e_int_config_performance.c:89
-#: src/bin/e_int_config_performance.c:121 src/bin/e_int_config_winlist.c:125
-#: src/bin/e_int_config_exebuf.c:110 src/bin/e_int_config_exebuf.c:166
-#: src/modules/ibox/e_mod_config.c:96 src/modules/pager/e_mod_config.c:107
+#: src/bin/e_int_config_performance.c:121 src/bin/e_int_config_winlist.c:131
+#: src/bin/e_int_config_exebuf.c:110 src/bin/e_int_config_exebuf.c:163
+#: src/modules/ibox/e_mod_config.c:93 src/modules/pager/e_mod_config.c:107
 msgid "General Settings"
 msgstr "Общи настройки"
 
@@ -3790,8 +3949,7 @@ msgstr "Настройки на кеша"
 msgid "Cache Flush Interval"
 msgstr "Интервал за чистене на кеша"
 
-#: src/bin/e_int_config_performance.c:131 src/bin/e_int_config_desklock.c:470
-#: src/bin/e_int_config_desklock.c:780
+#: src/bin/e_int_config_performance.c:131
 #, c-format
 msgid "%1.0f seconds"
 msgstr "%1.0f·секунди"
@@ -3832,215 +3990,225 @@ msgstr "Брой на Edje колекции за кеширане"
 msgid "%1.0f collections"
 msgstr "%1.0f·колекции"
 
-#: src/bin/e_int_config_winlist.c:53
+#: src/bin/e_int_config_winlist.c:55
 msgid "Window List Settings"
 msgstr "Настройки на списъка с прозорци"
 
-#: src/bin/e_int_config_winlist.c:126
+#: src/bin/e_int_config_winlist.c:132
 msgid "Show iconified windows"
 msgstr "Показване на скрити прозорци"
 
-#: src/bin/e_int_config_winlist.c:128
+#: src/bin/e_int_config_winlist.c:134
+#, fuzzy
+msgid "Show iconified windows from other desks"
+msgstr "Показване на прозорци от други полета"
+
+#: src/bin/e_int_config_winlist.c:136
+#, fuzzy
+msgid "Show iconified windows from other screens"
+msgstr "Показване на прозорци от други екрани"
+
+#: src/bin/e_int_config_winlist.c:138
 msgid "Show windows from other desks"
 msgstr "Показване на прозорци от други полета"
 
-#: src/bin/e_int_config_winlist.c:130
+#: src/bin/e_int_config_winlist.c:140
 msgid "Show windows from other screens"
 msgstr "Показване на прозорци от други екрани"
 
-#: src/bin/e_int_config_winlist.c:134 src/bin/e_int_config_winlist.c:206
+#: src/bin/e_int_config_winlist.c:144 src/bin/e_int_config_winlist.c:218
 msgid "Selection Settings"
 msgstr "Настройки на избиране"
 
-#: src/bin/e_int_config_winlist.c:135 src/bin/e_int_config_winlist.c:207
+#: src/bin/e_int_config_winlist.c:145 src/bin/e_int_config_winlist.c:219
 msgid "Focus window while selecting"
 msgstr "Фокусиране на прозорец при избор"
 
-#: src/bin/e_int_config_winlist.c:137 src/bin/e_int_config_winlist.c:209
+#: src/bin/e_int_config_winlist.c:147 src/bin/e_int_config_winlist.c:221
 msgid "Raise window while selecting"
 msgstr "Повдигане на прозореца при избиране"
 
-#: src/bin/e_int_config_winlist.c:139 src/bin/e_int_config_winlist.c:211
+#: src/bin/e_int_config_winlist.c:149 src/bin/e_int_config_winlist.c:223
 msgid "Warp mouse to window while selecting"
 msgstr "Плъзгане на мишката до прозореца при избор"
 
-#: src/bin/e_int_config_winlist.c:141 src/bin/e_int_config_winlist.c:213
+#: src/bin/e_int_config_winlist.c:151 src/bin/e_int_config_winlist.c:225
 msgid "Uncover windows while selecting"
 msgstr "Разкриване на прозорци при избор"
 
-#: src/bin/e_int_config_winlist.c:143 src/bin/e_int_config_winlist.c:215
+#: src/bin/e_int_config_winlist.c:153 src/bin/e_int_config_winlist.c:227
 msgid "Jump to desk while selecting"
 msgstr "Отиване до поле при избор"
 
-#: src/bin/e_int_config_winlist.c:147 src/bin/e_int_config_winlist.c:219
+#: src/bin/e_int_config_winlist.c:157 src/bin/e_int_config_winlist.c:231
 msgid "Warp Settings"
 msgstr "Прехвърляне"
 
-#: src/bin/e_int_config_winlist.c:148 src/bin/e_int_config_winlist.c:220
+#: src/bin/e_int_config_winlist.c:158 src/bin/e_int_config_winlist.c:232
 msgid "Warp At End"
 msgstr "Прехвърляне в края"
 
-#: src/bin/e_int_config_winlist.c:152 src/bin/e_int_config_winlist.c:228
-#: src/bin/e_int_config_exebuf.c:125 src/bin/e_int_config_exebuf.c:181
+#: src/bin/e_int_config_winlist.c:162 src/bin/e_int_config_winlist.c:240
+#: src/bin/e_int_config_exebuf.c:125 src/bin/e_int_config_exebuf.c:178
 msgid "Scroll Settings"
 msgstr "Настройки за плъзгане"
 
-#: src/bin/e_int_config_winlist.c:153 src/bin/e_int_config_winlist.c:229
-#: src/bin/e_int_config_exebuf.c:126 src/bin/e_int_config_exebuf.c:182
+#: src/bin/e_int_config_winlist.c:163 src/bin/e_int_config_winlist.c:241
+#: src/bin/e_int_config_exebuf.c:126 src/bin/e_int_config_exebuf.c:179
 msgid "Scroll Animate"
 msgstr "Анимирано плъзгане"
 
-#: src/bin/e_int_config_winlist.c:222
+#: src/bin/e_int_config_winlist.c:234
 msgid "Warp Speed"
 msgstr "Бързина"
 
-#: src/bin/e_int_config_winlist.c:224 src/bin/e_int_config_winlist.c:233
-#: src/bin/e_int_config_winlist.c:240 src/bin/e_int_config_winlist.c:244
-#: src/bin/e_int_config_exebuf.c:186 src/bin/e_int_config_exebuf.c:219
-#: src/bin/e_int_config_exebuf.c:223
+#: src/bin/e_int_config_winlist.c:236 src/bin/e_int_config_winlist.c:245
+#: src/bin/e_int_config_winlist.c:252 src/bin/e_int_config_winlist.c:256
+#: src/bin/e_int_config_exebuf.c:183 src/bin/e_int_config_exebuf.c:218
+#: src/bin/e_int_config_exebuf.c:222
 #, c-format
 msgid "%1.2f"
 msgstr "%1.2f"
 
-#: src/bin/e_int_config_winlist.c:231 src/bin/e_int_config_exebuf.c:184
+#: src/bin/e_int_config_winlist.c:243 src/bin/e_int_config_exebuf.c:181
 msgid "Scroll Speed"
 msgstr "Настройка на плъзгане"
 
-#: src/bin/e_int_config_winlist.c:237 src/bin/e_int_config_exebuf.c:216
+#: src/bin/e_int_config_winlist.c:249 src/bin/e_int_config_exebuf.c:215
 msgid "Position Settings"
 msgstr "Позиция"
 
-#: src/bin/e_int_config_winlist.c:238 src/bin/e_int_config_exebuf.c:217
+#: src/bin/e_int_config_winlist.c:250 src/bin/e_int_config_exebuf.c:216
 msgid "X-Axis Alignment"
 msgstr "Изравняване по абцисата"
 
-#: src/bin/e_int_config_winlist.c:242 src/bin/e_int_config_exebuf.c:221
+#: src/bin/e_int_config_winlist.c:254 src/bin/e_int_config_exebuf.c:220
 msgid "Y-Axis Alignment"
 msgstr "Изравняване по ординатата"
 
-#: src/bin/e_int_config_winlist.c:248 src/bin/e_int_config_exebuf.c:197
+#: src/bin/e_int_config_winlist.c:260 src/bin/e_int_config_exebuf.c:195
 msgid "Size Settings"
 msgstr "Размер"
 
-#: src/bin/e_int_config_winlist.c:249 src/bin/e_int_config_exebuf.c:198
+#: src/bin/e_int_config_winlist.c:261 src/bin/e_int_config_exebuf.c:197
 msgid "Minimum Width"
 msgstr "Минимална ширина"
 
-#: src/bin/e_int_config_winlist.c:251 src/bin/e_int_config_winlist.c:255
-#: src/bin/e_int_config_winlist.c:259 src/bin/e_int_config_winlist.c:263
-#: src/bin/e_int_config_exebuf.c:200 src/bin/e_int_config_exebuf.c:204
-#: src/bin/e_int_config_exebuf.c:208 src/bin/e_int_config_exebuf.c:212
+#: src/bin/e_int_config_winlist.c:263 src/bin/e_int_config_winlist.c:267
+#: src/bin/e_int_config_winlist.c:271 src/bin/e_int_config_winlist.c:275
+#: src/bin/e_int_config_exebuf.c:199 src/bin/e_int_config_exebuf.c:203
+#: src/bin/e_int_config_exebuf.c:207 src/bin/e_int_config_exebuf.c:211
 #, c-format
 msgid "%4.0f"
 msgstr "%4.0f"
 
-#: src/bin/e_int_config_winlist.c:253 src/bin/e_int_config_exebuf.c:202
+#: src/bin/e_int_config_winlist.c:265 src/bin/e_int_config_exebuf.c:201
 msgid "Minimum Height"
 msgstr "Минимална височина"
 
-#: src/bin/e_int_config_winlist.c:257 src/bin/e_int_config_exebuf.c:206
+#: src/bin/e_int_config_winlist.c:269 src/bin/e_int_config_exebuf.c:205
 msgid "Maximum Width"
 msgstr "Максимална ширина"
 
-#: src/bin/e_int_config_winlist.c:261 src/bin/e_int_config_exebuf.c:210
+#: src/bin/e_int_config_winlist.c:273 src/bin/e_int_config_exebuf.c:209
 msgid "Maximum Height"
 msgstr "Максимална височина"
 
-#: src/bin/e_apps_error.c:39
+#: src/bin/e_apps_error.c:41
 msgid "Application Execution Error"
 msgstr "Грешка при стартиране на програмата"
 
-#: src/bin/e_apps_error.c:53
+#: src/bin/e_apps_error.c:55
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s е спряла неочаквано"
 
-#: src/bin/e_apps_error.c:59
+#: src/bin/e_apps_error.c:61
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Изходен код %i е върнат от·%s."
 
-#: src/bin/e_apps_error.c:66
+#: src/bin/e_apps_error.c:68
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s е прекъсната от сигнал Interrupt."
 
-#: src/bin/e_apps_error.c:68
+#: src/bin/e_apps_error.c:70
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s е прекъсната от сигнал Quit."
 
-#: src/bin/e_apps_error.c:72
+#: src/bin/e_apps_error.c:74
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s е прекъсната от сигнал Abort."
 
-#: src/bin/e_apps_error.c:75
+#: src/bin/e_apps_error.c:77
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s е прекъсната от Floating Point грешка."
 
-#: src/bin/e_apps_error.c:78
+#: src/bin/e_apps_error.c:80
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s е прекъсната от сигнал Uninterruptable Kill."
 
-#: src/bin/e_apps_error.c:81
+#: src/bin/e_apps_error.c:83
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s е прекъсната от сигнал Segmentation Fault."
 
-#: src/bin/e_apps_error.c:84
+#: src/bin/e_apps_error.c:86
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s е прекъсната от сигнал Broken Pipe."
 
-#: src/bin/e_apps_error.c:87
+#: src/bin/e_apps_error.c:89
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s е прекъсната от сигнал Termination."
 
-#: src/bin/e_apps_error.c:90
+#: src/bin/e_apps_error.c:92
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s е прекъсната от грешка на шината."
 
-#: src/bin/e_apps_error.c:93
+#: src/bin/e_apps_error.c:95
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s е прекъсната от сигнал с номер %i."
 
-#: src/bin/e_apps_error.c:178
+#: src/bin/e_apps_error.c:182
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_apps_error.c:243 src/bin/e_apps_error.c:312
-#: src/bin/e_apps_error.c:318
+#: src/bin/e_apps_error.c:247 src/bin/e_apps_error.c:316
+#: src/bin/e_apps_error.c:322
 msgid "Error Logs"
 msgstr "Дневник с грешки"
 
-#: src/bin/e_apps_error.c:248 src/bin/e_apps_error.c:319
+#: src/bin/e_apps_error.c:252 src/bin/e_apps_error.c:323
 msgid "There was no error message."
 msgstr "Няма съобщение с грешки"
 
-#: src/bin/e_apps_error.c:252 src/bin/e_apps_error.c:326
+#: src/bin/e_apps_error.c:256 src/bin/e_apps_error.c:330
 msgid "Save This Message"
 msgstr "Запазване на това съобщение"
 
-#: src/bin/e_apps_error.c:277
+#: src/bin/e_apps_error.c:281
 msgid "Error Information"
 msgstr "Информация за грешката"
 
-#: src/bin/e_apps_error.c:285
+#: src/bin/e_apps_error.c:289
 msgid "Error Signal Information"
 msgstr "Информация за сигналната грешка"
 
-#: src/bin/e_apps_error.c:296 src/bin/e_apps_error.c:302
+#: src/bin/e_apps_error.c:300 src/bin/e_apps_error.c:306
 msgid "Output Data"
 msgstr "Резултат"
 
-#: src/bin/e_apps_error.c:303
+#: src/bin/e_apps_error.c:307
 msgid "There was no output."
 msgstr "Няма резултат"
 
@@ -4066,39 +4234,50 @@ msgstr "Размер на показалеца"
 msgid "%1.0f pixels"
 msgstr "%1.0f·пиксела"
 
-#: src/bin/e_gadcon.c:1116
+#: src/bin/e_gadcon.c:1239
 msgid "Plain"
 msgstr "Прост"
 
-#: src/bin/e_gadcon.c:1125
+#: src/bin/e_gadcon.c:1248
 msgid "Inset"
 msgstr "Вдълбано"
 
-#: src/bin/e_gadcon.c:1142
+#: src/bin/e_gadcon.c:1265
 msgid "Automatically scroll contents"
 msgstr "Автоматично плъзгане на съдържание"
 
-#: src/bin/e_gadcon.c:1149
+#: src/bin/e_gadcon.c:1272
 msgid "Able to be resized"
 msgstr "Възможност за оразмеряване"
 
-#: src/bin/e_gadcon.c:1161
-msgid "Move/Resize this gadget"
+#: src/bin/e_gadcon.c:1284
+#, fuzzy
+msgid "Begin move/resize this gadget"
 msgstr "Преместване/Мащабиране на този инструмент"
 
-#: src/bin/e_gadcon.c:1167
+#: src/bin/e_gadcon.c:1290
 msgid "Remove this gadget"
 msgstr "Премахване"
 
-#: src/bin/e_gadcon.c:1550
-msgid "Stop editing"
-msgstr "Спиране на редактиране"
+#: src/bin/e_gadcon.c:1737
+#, fuzzy
+msgid "Stop move/resize this gadget"
+msgstr "Преместване/Мащабиране на този инструмент"
 
-#: src/bin/e_desklock.c:179
+#: src/bin/e_desklock.c:135
+msgid "Error - no PAM support"
+msgstr ""
+
+#: src/bin/e_desklock.c:136
+msgid ""
+"No PAM support was built into Enlightenment, so<br>desk locking is disabled."
+msgstr ""
+
+#: src/bin/e_desklock.c:206
 msgid "Lock Failed"
 msgstr "Заключването е неуспешно"
 
-#: src/bin/e_desklock.c:180
+#: src/bin/e_desklock.c:207
 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."
@@ -4106,15 +4285,15 @@ msgstr ""
 "Заключването на екрана е неуспешно, защото някоя програма<br>е прихванала "
 "клавиатурата или мишката и те не могат да се прихванат от E17"
 
-#: src/bin/e_desklock.c:266
+#: src/bin/e_desklock.c:293
 msgid "Please enter your unlock password"
 msgstr "Моля, въведете вашата парола"
 
-#: src/bin/e_desklock.c:559
+#: src/bin/e_desklock.c:593
 msgid "Authentication System Error"
 msgstr "Грешка в системата за идентификация"
 
-#: src/bin/e_desklock.c:560
+#: src/bin/e_desklock.c:594
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -4122,74 +4301,90 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_int_config_cfgdialogs.c:34
+#: src/bin/e_int_config_cfgdialogs.c:36
 msgid "Config Dialog Settings"
 msgstr "Настройки на диалога за настройки"
 
-#: src/bin/e_int_config_cfgdialogs.c:87 src/bin/e_int_config_cfgdialogs.c:123
+#: src/bin/e_int_config_cfgdialogs.c:89 src/bin/e_int_config_cfgdialogs.c:126
 msgid "Default Dialog Mode"
 msgstr "Диалог по подразбиране"
 
-#: src/bin/e_int_config_cfgdialogs.c:90 src/bin/e_int_config_cfgdialogs.c:126
+#: src/bin/e_int_config_cfgdialogs.c:92 src/bin/e_int_config_cfgdialogs.c:129
 msgid "Basic Mode"
 msgstr "Прост достъп"
 
-#: src/bin/e_int_config_cfgdialogs.c:92 src/bin/e_int_config_cfgdialogs.c:128
+#: src/bin/e_int_config_cfgdialogs.c:94 src/bin/e_int_config_cfgdialogs.c:131
 msgid "Advanced Mode"
 msgstr "Сложен достъп"
 
-#: src/bin/e_int_config_desklock.c:114
+#: src/bin/e_int_config_desklock.c:109
 msgid "Screen Lock Settings"
 msgstr "Настройки за заключване"
 
-#: src/bin/e_int_config_desklock.c:456 src/bin/e_int_config_desklock.c:765
+#: src/bin/e_int_config_desklock.c:400 src/bin/e_int_config_desklock.c:703
 msgid "Automatic Locking"
 msgstr "Автоматично заключване"
 
-#: src/bin/e_int_config_desklock.c:459 src/bin/e_int_config_desklock.c:769
-msgid "Enable screensaver"
-msgstr "Включване на предпазител на екрана"
-
-#: src/bin/e_int_config_desklock.c:463 src/bin/e_int_config_desklock.c:773
-msgid "Lock when the screensaver starts"
+#: src/bin/e_int_config_desklock.c:403 src/bin/e_int_config_desklock.c:705
+#, fuzzy
+msgid "Lock when X screensaver activates"
 msgstr "Заключване при стартиране на предпазител на екрана"
 
-#: src/bin/e_int_config_desklock.c:467 src/bin/e_int_config_desklock.c:777
-msgid "Time until screensaver starts"
-msgstr "Време докато заключването се активира"
+#: src/bin/e_int_config_desklock.c:408 src/bin/e_int_config_desklock.c:710
+msgid "Lock when idle time exceeded"
+msgstr ""
 
-#: src/bin/e_int_config_desklock.c:624
+#: src/bin/e_int_config_desklock.c:412 src/bin/e_int_config_desklock.c:713
+msgid "Idle time to exceed"
+msgstr ""
+
+#: src/bin/e_int_config_desklock.c:415 src/bin/e_int_config_desklock.c:715
+#: src/modules/battery/e_mod_config.c:120
+#, c-format
+msgid "%1.0f minutes"
+msgstr "%1.0f минути"
+
+#: src/bin/e_int_config_desklock.c:566
 msgid "Wallpaper Mode"
 msgstr "Тип тапет"
 
-#: src/bin/e_int_config_desklock.c:628
+#: src/bin/e_int_config_desklock.c:570
 msgid "Theme Defined"
 msgstr "Дефиниран от темата"
 
-#: src/bin/e_int_config_desklock.c:633
+#: src/bin/e_int_config_desklock.c:574
 msgid "Theme Wallpaper"
 msgstr "Тапет от темата"
 
-#: src/bin/e_int_config_desklock.c:638
+#: src/bin/e_int_config_desklock.c:578 src/bin/e_fm_prop.c:354
 msgid "Custom"
 msgstr "Друг"
 
-#: src/bin/e_int_config_desklock.c:689
+#: src/bin/e_int_config_desklock.c:627
 msgid "Login Box Settings"
 msgstr "Настройки на входящата кутия"
 
-#: src/bin/e_int_config_desklock.c:692
+#: src/bin/e_int_config_desklock.c:630
 msgid "Show on all screen zones"
 msgstr "Показване във всички зони"
 
-#: src/bin/e_int_config_desklock.c:699
+#: src/bin/e_int_config_desklock.c:637
 msgid "Show on current screen zone"
 msgstr "Показване в текущата зона"
 
-#: src/bin/e_int_config_desklock.c:706
+#: src/bin/e_int_config_desklock.c:644
 msgid "Show on screen zone #:"
 msgstr "Показване в зона #:"
 
+#: src/bin/e_int_config_desklock.c:732
+#, fuzzy
+msgid "Custom Desklock"
+msgstr "Потребителски настройки"
+
+#: src/bin/e_int_config_desklock.c:733
+msgid "Use custom desklock"
+msgstr ""
+
 #: src/bin/e_int_config_display.c:133
 #, c-format
 msgid ""
@@ -4239,34 +4434,35 @@ msgid "Resolution change"
 msgstr "Смяна на разделителна способност"
 
 #: src/bin/e_int_config_display.c:243
-msgid "Display Settings"
-msgstr "Настройки на екрана"
+#, fuzzy
+msgid "Screen Resolution Settings"
+msgstr "Разделителна способност"
 
-#: src/bin/e_int_config_display.c:388
+#: src/bin/e_int_config_display.c:386
 msgid "Resolution"
 msgstr "Разделителна способност"
 
-#: src/bin/e_int_config_display.c:396
+#: src/bin/e_int_config_display.c:394
 msgid "Restore on login"
 msgstr "Възобновяване при влизане"
 
-#: src/bin/e_int_config_display.c:403
+#: src/bin/e_int_config_display.c:401
 msgid "Refresh"
 msgstr "Опресняване"
 
-#: src/bin/e_int_config_display.c:497
+#: src/bin/e_int_config_display.c:490
 msgid "Rotation"
 msgstr "Завъртане"
 
-#: src/bin/e_int_config_display.c:519
+#: src/bin/e_int_config_display.c:512
 msgid "Mirroring"
 msgstr "Огледално изображение"
 
-#: src/bin/e_int_config_display.c:603
+#: src/bin/e_int_config_display.c:594
 msgid "Missing Features"
 msgstr "Липсващи възможности"
 
-#: src/bin/e_int_config_display.c:604
+#: src/bin/e_int_config_display.c:595
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandr</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4280,11 +4476,11 @@ msgstr ""
 "допълнение. Също така е възможно <br> когато сте инсталирали библиотеката "
 "<hilight>ecore</hilight> да не е била засечена поддръжка на Xrandr."
 
-#: src/bin/e_int_config_display.c:616
+#: src/bin/e_int_config_display.c:607
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/bin/e_int_config_display.c:617
+#: src/bin/e_int_config_display.c:608
 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, "
@@ -4297,28 +4493,28 @@ msgstr ""
 msgid "Run Command Settings"
 msgstr "Настройки на exebuf"
 
-#: src/bin/e_int_config_exebuf.c:111 src/bin/e_int_config_exebuf.c:167
+#: src/bin/e_int_config_exebuf.c:111 src/bin/e_int_config_exebuf.c:164
 msgid "Maximum Number of Matched Apps to List"
 msgstr "Максимален брой на стартери за показ"
 
-#: src/bin/e_int_config_exebuf.c:115 src/bin/e_int_config_exebuf.c:171
+#: src/bin/e_int_config_exebuf.c:115 src/bin/e_int_config_exebuf.c:168
 msgid "Maximum Number of Matched Exes to List"
 msgstr "Максимален брой на програми за показ"
 
-#: src/bin/e_int_config_exebuf.c:119 src/bin/e_int_config_exebuf.c:175
+#: src/bin/e_int_config_exebuf.c:119 src/bin/e_int_config_exebuf.c:172
 msgid "Maximum History to List"
 msgstr "Максимален брой на история за показ"
 
-#: src/bin/e_int_config_exebuf.c:190
+#: src/bin/e_int_config_exebuf.c:187
 msgid "Terminal Settings"
 msgstr "Настройки на терминала"
 
-#: src/bin/e_int_config_exebuf.c:191
+#: src/bin/e_int_config_exebuf.c:189
 msgid "Terminal Command"
 msgstr "Команда на терминала"
 
 #: src/bin/e_int_config_keybindings.c:3 src/bin/e_int_config_keybindings.c:7
-#: src/bin/e_int_config_mousebindings.c:4
+#: src/bin/e_int_config_mousebindings.c:3
 msgid "<None>"
 msgstr "<Без>"
 
@@ -4332,42 +4528,43 @@ msgstr ""
 msgid "Key Binding Settings"
 msgstr "Настройки на бързи клавиши"
 
-#: src/bin/e_int_config_keybindings.c:232
+#: src/bin/e_int_config_keybindings.c:228
 msgid "Add Key"
 msgstr "Добавяне на клавиш"
 
-#: src/bin/e_int_config_keybindings.c:236
+#: src/bin/e_int_config_keybindings.c:231
 msgid "Delete Key"
 msgstr "Изтриване на клавиш"
 
-#: src/bin/e_int_config_keybindings.c:244
+#: src/bin/e_int_config_keybindings.c:235
 msgid "Modify Key"
 msgstr "Промяна на клавиш"
 
-#: src/bin/e_int_config_keybindings.c:249
-#: src/bin/e_int_config_mousebindings.c:332
+#: src/bin/e_int_config_keybindings.c:239
+#: src/bin/e_int_config_mousebindings.c:311
 msgid "Delete All"
 msgstr "Изтриване на всички клавиши"
 
-#: src/bin/e_int_config_keybindings.c:255
-msgid "Restore Key Binding Defaults"
+#: src/bin/e_int_config_keybindings.c:243
+#, fuzzy
+msgid "Restore Default Bindings"
 msgstr "Връщане на стандартните настройки"
 
-#: src/bin/e_int_config_keybindings.c:261
-#: src/bin/e_int_config_mousebindings.c:346
+#: src/bin/e_int_config_keybindings.c:248
+#: src/bin/e_int_config_mousebindings.c:321
 msgid "Action"
 msgstr "Действия"
 
-#: src/bin/e_int_config_keybindings.c:269
-#: src/bin/e_int_config_mousebindings.c:354
+#: src/bin/e_int_config_keybindings.c:255
+#: src/bin/e_int_config_mousebindings.c:328
 msgid "Action Params"
 msgstr "Параметри на действие"
 
-#: src/bin/e_int_config_keybindings.c:948
+#: src/bin/e_int_config_keybindings.c:930
 msgid "Key Binding Sequence"
 msgstr "Серия от клавиши"
 
-#: src/bin/e_int_config_keybindings.c:1144
+#: src/bin/e_int_config_keybindings.c:1128
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
@@ -4376,281 +4573,277 @@ msgstr ""
 "Серията от бързи клавиши която избрахте се използва от действие.<br><hilight>"
 "%s</hilight>.Изберете друга серия."
 
-#: src/bin/e_int_config_keybindings.c:1148 src/bin/e_widget_fsel.c:753
-msgid "Unknown"
-msgstr "Незнаен"
-
-#: src/bin/e_int_config_keybindings.c:1149
+#: src/bin/e_int_config_keybindings.c:1133
 msgid "Binding Key Error"
 msgstr "Грешка в настройката"
 
-#: src/bin/e_int_config_keybindings.c:1289
+#: src/bin/e_int_config_keybindings.c:1273
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/bin/e_int_config_keybindings.c:1294
+#: src/bin/e_int_config_keybindings.c:1278
 msgid "ALT"
 msgstr "ALT"
 
-#: src/bin/e_int_config_keybindings.c:1300
+#: src/bin/e_int_config_keybindings.c:1284
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/bin/e_int_config_keybindings.c:1306
+#: src/bin/e_int_config_keybindings.c:1290
 msgid "WIN"
 msgstr "WIN"
 
-#: src/bin/e_shelf.c:807 src/bin/e_int_shelf_config.c:62
-msgid "Shelf Configuration"
-msgstr "Конфигурациране на рафта"
-
-#: src/bin/e_shelf.c:813
-msgid "Stop Moving/Resizing Items"
-msgstr "Спиране на всякакво редактиране "
-
-#: src/bin/e_shelf.c:815
-msgid "Begin Moving/Resizing Items"
-msgstr "Започване на редактиране на всичко"
-
-#: src/bin/e_shelf.c:820
-msgid "Configure Shelf Contents"
-msgstr "Конфигурация на съдържанието"
-
-#: src/bin/e_shelf.c:825
-msgid "Delete this Shelf"
-msgstr "Изтриване на този рафт"
-
-#: src/bin/e_shelf.c:903 src/bin/e_int_config_shelf.c:266
+#: src/bin/e_shelf.c:897 src/bin/e_int_config_shelf.c:266
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Сигурни ли сте, че искате да изтриете този рафт?"
 
-#: src/bin/e_shelf.c:904
+#: src/bin/e_shelf.c:898
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Искате да изтриете този рафт.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_int_config_fonts.c:41 src/bin/e_int_config_color_classes.c:44
+#: src/bin/e_shelf.c:1016
+msgid "Stop Moving/Resizing Items"
+msgstr "Спиране на всякакво редактиране "
+
+#: src/bin/e_shelf.c:1018
+msgid "Begin Moving/Resizing Items"
+msgstr "Започване на редактиране на всичко"
+
+#: src/bin/e_shelf.c:1026 src/bin/e_int_shelf_config.c:62
+msgid "Shelf Configuration"
+msgstr "Конфигурациране на рафта"
+
+#: src/bin/e_shelf.c:1031
+msgid "Configure Shelf Contents"
+msgstr "Конфигурация на съдържанието"
+
+#: src/bin/e_shelf.c:1036
+msgid "Delete this Shelf"
+msgstr "Изтриване на този рафт"
+
+#: src/bin/e_int_config_fonts.c:40 src/bin/e_int_config_color_classes.c:44
 msgid "Window Manager"
 msgstr "Управление на прозорци"
 
-#: src/bin/e_int_config_fonts.c:42
+#: src/bin/e_int_config_fonts.c:41
 msgid "Title Bar"
 msgstr "Заглавна лента на прозорец"
 
-#: src/bin/e_int_config_fonts.c:43 src/bin/e_int_config_color_classes.c:52
+#: src/bin/e_int_config_fonts.c:42 src/bin/e_int_config_color_classes.c:52
 msgid "Menu Item"
 msgstr "Елемент от меню"
 
-#: src/bin/e_int_config_fonts.c:44 src/bin/e_int_config_color_classes.c:50
+#: src/bin/e_int_config_fonts.c:43 src/bin/e_int_config_color_classes.c:50
 msgid "Menu Title"
 msgstr "Заглавие на меню"
 
-#: src/bin/e_int_config_fonts.c:45
+#: src/bin/e_int_config_fonts.c:44
 msgid "Textblock Plain"
 msgstr "Текстови блок (нормален)"
 
-#: src/bin/e_int_config_fonts.c:46
+#: src/bin/e_int_config_fonts.c:45
 msgid "Textblock Light"
 msgstr "Текстови блок (блед)"
 
-#: src/bin/e_int_config_fonts.c:47
+#: src/bin/e_int_config_fonts.c:46
 msgid "Textblock Big"
 msgstr "Текстови блок (голям)"
 
-#: src/bin/e_int_config_fonts.c:48 src/bin/e_int_config_color_classes.c:54
+#: src/bin/e_int_config_fonts.c:47 src/bin/e_int_config_color_classes.c:54
 msgid "Move Text"
 msgstr "Преместване на текст"
 
-#: src/bin/e_int_config_fonts.c:49 src/bin/e_int_config_color_classes.c:55
+#: src/bin/e_int_config_fonts.c:48 src/bin/e_int_config_color_classes.c:55
 msgid "Resize Text"
 msgstr "Текст на оразмеряване"
 
-#: src/bin/e_int_config_fonts.c:50 src/bin/e_int_config_color_classes.c:58
+#: src/bin/e_int_config_fonts.c:49 src/bin/e_int_config_color_classes.c:58
 msgid "Winlist Title"
 msgstr "Заглаение на списък с прозорци"
 
-#: src/bin/e_int_config_fonts.c:51
+#: src/bin/e_int_config_fonts.c:50
 msgid "Configure Heading"
 msgstr "Конфигурация на заглавие"
 
-#: src/bin/e_int_config_fonts.c:52
+#: src/bin/e_int_config_fonts.c:51
 msgid "About Title"
 msgstr "За (Заглавие)"
 
-#: src/bin/e_int_config_fonts.c:53
+#: src/bin/e_int_config_fonts.c:52
 msgid "About Version"
 msgstr "За (Версия)"
 
-#: src/bin/e_int_config_fonts.c:54
+#: src/bin/e_int_config_fonts.c:53
 msgid "About Text"
 msgstr "За (Текст)"
 
-#: src/bin/e_int_config_fonts.c:55
+#: src/bin/e_int_config_fonts.c:54
 msgid "Desklock Title"
 msgstr "Заглавие (Заключване)"
 
-#: src/bin/e_int_config_fonts.c:56
+#: src/bin/e_int_config_fonts.c:55
 msgid "Desklock Password"
 msgstr "Лична Парола"
 
-#: src/bin/e_int_config_fonts.c:57
+#: src/bin/e_int_config_fonts.c:56
 msgid "Dialog Error"
 msgstr "Диалог за грешка"
 
-#: src/bin/e_int_config_fonts.c:58
+#: src/bin/e_int_config_fonts.c:57
 msgid "Exebuf Command"
 msgstr "Командно поле"
 
-#: src/bin/e_int_config_fonts.c:59
+#: src/bin/e_int_config_fonts.c:58
 msgid "Splash Title"
 msgstr "Заглавие (Начален екран)"
 
-#: src/bin/e_int_config_fonts.c:60
+#: src/bin/e_int_config_fonts.c:59
 msgid "Splash Text"
 msgstr "Начален текст"
 
-#: src/bin/e_int_config_fonts.c:61
+#: src/bin/e_int_config_fonts.c:60
 msgid "Splash Version"
 msgstr "Начална версия"
 
-#: src/bin/e_int_config_fonts.c:63
+#: src/bin/e_int_config_fonts.c:62
 msgid "Widget"
 msgstr "Интерфейс"
 
-#: src/bin/e_int_config_fonts.c:64
+#: src/bin/e_int_config_fonts.c:63
 msgid "Entry"
 msgstr "Текстово поле"
 
-#: src/bin/e_int_config_fonts.c:65
+#: src/bin/e_int_config_fonts.c:64
 msgid "Frame"
 msgstr "Рамка"
 
-#: src/bin/e_int_config_fonts.c:66
+#: src/bin/e_int_config_fonts.c:65
 msgid "Label"
 msgstr "Етикет"
 
-#: src/bin/e_int_config_fonts.c:67
+#: src/bin/e_int_config_fonts.c:66
 msgid "Buttons"
 msgstr "Бутони"
 
-#: src/bin/e_int_config_fonts.c:68
+#: src/bin/e_int_config_fonts.c:67
 msgid "Slider"
 msgstr "Плъзгач"
 
-#: src/bin/e_int_config_fonts.c:69
+#: src/bin/e_int_config_fonts.c:68
 msgid "Radio Buttons"
 msgstr "Радиобутони"
 
-#: src/bin/e_int_config_fonts.c:70
+#: src/bin/e_int_config_fonts.c:69
 msgid "Check Buttons"
 msgstr "Бутони-отметки"
 
-#: src/bin/e_int_config_fonts.c:71
+#: src/bin/e_int_config_fonts.c:70
 msgid "Text List Item"
 msgstr "Елемент от текстов лист"
 
-#: src/bin/e_int_config_fonts.c:72
+#: src/bin/e_int_config_fonts.c:71
 msgid "List Item"
 msgstr "Елемент от лист"
 
-#: src/bin/e_int_config_fonts.c:73 src/bin/e_int_config_color_classes.c:73
+#: src/bin/e_int_config_fonts.c:72 src/bin/e_int_config_color_classes.c:73
 msgid "List Header"
 msgstr "Заглавие от лист"
 
-#: src/bin/e_int_config_fonts.c:75
+#: src/bin/e_int_config_fonts.c:74
 msgid "EFM"
 msgstr ""
 
-#: src/bin/e_int_config_fonts.c:76
+#: src/bin/e_int_config_fonts.c:75
 msgid "Typebuf"
 msgstr ""
 
-#: src/bin/e_int_config_fonts.c:79
+#: src/bin/e_int_config_fonts.c:78
 msgid "Module"
 msgstr "Модул"
 
-#: src/bin/e_int_config_fonts.c:80 src/bin/e_int_shelf_config.c:406
+#: src/bin/e_int_config_fonts.c:79 src/bin/e_int_shelf_config.c:406
 msgid "Small"
 msgstr "Малък"
 
-#: src/bin/e_int_config_fonts.c:82 src/bin/e_int_shelf_config.c:410
+#: src/bin/e_int_config_fonts.c:81 src/bin/e_int_shelf_config.c:410
 msgid "Large"
 msgstr "Голям"
 
-#: src/bin/e_int_config_fonts.c:83
+#: src/bin/e_int_config_fonts.c:82
 msgid "Small Styled"
 msgstr "Малък (стилизиран)"
 
-#: src/bin/e_int_config_fonts.c:84
+#: src/bin/e_int_config_fonts.c:83
 msgid "Normal Styled"
 msgstr "Нормален (стилизиран)"
 
-#: src/bin/e_int_config_fonts.c:85
+#: src/bin/e_int_config_fonts.c:84
 msgid "Large Styled"
 msgstr "Голям (стилизиран)"
 
-#: src/bin/e_int_config_fonts.c:142
+#: src/bin/e_int_config_fonts.c:141
 msgid "Font Settings"
 msgstr "Настройки на шрифта"
 
-#: src/bin/e_int_config_fonts.c:296
+#: src/bin/e_int_config_fonts.c:288
 msgid "Font Classes"
 msgstr "Шрифтов клас"
 
-#: src/bin/e_int_config_fonts.c:305 src/bin/e_int_config_fonts.c:435
+#: src/bin/e_int_config_fonts.c:298 src/bin/e_int_config_fonts.c:427
 msgid "Enable Font Class"
 msgstr "Включване на шрифтов клас"
 
-#: src/bin/e_int_config_fonts.c:310
+#: src/bin/e_int_config_fonts.c:303
 msgid "Font Size:"
 msgstr "Размер на шрифта:"
 
-#: src/bin/e_int_config_fonts.c:313 src/bin/e_int_config_fonts.c:455
+#: src/bin/e_int_config_fonts.c:306 src/bin/e_int_config_fonts.c:448
 #, c-format
 msgid "%2.1f pixels"
 msgstr "%2.1f·пиксели"
 
-#: src/bin/e_int_config_fonts.c:427
+#: src/bin/e_int_config_fonts.c:418
 msgid "Font Class Configuration"
 msgstr "Конфигурация на шрифтовите класове"
 
-#: src/bin/e_int_config_fonts.c:441
+#: src/bin/e_int_config_fonts.c:433
 msgid "Font"
 msgstr "Шрифт"
 
-#: src/bin/e_int_config_fonts.c:451
+#: src/bin/e_int_config_fonts.c:444
 msgid "Font Size"
 msgstr "Размер на шрифта"
 
-#: src/bin/e_int_config_fonts.c:464
+#: src/bin/e_int_config_fonts.c:458
 msgid "Hinting"
 msgstr "Заглаждане"
 
-#: src/bin/e_int_config_fonts.c:469
+#: src/bin/e_int_config_fonts.c:463
 msgid "Bytecode"
 msgstr "Байткод"
 
-#: src/bin/e_int_config_fonts.c:474 src/modules/cpufreq/e_mod_main.c:214
+#: src/bin/e_int_config_fonts.c:468 src/modules/cpufreq/e_mod_main.c:214
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/bin/e_int_config_fonts.c:479 src/bin/e_int_config_mousebindings.c:409
-#: src/bin/e_int_config_transitions.c:159
-#: src/bin/e_int_config_transitions.c:214
-#: src/bin/e_int_config_transitions.c:246
+#: src/bin/e_int_config_fonts.c:473 src/bin/e_int_config_mousebindings.c:369
+#: src/bin/e_int_config_transitions.c:155
+#: src/bin/e_int_config_transitions.c:210
+#: src/bin/e_int_config_transitions.c:242
 msgid "None"
 msgstr "Без"
 
-#: src/bin/e_int_config_fonts.c:486
+#: src/bin/e_int_config_fonts.c:480
 msgid "Font Fallbacks"
 msgstr "Шрифтове-резерви"
 
-#: src/bin/e_int_config_fonts.c:489
+#: src/bin/e_int_config_fonts.c:483
 msgid "Fallback Name"
 msgstr "Име"
 
-#: src/bin/e_int_config_fonts.c:504
+#: src/bin/e_int_config_fonts.c:498
 msgid "Enable Fallbacks"
 msgstr "Включване на резерви"
 
@@ -4658,16 +4851,16 @@ msgstr "Включване на резерви"
 msgid "Move Up"
 msgstr "Преместване нагоре"
 
-#: src/bin/e_widget_config_list.c:66
+#: src/bin/e_widget_config_list.c:64
 msgid "Move Down"
 msgstr "Преместване надолу"
 
-#: src/bin/e_widget_config_list.c:101 src/bin/e_int_config_shelf.c:81
-#: src/modules/ibar/e_mod_config.c:107
+#: src/bin/e_widget_config_list.c:87 src/bin/e_int_config_shelf.c:81
+#: src/modules/ibar/e_mod_config.c:106
 msgid "Add"
 msgstr "Добавяне"
 
-#: src/bin/e_widget_config_list.c:109
+#: src/bin/e_widget_config_list.c:92
 msgid "Remove"
 msgstr "Премахване"
 
@@ -4675,19 +4868,19 @@ msgstr "Премахване"
 msgid "Go to Parent Directory"
 msgstr "Една директория нагоре"
 
-#: src/bin/e_fwin.c:269 src/bin/e_fwin.c:774
+#: src/bin/e_fwin.c:269 src/bin/e_fwin.c:777
 msgid "Open"
 msgstr "Отваряне"
 
-#: src/bin/e_fwin.c:276 src/bin/e_fwin.c:772
+#: src/bin/e_fwin.c:276 src/bin/e_fwin.c:775
 msgid "Open with..."
 msgstr "Отваряне с ..."
 
-#: src/bin/e_fwin.c:792
+#: src/bin/e_fwin.c:795
 msgid "Specific Applications"
 msgstr "Специфични програми"
 
-#: src/bin/e_fwin.c:812 src/bin/e_int_config_apps.c:688
+#: src/bin/e_fwin.c:815 src/bin/e_int_config_apps.c:715
 msgid "All Applications"
 msgstr "Всички Пограми"
 
@@ -4720,26 +4913,22 @@ msgid "Backgrounds"
 msgstr "Фонове"
 
 #: src/bin/e_int_config_paths.c:92
-msgid "Input Methods"
-msgstr "Входящи методи"
-
-#: src/bin/e_int_config_paths.c:94
 msgid "Messages"
 msgstr "Съобщения"
 
-#: src/bin/e_int_config_paths.c:179
+#: src/bin/e_int_config_paths.c:172
 msgid "E Paths"
 msgstr "Пътища за E"
 
-#: src/bin/e_int_config_paths.c:208
+#: src/bin/e_int_config_paths.c:201
 msgid "Default Directories"
 msgstr "Директории по подразбиране"
 
-#: src/bin/e_int_config_paths.c:215
+#: src/bin/e_int_config_paths.c:208
 msgid "User Defined Directories"
 msgstr "Директории на потребителя"
 
-#: src/bin/e_int_config_paths.c:217 src/bin/e_fm.c:4397 src/bin/e_fm.c:4538
+#: src/bin/e_int_config_paths.c:210 src/bin/e_fm.c:4653 src/bin/e_fm.c:4794
 msgid "New Directory"
 msgstr "Нова директория"
 
@@ -4751,8 +4940,8 @@ msgstr "Настройки"
 msgid "Configured Shelves"
 msgstr "Настроени рафтове"
 
-#: src/bin/e_int_config_shelf.c:83 src/bin/e_fm.c:4602
-#: src/modules/ibar/e_mod_config.c:109
+#: src/bin/e_int_config_shelf.c:83 src/bin/e_fm.c:4858
+#: src/modules/ibar/e_mod_config.c:108
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -4820,135 +5009,135 @@ msgstr "Стилове"
 msgid "Shelf Contents"
 msgstr "Съдържание на рафта"
 
-#: src/bin/e_int_gadcon_config.c:219
+#: src/bin/e_int_gadcon_config.c:148
 msgid "Available Gadgets"
 msgstr "Налични джунджурии"
 
-#: src/bin/e_int_gadcon_config.c:229
+#: src/bin/e_int_gadcon_config.c:158
 msgid "Add Gadget"
 msgstr "Добавяне"
 
-#: src/bin/e_int_gadcon_config.c:236
+#: src/bin/e_int_gadcon_config.c:165
 msgid "Selected Gadgets"
 msgstr "Избрани джунджурийки"
 
-#: src/bin/e_int_gadcon_config.c:245
+#: src/bin/e_int_gadcon_config.c:174
 msgid "Remove Gadget"
 msgstr "Премахване"
 
-#: src/bin/e_int_border_prop.c:367
+#: src/bin/e_int_border_prop.c:365
 msgid "NetWM"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:374
+#: src/bin/e_int_border_prop.c:372
 msgid "ICCCM"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:422
+#: src/bin/e_int_border_prop.c:420
 msgid "ICCCM Properties"
 msgstr "ICCCM характеристики"
 
-#: src/bin/e_int_border_prop.c:425
+#: src/bin/e_int_border_prop.c:423
 msgid "Class"
 msgstr "Клас"
 
-#: src/bin/e_int_border_prop.c:426 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_prop.c:424 src/bin/e_int_border_prop.c:470
 msgid "Icon Name"
 msgstr "Име на икони"
 
-#: src/bin/e_int_border_prop.c:427
+#: src/bin/e_int_border_prop.c:425
 msgid "Machine"
 msgstr "Машина"
 
-#: src/bin/e_int_border_prop.c:428
+#: src/bin/e_int_border_prop.c:426
 msgid "Role"
 msgstr "Роля"
 
-#: src/bin/e_int_border_prop.c:430
+#: src/bin/e_int_border_prop.c:428
 msgid "Minimum Size"
 msgstr "Минимален размер"
 
-#: src/bin/e_int_border_prop.c:431
+#: src/bin/e_int_border_prop.c:429
 msgid "Maximum Size"
 msgstr "Максимален размер"
 
-#: src/bin/e_int_border_prop.c:432
+#: src/bin/e_int_border_prop.c:430
 msgid "Base Size"
 msgstr "Стандартен размер"
 
-#: src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_prop.c:431
 msgid "Resize Steps"
 msgstr "Стъпка на оразмеряване"
 
-#: src/bin/e_int_border_prop.c:435
+#: src/bin/e_int_border_prop.c:433
 msgid "Aspect Ratio"
 msgstr "Коефициент на външността"
 
-#: src/bin/e_int_border_prop.c:436
+#: src/bin/e_int_border_prop.c:434
 msgid "Initial State"
 msgstr "Начална фаза"
 
-#: src/bin/e_int_border_prop.c:438
+#: src/bin/e_int_border_prop.c:436
 msgid "Window ID"
 msgstr "Идентификация на прозореца"
 
-#: src/bin/e_int_border_prop.c:439
+#: src/bin/e_int_border_prop.c:437
 msgid "Window Group"
 msgstr "Група на прозореца"
 
-#: src/bin/e_int_border_prop.c:440
+#: src/bin/e_int_border_prop.c:438
 msgid "Transient For"
 msgstr "Преходност за"
 
-#: src/bin/e_int_border_prop.c:441
+#: src/bin/e_int_border_prop.c:439
 msgid "Client Leader"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:442
+#: src/bin/e_int_border_prop.c:440
 msgid "Gravity"
 msgstr "Гравитация"
 
-#: src/bin/e_int_border_prop.c:443
+#: src/bin/e_int_border_prop.c:441
 msgid "Command"
 msgstr "Команда"
 
-#: src/bin/e_int_border_prop.c:445
+#: src/bin/e_int_border_prop.c:443
 msgid "Take Focus"
 msgstr "Получаване на фокус"
 
-#: src/bin/e_int_border_prop.c:446
+#: src/bin/e_int_border_prop.c:444
 msgid "Accepts Focus"
 msgstr "Приема фокус"
 
-#: src/bin/e_int_border_prop.c:447
+#: src/bin/e_int_border_prop.c:445
 msgid "Urgent"
 msgstr "Спешен"
 
-#: src/bin/e_int_border_prop.c:448
+#: src/bin/e_int_border_prop.c:446
 msgid "Request Delete"
 msgstr "Заявка за изтриване"
 
-#: src/bin/e_int_border_prop.c:449
+#: src/bin/e_int_border_prop.c:447
 msgid "Request Position"
 msgstr "Заявка за позиция"
 
-#: src/bin/e_int_border_prop.c:470
+#: src/bin/e_int_border_prop.c:468
 msgid "NetWM Properties"
 msgstr "NetWM  характеристики"
 
-#: src/bin/e_int_border_prop.c:475
+#: src/bin/e_int_border_prop.c:473
 msgid "Modal"
 msgstr "Модален"
 
-#: src/bin/e_int_border_prop.c:478
+#: src/bin/e_int_border_prop.c:476
 msgid "Skip Taskbar"
 msgstr "Пропускане на Taskbar"
 
-#: src/bin/e_int_border_prop.c:479
+#: src/bin/e_int_border_prop.c:477
 msgid "Skip Pager"
 msgstr "Пропускане в Pager"
 
-#: src/bin/e_int_border_prop.c:480
+#: src/bin/e_int_border_prop.c:478
 msgid "Hidden"
 msgstr "Скрит"
 
@@ -5078,80 +5267,80 @@ msgstr ""
 msgid "Hibernating your Computer.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:1283
+#: src/bin/e_fm.c:1656
 #, c-format
 msgid "%i Files"
 msgstr "%i файлове"
 
-#: src/bin/e_fm.c:4342 src/bin/e_fm.c:4483
+#: src/bin/e_fm.c:4598 src/bin/e_fm.c:4739
 msgid "Refresh View"
 msgstr "Опресняване на изгледа"
 
-#: src/bin/e_fm.c:4353 src/bin/e_fm.c:4494
+#: src/bin/e_fm.c:4609 src/bin/e_fm.c:4750
 msgid "Show Hidden Files"
 msgstr "Показване на скрити файлове"
 
-#: src/bin/e_fm.c:4368 src/bin/e_fm.c:4509
+#: src/bin/e_fm.c:4624 src/bin/e_fm.c:4765
 msgid "Remember Ordering"
 msgstr "Запомняне на подреждането"
 
-#: src/bin/e_fm.c:4380 src/bin/e_fm.c:4521
+#: src/bin/e_fm.c:4636 src/bin/e_fm.c:4777
 msgid "Sort Now"
 msgstr "Сортиране сега"
 
-#: src/bin/e_fm.c:4613
+#: src/bin/e_fm.c:4869
 msgid "Rename"
 msgstr "Преименуване"
 
-#: src/bin/e_fm.c:4623
+#: src/bin/e_fm.c:4879
 #, fuzzy
 msgid "Properties"
 msgstr "ICCCM характеристики"
 
-#: src/bin/e_fm.c:4741
+#: src/bin/e_fm.c:4997
 msgid "Create a new Directory"
 msgstr "Създаване на нова директория"
 
-#: src/bin/e_fm.c:4742
+#: src/bin/e_fm.c:4998
 msgid "New Directory Name:"
 msgstr "Име на новата директория:"
 
-#: src/bin/e_fm.c:4785 src/bin/e_fm.c:4898 src/bin/e_fm.c:5497
-#: src/bin/e_fm.c:5557 src/bin/e_fm.c:5595
+#: src/bin/e_fm.c:5041 src/bin/e_fm.c:5154 src/bin/e_fm.c:5749
+#: src/bin/e_fm.c:5809 src/bin/e_fm.c:5848
 msgid "Error"
 msgstr "Грешка"
 
-#: src/bin/e_fm.c:4787
+#: src/bin/e_fm.c:5043
 #, c-format
 msgid "Could not create directory:<br><hilight>%s</hilight>"
 msgstr "Не може да се изтрие директорията:·<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:4842
+#: src/bin/e_fm.c:5098
 #, c-format
 msgid "Rename %s to:"
 msgstr "Преименуване на %s до:"
 
-#: src/bin/e_fm.c:4844
+#: src/bin/e_fm.c:5100
 msgid "Rename File"
 msgstr "Преименуване на файл"
 
-#: src/bin/e_fm.c:4900
+#: src/bin/e_fm.c:5156
 #, c-format
 msgid "Could not rename from <hilight>%s</hilight> to <hilight>%s</hilight>"
 msgstr ""
 "Не е било възможно преименуването от <hilight>%s</hilight> до <hilight>%s</"
 "hilight>"
 
-#: src/bin/e_fm.c:4971
+#: src/bin/e_fm.c:5227
 msgid "Confirm Delete"
 msgstr "Потвърждаване за изтриването"
 
-#: src/bin/e_fm.c:4975
+#: src/bin/e_fm.c:5231
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Сигурни ли сте, че искате да изтриете <br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:4981
+#: src/bin/e_fm.c:5237
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -5160,33 +5349,92 @@ msgstr ""
 "Сигурни ли сте, че искате да изтриете <br>%d избрани файла в:<br><hilight>%"
 "s</hilight>?"
 
-#: src/bin/e_fm.c:5499 src/bin/e_fm.c:5559 src/bin/e_fm.c:5597
+#: src/bin/e_fm.c:5751 src/bin/e_fm.c:5811 src/bin/e_fm.c:5850
 #, c-format
 msgid "Could not delete <br><hilight>%s</hilight>"
 msgstr "Не може да се изтрие <br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:5693
+#: src/bin/e_fm.c:5947
 #, c-format
 msgid "%i Queued"
 msgstr "%i на опашката"
 
-#: src/bin/e_widget_fsel.c:288
-msgid "Add to Favorites"
-msgstr "Добавяне до предпочитаните"
+#: src/bin/e_fm.c:6065
+#, fuzzy
+msgid "Removable Device"
+msgstr "Премахване на клавиш"
 
-#: src/bin/e_widget_fsel.c:302 src/bin/e_int_config_wallpaper_gradient.c:155
-#: src/bin/e_int_config_transitions.c:175
-msgid "Preview"
-msgstr "Преглед"
+#: src/bin/e_fm_prop.c:100
+#, fuzzy
+msgid "File Properties"
+msgstr "ICCCM характеристики"
 
-#: src/bin/e_widget_fsel.c:323
+#: src/bin/e_fm_prop.c:253
+#, fuzzy
+msgid "File:"
+msgstr "Файлове"
+
+#: src/bin/e_fm_prop.c:260 src/bin/e_widget_fsel.c:323
 msgid "Size:"
 msgstr "Размер:"
 
-#: src/bin/e_widget_fsel.c:339
+#: src/bin/e_fm_prop.c:267
+msgid "Last Modified:"
+msgstr "Последна модификация:"
+
+#: src/bin/e_fm_prop.c:274
+#, fuzzy
+msgid "File Type:"
+msgstr "Файлови типове"
+
+#: src/bin/e_fm_prop.c:281
+#, fuzzy
+msgid "Permissions"
+msgstr "Разрешения:"
+
+#: src/bin/e_fm_prop.c:282 src/bin/e_widget_fsel.c:339
 msgid "Owner:"
 msgstr "Собственик:"
 
+#: src/bin/e_fm_prop.c:288
+msgid "Others can read"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:290
+msgid "Others can write"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:292
+msgid "Owner can read"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:294
+msgid "Owner can write"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:300 src/bin/e_widget_fsel.c:302
+#: src/bin/e_int_config_wallpaper_gradient.c:153
+#: src/bin/e_int_config_transitions.c:171
+msgid "Preview"
+msgstr "Преглед"
+
+#: src/bin/e_fm_prop.c:348
+#, fuzzy
+msgid "Default"
+msgstr "По подразбиране"
+
+#: src/bin/e_fm_prop.c:351
+msgid "Thumbnail"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:362
+msgid "Use this icon for all files of this type"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:288
+msgid "Add to Favorites"
+msgstr "Добавяне до предпочитаните"
+
 #: src/bin/e_widget_fsel.c:355
 msgid "Permissions:"
 msgstr "Разрешения:"
@@ -5195,91 +5443,31 @@ msgstr "Разрешения:"
 msgid "Modified:"
 msgstr "Изменен:"
 
-#: src/bin/e_widget_fsel.c:611
-#, c-format
-msgid "%'.0f Bytes"
-msgstr "%'.0f Байтове"
-
-#: src/bin/e_widget_fsel.c:616
-#, c-format
-msgid "%'.0f KB"
-msgstr "%'.0f КБ"
-
-#: src/bin/e_widget_fsel.c:621
-#, c-format
-msgid "%'.0f MB"
-msgstr "%'.0f МБ"
-
-#: src/bin/e_widget_fsel.c:625
-#, c-format
-msgid "%'.1f GB"
-msgstr "%'.1f ГБ"
-
-#: src/bin/e_widget_fsel.c:639
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Ти"
 
-#: src/bin/e_widget_fsel.c:688
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Защитен"
 
-#: src/bin/e_widget_fsel.c:690 src/bin/e_widget_fsel.c:699
-#: src/bin/e_widget_fsel.c:708
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Само за четене"
 
-#: src/bin/e_widget_fsel.c:697 src/bin/e_widget_fsel.c:706
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Забранен"
 
-#: src/bin/e_widget_fsel.c:715
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Четене и запис"
 
-#: src/bin/e_widget_fsel.c:730
-#, c-format
-msgid "In the Future"
-msgstr "В бъдещето"
-
-#: src/bin/e_widget_fsel.c:735
-#, c-format
-msgid "In the last Minute"
-msgstr "В последната минута"
-
-#: src/bin/e_widget_fsel.c:737
-#, c-format
-msgid "%li Years ago"
-msgstr "Преди %li години"
-
-#: src/bin/e_widget_fsel.c:739
-#, c-format
-msgid "%li Months ago"
-msgstr "Преди %li месеца"
-
-#: src/bin/e_widget_fsel.c:741
-#, c-format
-msgid "%li Weeks ago"
-msgstr "Преди %li седмици"
-
-#: src/bin/e_widget_fsel.c:743
-#, c-format
-msgid "%li Days ago"
-msgstr "Преди %li дни"
-
-#: src/bin/e_widget_fsel.c:745
-#, c-format
-msgid "%li Hours ago"
-msgstr "Преди %li часа"
-
-#: src/bin/e_widget_fsel.c:747
-#, c-format
-msgid "%li Minutes ago"
-msgstr "Преди %li минути"
-
 #: src/bin/e_int_config_mime.c:195
 msgid "File Types"
 msgstr "Файлови типове"
@@ -5324,31 +5512,31 @@ msgstr "Избиране на изображение"
 msgid "Wallpaper Settings"
 msgstr "Настройки на тапетите"
 
-#: src/bin/e_int_config_wallpaper.c:526 src/bin/e_int_config_wallpaper.c:678
+#: src/bin/e_int_config_wallpaper.c:523 src/bin/e_int_config_wallpaper.c:672
 msgid "Use Theme Wallpaper"
 msgstr "Тапет от темата"
 
-#: src/bin/e_int_config_wallpaper.c:533 src/bin/e_int_config_wallpaper.c:685
+#: src/bin/e_int_config_wallpaper.c:529 src/bin/e_int_config_wallpaper.c:678
 msgid "Picture..."
 msgstr "Картина..."
 
-#: src/bin/e_int_config_wallpaper.c:536 src/bin/e_int_config_wallpaper.c:688
+#: src/bin/e_int_config_wallpaper.c:532 src/bin/e_int_config_wallpaper.c:681
 msgid "Gradient..."
 msgstr "Градиент..."
 
-#: src/bin/e_int_config_wallpaper.c:703
+#: src/bin/e_int_config_wallpaper.c:696
 msgid "Where to place the Wallpaper"
 msgstr "Каде да се сложи тапетът"
 
-#: src/bin/e_int_config_wallpaper.c:707
+#: src/bin/e_int_config_wallpaper.c:700
 msgid "All Desktops"
 msgstr "Всички полета"
 
-#: src/bin/e_int_config_wallpaper.c:709
+#: src/bin/e_int_config_wallpaper.c:702
 msgid "This Desktop"
 msgstr "Това поле"
 
-#: src/bin/e_int_config_wallpaper.c:711
+#: src/bin/e_int_config_wallpaper.c:704
 msgid "This Screen"
 msgstr "Този екран"
 
@@ -5386,7 +5574,7 @@ msgstr "Качество на файла"
 
 #: src/bin/e_int_config_wallpaper_import.c:172
 msgid "Use original file"
-msgstr ""
+msgstr "Използване от оригиналния файл"
 
 #: src/bin/e_int_config_wallpaper_import.c:175
 #, c-format
@@ -5526,23 +5714,23 @@ msgstr "Цветове на частта"
 msgid "Module Colors"
 msgstr "Цветове на модули"
 
-#: src/bin/e_int_config_color_classes.c:415
+#: src/bin/e_int_config_color_classes.c:414
 msgid "Color Classes"
 msgstr "Цветови класове"
 
-#: src/bin/e_int_config_color_classes.c:424
+#: src/bin/e_int_config_color_classes.c:423
 msgid "Object Color"
 msgstr "Цвят на обекта"
 
-#: src/bin/e_int_config_color_classes.c:432
+#: src/bin/e_int_config_color_classes.c:431
 msgid "Outline Color"
 msgstr "Цвят на контура"
 
-#: src/bin/e_int_config_color_classes.c:440
+#: src/bin/e_int_config_color_classes.c:439
 msgid "Shadow Color"
 msgstr "Цвят на сянката"
 
-#: src/bin/e_int_config_color_classes.c:463
+#: src/bin/e_int_config_color_classes.c:462
 msgid "Defaults"
 msgstr "По подразбиране"
 
@@ -5556,7 +5744,7 @@ msgstr "Игри"
 
 #: src/bin/e_fdo_menu_to_order.c:345
 msgid "Multimedia"
-msgstr ""
+msgstr "Мултимедия"
 
 #: src/bin/e_fdo_menu_to_order.c:349
 msgid "Internet"
@@ -5600,124 +5788,128 @@ msgid "Icon Theme Settings"
 msgstr "Настройки на темите за икони"
 
 #: src/bin/e_int_config_icon_themes.c:172
-#: src/bin/e_int_config_icon_themes.c:291
+#: src/bin/e_int_config_icon_themes.c:288
 msgid "Icon Themes"
 msgstr "Теми за икони"
 
-#: src/bin/e_int_config_mousebindings.c:10
+#: src/bin/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/bin/e_int_config_mousebindings.c:119
+#: src/bin/e_int_config_mousebindings.c:112
 msgid "Mouse Binding Settings"
 msgstr "Настройки на бутоните на мишката"
 
-#: src/bin/e_int_config_mousebindings.c:313
-msgid "Add Mouse"
-msgstr "Добавяне"
+#: src/bin/e_int_config_mousebindings.c:301
+#, fuzzy
+msgid "Add Binding"
+msgstr "Бърз клавиш"
 
-#: src/bin/e_int_config_mousebindings.c:318
-msgid "Delete Mouse"
-msgstr "Изтриване"
+#: src/bin/e_int_config_mousebindings.c:303
+#, fuzzy
+msgid "Delete Binding"
+msgstr "Следващ бърз клавиш"
 
-#: src/bin/e_int_config_mousebindings.c:326
-msgid "Modify"
-msgstr "Промяна"
+#: src/bin/e_int_config_mousebindings.c:307
+#, fuzzy
+msgid "Modify Binding"
+msgstr "Бутони на мишката"
 
-#: src/bin/e_int_config_mousebindings.c:339
+#: src/bin/e_int_config_mousebindings.c:315
 msgid "Restore Mouse and Wheel Binding Defaults"
 msgstr "Връщане на настройките по подразбиране"
 
-#: src/bin/e_int_config_mousebindings.c:361
+#: src/bin/e_int_config_mousebindings.c:335
 msgid "Action Context"
 msgstr "Контекст на действие"
 
-#: src/bin/e_int_config_mousebindings.c:365
+#: src/bin/e_int_config_mousebindings.c:337
 msgid "Any"
 msgstr "Всеки"
 
-#: src/bin/e_int_config_mousebindings.c:370
+#: src/bin/e_int_config_mousebindings.c:341
 msgid "Border"
 msgstr "Рамка"
 
-#: src/bin/e_int_config_mousebindings.c:382
+#: src/bin/e_int_config_mousebindings.c:349
 msgid "Win List"
 msgstr "Списък с прозорци"
 
-#: src/bin/e_int_config_mousebindings.c:387
+#: src/bin/e_int_config_mousebindings.c:353
 msgid "Popup"
 msgstr "Изкачащо поле"
 
-#: src/bin/e_int_config_mousebindings.c:392
-#: src/modules/ibox/e_mod_config.c:111
+#: src/bin/e_int_config_mousebindings.c:357
+#: src/modules/ibox/e_mod_config.c:108
 msgid "Zone"
 msgstr "Зона"
 
-#: src/bin/e_int_config_mousebindings.c:399
+#: src/bin/e_int_config_mousebindings.c:361
 msgid "Container"
 msgstr "Контейнер"
 
-#: src/bin/e_int_config_mousebindings.c:404
+#: src/bin/e_int_config_mousebindings.c:365
 msgid "Manager"
 msgstr "Манипулатор"
 
-#: src/bin/e_int_config_mousebindings.c:1351
+#: src/bin/e_int_config_mousebindings.c:1296
 msgid "Mouse Binding Sequence"
 msgstr "Серия на бутоните на мишката"
 
-#: src/bin/e_int_config_wallpaper_gradient.c:98
+#: src/bin/e_int_config_wallpaper_gradient.c:96
 msgid "Create a gradient..."
 msgstr "Създаване на градиент..."
 
-#: src/bin/e_int_config_wallpaper_gradient.c:125
+#: src/bin/e_int_config_wallpaper_gradient.c:123
 msgid "Color 1:"
 msgstr "Цвят 1:"
 
-#: src/bin/e_int_config_wallpaper_gradient.c:129
+#: src/bin/e_int_config_wallpaper_gradient.c:127
 msgid "Color 2:"
 msgstr "Цвят 2:"
 
-#: src/bin/e_int_config_wallpaper_gradient.c:165
+#: src/bin/e_int_config_wallpaper_gradient.c:163
 msgid "Fill Options"
 msgstr "Опции за изпълване"
 
-#: src/bin/e_int_config_wallpaper_gradient.c:178
+#: src/bin/e_int_config_wallpaper_gradient.c:176
 msgid "Diagonal Up"
 msgstr "Диагонално нагоре"
 
-#: src/bin/e_int_config_wallpaper_gradient.c:183
+#: src/bin/e_int_config_wallpaper_gradient.c:181
 msgid "Diagonal Down"
 msgstr "Диагонално надолу"
 
-#: src/bin/e_int_config_wallpaper_gradient.c:188
+#: src/bin/e_int_config_wallpaper_gradient.c:186
 msgid "Radial"
 msgstr "Радиален"
 
-#: src/bin/e_int_config_wallpaper_gradient.c:370
+#: src/bin/e_int_config_wallpaper_gradient.c:368
 msgid "Gradient Creation Error"
 msgstr "Грешка при създаване на градиент"
 
-#: src/bin/e_int_config_wallpaper_gradient.c:371
+#: src/bin/e_int_config_wallpaper_gradient.c:369
 msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr ""
 "Поради неизвестни причини, Enlightenment не бе могъл да създаде градиент"
 
-#: src/bin/e_int_config_apps.c:103 src/modules/ibar/e_mod_main.c:215
+#: src/bin/e_int_config_apps.c:128 src/modules/ibar/e_mod_main.c:215
+#: src/modules/ibar/e_mod_config.c:192
 msgid "IBar"
 msgstr "IBar"
 
-#: src/bin/e_int_config_apps.c:445
+#: src/bin/e_int_config_apps.c:470
 msgid "Edit Application"
 msgstr "Редактиране на стартер"
 
-#: src/bin/e_int_config_apps.c:598
+#: src/bin/e_int_config_apps.c:625
 msgid "Regenerate or update your Applications menu?"
 msgstr "Пресъздаване/подновяване на вашето меню \"Всички програми\"?"
 
-#: src/bin/e_int_config_apps.c:600
+#: src/bin/e_int_config_apps.c:627
 msgid ""
 "You can regenerate your Applications menu.<br>This will delete any "
 "customizations you have made.<br>This will replace the Applications menu "
@@ -5726,23 +5918,23 @@ msgid ""
 "Applications menu.  Customizations you have made will remain."
 msgstr ""
 
-#: src/bin/e_int_config_apps.c:609
+#: src/bin/e_int_config_apps.c:636
 msgid "Regenerate"
 msgstr "Пресъздаване"
 
-#: src/bin/e_int_config_apps.c:611
+#: src/bin/e_int_config_apps.c:638
 msgid "Update"
 msgstr "Подновяване"
 
-#: src/bin/e_int_config_apps.c:632
+#: src/bin/e_int_config_apps.c:659
 msgid "Available Applications"
 msgstr "Налични стартери"
 
-#: src/bin/e_int_config_apps.c:710
+#: src/bin/e_int_config_apps.c:736
 msgid "Create a new Application"
 msgstr "Създаване на нова Eap икона"
 
-#: src/bin/e_int_config_apps.c:802
+#: src/bin/e_int_config_apps.c:828
 msgid "Regenerate / Update \"Applications\" Menu"
 msgstr "Пресъздаване/подновяване на меню \"Всички програми\""
 
@@ -5750,12 +5942,12 @@ msgstr "Пресъздаване/подновяване на меню \"Всич
 msgid "Select a Theme..."
 msgstr "Изберете тема..."
 
-#: src/bin/e_int_config_theme_import.c:268
 #: src/bin/e_int_config_theme_import.c:277
+#: src/bin/e_int_config_theme_import.c:286
 msgid "Theme Import Error"
 msgstr "Грешка при внасяне на темата"
 
-#: src/bin/e_int_config_theme_import.c:269
+#: src/bin/e_int_config_theme_import.c:278
 msgid ""
 "Enlightenment was unable to import the theme.<br><br>Are you sure this is "
 "really a valid theme?"
@@ -5763,7 +5955,7 @@ msgstr ""
 "Enlightenment не е могъл да внесе темата.<br>Сигурни ли сте, че темата е "
 "валидна?"
 
-#: src/bin/e_int_config_theme_import.c:278
+#: src/bin/e_int_config_theme_import.c:287
 msgid "Enlightenment was unable to import the theme<br>due to a copy error."
 msgstr ""
 "Enlightenment не е могъл да внесе темата <br>заради грешка в копирането."
@@ -5772,15 +5964,15 @@ msgstr ""
 msgid "Transition Settings"
 msgstr "Настройки на преходните ефекти"
 
-#: src/bin/e_int_config_transitions.c:131
+#: src/bin/e_int_config_transitions.c:127
 msgid "Events"
 msgstr "Събития"
 
-#: src/bin/e_int_config_transitions.c:140
+#: src/bin/e_int_config_transitions.c:136
 msgid "Desk Change"
 msgstr "Прелистване на полето"
 
-#: src/bin/e_int_config_transitions.c:141
+#: src/bin/e_int_config_transitions.c:137
 msgid "Background Change"
 msgstr "Смяна на фона"
 
@@ -5869,7 +6061,7 @@ msgid "Check battery every:"
 msgstr "Проверка на батерията на всеки:"
 
 #: src/modules/battery/e_mod_config.c:111 src/modules/pager/e_mod_config.c:140
-#: src/modules/temperature/e_mod_config.c:335
+#: src/modules/temperature/e_mod_config.c:344
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f·секунди"
@@ -5878,11 +6070,6 @@ msgstr "%1.1f·секунди"
 msgid "Alert when battery is down to:"
 msgstr "Предупреждение когато батерията се изтощи до:"
 
-#: src/modules/battery/e_mod_config.c:120
-#, c-format
-msgid "%1.0f minutes"
-msgstr "%1.0f минути"
-
 #: src/modules/clock/e_mod_main.c:90
 msgid "Clock"
 msgstr "Часовник"
@@ -5895,11 +6082,11 @@ msgstr "Модул за часовник на Enlightenment"
 msgid "A simple module to give E17 a clock."
 msgstr "Прост модул за часовник в E17"
 
-#: src/modules/dropshadow/e_mod_main.c:157
+#: src/modules/dropshadow/e_mod_main.c:155
 msgid "Enlightenment Dropshadow Module"
 msgstr "Модул за сенки на Enlightenment"
 
-#: src/modules/dropshadow/e_mod_main.c:158
+#: src/modules/dropshadow/e_mod_main.c:156
 msgid ""
 "This is the dropshadow module that allows dropshadows to be cast<br>on the "
 "desktop background - without special X-Server extensions<br>or hardware "
@@ -6013,11 +6200,11 @@ msgstr "Премахване на икона"
 msgid "Add Application"
 msgstr "Добавяне на стартер"
 
-#: src/modules/ibar/e_mod_main.c:1449
+#: src/modules/ibar/e_mod_main.c:1443
 msgid "Enlightenment IBar Module"
 msgstr "Модул IBar на Enlightenment"
 
-#: src/modules/ibar/e_mod_main.c:1450
+#: src/modules/ibar/e_mod_main.c:1444
 msgid ""
 "This is the IBar Application Launcher bar module for Enlightenment.<br>It is "
 "a first example module and is being used to flesh out several<br>interfaces "
@@ -6029,43 +6216,43 @@ msgstr ""
 "Enlightenment 0.17.0. Все още се разработва,<br>затова очаквайте да се "
 "<hilight>чупи</hilight> и да се променя за да стане по-добра."
 
-#: src/modules/ibar/e_mod_config.c:52
+#: src/modules/ibar/e_mod_config.c:53
 msgid "IBar Configuration"
 msgstr "Конфигурация на ibar"
 
-#: src/modules/ibar/e_mod_config.c:97
+#: src/modules/ibar/e_mod_config.c:98
 msgid "Selected Bar Source"
 msgstr "Източник на избрания ibar"
 
-#: src/modules/ibar/e_mod_config.c:114
+#: src/modules/ibar/e_mod_config.c:116
 msgid "Icon Labels"
 msgstr "Надпис на иконата"
 
-#: src/modules/ibar/e_mod_config.c:115 src/modules/ibox/e_mod_config.c:97
+#: src/modules/ibar/e_mod_config.c:117 src/modules/ibox/e_mod_config.c:94
 msgid "Show Icon Label"
 msgstr "Имена на икони"
 
-#: src/modules/ibar/e_mod_config.c:121
+#: src/modules/ibar/e_mod_config.c:123
 msgid "Display App Name"
 msgstr "Показване на името"
 
-#: src/modules/ibar/e_mod_config.c:125
+#: src/modules/ibar/e_mod_config.c:127
 msgid "Display App Comment"
 msgstr "Показване на коментар"
 
-#: src/modules/ibar/e_mod_config.c:129
+#: src/modules/ibar/e_mod_config.c:131
 msgid "Display App Generic"
 msgstr "Показване на общо поле"
 
-#: src/modules/ibar/e_mod_config.c:160
+#: src/modules/ibar/e_mod_config.c:161
 msgid "Create new IBar source"
 msgstr "Създаване на нов ibar източник"
 
-#: src/modules/ibar/e_mod_config.c:161
+#: src/modules/ibar/e_mod_config.c:162
 msgid "Enter a name for this new source:"
 msgstr "Задаване на име за новия източник:"
 
-#: src/modules/ibar/e_mod_config.c:172
+#: src/modules/ibar/e_mod_config.c:173
 #, c-format
 msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
@@ -6076,53 +6263,53 @@ msgstr "Искате да изтриете \"%s\".<br><br>Сигурни ли с
 msgid "Are you sure you want to delete this bar source?"
 msgstr "Сигурни ли сте, че искате да изтриете този източник?"
 
-#: src/modules/ibox/e_mod_main.c:224
+#: src/modules/ibox/e_mod_main.c:225
 msgid "IBox"
 msgstr "IBox"
 
-#: src/modules/ibox/e_mod_main.c:1443
+#: src/modules/ibox/e_mod_main.c:1447
 msgid "Enlightenment IBox Module"
 msgstr "Модул IBox на Enlightenment"
 
-#: src/modules/ibox/e_mod_main.c:1444
+#: src/modules/ibox/e_mod_main.c:1448
 msgid ""
 "This is the IBox Iconified Application module for Enlightenment.<br>It will "
 "hold minimized applications"
 msgstr "Това е модула Ibox. Той ще съдържа скрити прозорци"
 
-#: src/modules/ibox/e_mod_config.c:51
+#: src/modules/ibox/e_mod_config.c:48
 msgid "IBox Configuration"
 msgstr "IBox Конфигурация"
 
-#: src/modules/ibox/e_mod_config.c:100
+#: src/modules/ibox/e_mod_config.c:97
 msgid "Display Name"
 msgstr "Показване на име"
 
-#: src/modules/ibox/e_mod_config.c:102
+#: src/modules/ibox/e_mod_config.c:99
 msgid "Display Title"
 msgstr "Показване на заглавие"
 
-#: src/modules/ibox/e_mod_config.c:104
+#: src/modules/ibox/e_mod_config.c:101
 msgid "Display Class"
 msgstr "Показване на клас"
 
-#: src/modules/ibox/e_mod_config.c:106
+#: src/modules/ibox/e_mod_config.c:103
 msgid "Display Icon Name"
 msgstr "Показване на име на икона"
 
-#: src/modules/ibox/e_mod_config.c:131
+#: src/modules/ibox/e_mod_config.c:128
 msgid "Show windows from all zones"
 msgstr "Показване на прозорци от всички зони"
 
-#: src/modules/ibox/e_mod_config.c:136
+#: src/modules/ibox/e_mod_config.c:133
 msgid "Show windows from current zone"
 msgstr "Показване на прозорци от текуща зона"
 
-#: src/modules/ibox/e_mod_config.c:145
+#: src/modules/ibox/e_mod_config.c:142
 msgid "Show windows from all desktops"
 msgstr "Показване на прозорци от всички полета"
 
-#: src/modules/ibox/e_mod_config.c:150
+#: src/modules/ibox/e_mod_config.c:147
 msgid "Show windows from active desktop"
 msgstr "Показване на прозорци от текущо поле"
 
@@ -6130,15 +6317,15 @@ msgstr "Показване на прозорци от текущо поле"
 msgid "Pager"
 msgstr "Pager"
 
-#: src/modules/pager/e_mod_main.c:634
+#: src/modules/pager/e_mod_main.c:627
 msgid "Virtual Desktops Configuration"
 msgstr "Конфигурация на виртуалните полета"
 
-#: src/modules/pager/e_mod_main.c:1883
+#: src/modules/pager/e_mod_main.c:1874
 msgid "Enlightenment Pager Module"
 msgstr "Модул Pager на Enlightenment"
 
-#: src/modules/pager/e_mod_main.c:1884
+#: src/modules/pager/e_mod_main.c:1875
 msgid "A pager module to navigate virtual desktops."
 msgstr "Модул за pager с който се сменят виртуалните полета."
 
@@ -6219,16 +6406,18 @@ msgid ""
 "You cannot use the right mouse button<br>for this as it is already taken by "
 "internal<br>code for context menus."
 msgstr ""
+"Десният бутон на мишката не може да се използва, защото вече се използва от "
+"E."
 
-#: src/modules/temperature/e_mod_main.c:106
+#: src/modules/temperature/e_mod_main.c:127
 msgid "Temperature"
 msgstr "Температура"
 
-#: src/modules/temperature/e_mod_main.c:468
+#: src/modules/temperature/e_mod_main.c:646
 msgid "Enlightenment Temperature Module"
 msgstr "Модул за температура на Enlightenment"
 
-#: src/modules/temperature/e_mod_main.c:469
+#: src/modules/temperature/e_mod_main.c:647
 msgid ""
 "A module to measure the <hilight>ACPI Thermal sensor</hilight> on Linux."
 "<br>It is especially useful for modern Laptops with high speed<br>CPUs that "
@@ -6239,126 +6428,110 @@ msgstr ""
 "за модерни лаптопи с бързи процесори които генерират\n"
 "много топлина."
 
-#: src/modules/temperature/e_mod_config.c:61
+#: src/modules/temperature/e_mod_config.c:63
 msgid "Temperature Configuration"
 msgstr "Конфигурация на температурата"
 
-#: src/modules/temperature/e_mod_config.c:162
-#: src/modules/temperature/e_mod_config.c:265
+#: src/modules/temperature/e_mod_config.c:213
+#: src/modules/temperature/e_mod_config.c:316
 msgid "Display Units"
 msgstr "Единици"
 
-#: src/modules/temperature/e_mod_config.c:164
-#: src/modules/temperature/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:215
+#: src/modules/temperature/e_mod_config.c:318
 msgid "Celsius"
 msgstr "Целзий"
 
-#: src/modules/temperature/e_mod_config.c:166
-#: src/modules/temperature/e_mod_config.c:269
+#: src/modules/temperature/e_mod_config.c:217
+#: src/modules/temperature/e_mod_config.c:320
 msgid "Fahrenheit"
 msgstr "Фаренхайт"
 
-#: src/modules/temperature/e_mod_config.c:170
-#: src/modules/temperature/e_mod_config.c:334
+#: src/modules/temperature/e_mod_config.c:221
+#: src/modules/temperature/e_mod_config.c:343
 msgid "Check Interval"
 msgstr "Интервал за проверяване"
 
-#: src/modules/temperature/e_mod_config.c:172
+#: src/modules/temperature/e_mod_config.c:223
 msgid "Fast"
 msgstr "Бързо"
 
-#: src/modules/temperature/e_mod_config.c:176
+#: src/modules/temperature/e_mod_config.c:227
 msgid "Slow"
 msgstr "Бавно"
 
-#: src/modules/temperature/e_mod_config.c:178
+#: src/modules/temperature/e_mod_config.c:229
 msgid "Very Slow"
 msgstr "Много бавно"
 
-#: src/modules/temperature/e_mod_config.c:185
-#: src/modules/temperature/e_mod_config.c:209
-#: src/modules/temperature/e_mod_config.c:355
-#: src/modules/temperature/e_mod_config.c:367
+#: src/modules/temperature/e_mod_config.c:236
+#: src/modules/temperature/e_mod_config.c:260
+#: src/modules/temperature/e_mod_config.c:364
+#: src/modules/temperature/e_mod_config.c:376
 msgid "High Temperature"
 msgstr "Висока температура"
 
-#: src/modules/temperature/e_mod_config.c:188
+#: src/modules/temperature/e_mod_config.c:239
 msgid "200 F"
 msgstr "200·F"
 
-#: src/modules/temperature/e_mod_config.c:190
+#: src/modules/temperature/e_mod_config.c:241
 msgid "150 F"
 msgstr "150·F"
 
-#: src/modules/temperature/e_mod_config.c:192
-#: src/modules/temperature/e_mod_config.c:201
+#: src/modules/temperature/e_mod_config.c:243
+#: src/modules/temperature/e_mod_config.c:252
 msgid "110 F"
 msgstr "110·F"
 
-#: src/modules/temperature/e_mod_config.c:196
-#: src/modules/temperature/e_mod_config.c:220
-#: src/modules/temperature/e_mod_config.c:360
-#: src/modules/temperature/e_mod_config.c:372
+#: src/modules/temperature/e_mod_config.c:247
+#: src/modules/temperature/e_mod_config.c:271
+#: src/modules/temperature/e_mod_config.c:369
+#: src/modules/temperature/e_mod_config.c:381
 msgid "Low Temperature"
 msgstr "Ниска температура"
 
-#: src/modules/temperature/e_mod_config.c:199
+#: src/modules/temperature/e_mod_config.c:250
 msgid "130 F"
 msgstr "130·F"
 
-#: src/modules/temperature/e_mod_config.c:203
+#: src/modules/temperature/e_mod_config.c:254
 msgid "90 F"
 msgstr "90·F"
 
-#: src/modules/temperature/e_mod_config.c:212
+#: src/modules/temperature/e_mod_config.c:263
 msgid "93 C"
 msgstr "93·C"
 
-#: src/modules/temperature/e_mod_config.c:214
+#: src/modules/temperature/e_mod_config.c:265
 msgid "65 C"
 msgstr "65·C"
 
-#: src/modules/temperature/e_mod_config.c:216
-#: src/modules/temperature/e_mod_config.c:225
+#: src/modules/temperature/e_mod_config.c:267
+#: src/modules/temperature/e_mod_config.c:276
 msgid "43 C"
 msgstr "43·C"
 
-#: src/modules/temperature/e_mod_config.c:223
+#: src/modules/temperature/e_mod_config.c:274
 msgid "55 C"
 msgstr "55·C"
 
-#: src/modules/temperature/e_mod_config.c:227
+#: src/modules/temperature/e_mod_config.c:278
 msgid "32 C"
 msgstr "32·C"
 
-#: src/modules/temperature/e_mod_config.c:297
+#: src/modules/temperature/e_mod_config.c:331
 msgid "Sensors"
 msgstr "Сензори"
 
-#: src/modules/temperature/e_mod_config.c:299
-msgid "Temp 1"
-msgstr "Темп 1"
-
-#: src/modules/temperature/e_mod_config.c:301
-msgid "Temp 2"
-msgstr "Темп 2"
-
-#: src/modules/temperature/e_mod_config.c:303
-msgid "Temp 3"
-msgstr "Темп 3"
-
-#: src/modules/temperature/e_mod_config.c:316
-msgid "ACPI Temperature"
-msgstr "ACPI Температура"
-
-#: src/modules/temperature/e_mod_config.c:356
-#: src/modules/temperature/e_mod_config.c:361
+#: src/modules/temperature/e_mod_config.c:365
+#: src/modules/temperature/e_mod_config.c:370
 #, c-format
 msgid "%1.0f F"
 msgstr "%1.0f·F"
 
-#: src/modules/temperature/e_mod_config.c:368
-#: src/modules/temperature/e_mod_config.c:373
+#: src/modules/temperature/e_mod_config.c:377
+#: src/modules/temperature/e_mod_config.c:382
 #, c-format
 msgid "%1.0f C"
 msgstr "%1.0f·C"
@@ -6478,6 +6651,39 @@ msgstr "Модул Старт на Enlightenment"
 msgid "Experimental Button module for E17"
 msgstr "Експериментален бутонен модул за E17"
 
+#~ msgid "Miscellaneous"
+#~ msgstr "Разни"
+
+#~ msgid "Window list skip"
+#~ msgstr "Списък за пропускане на прозорци"
+
+#~ msgid "Desktop Settings"
+#~ msgstr "Настройки на полетата"
+
+#~ msgid "Desktop Flip"
+#~ msgstr "Прелистване на полетата"
+
+#~ msgid "Stop editing"
+#~ msgstr "Спиране на редактиране"
+
+#~ msgid "Enable screensaver"
+#~ msgstr "Включване на предпазител на екрана"
+
+#~ msgid "Time until screensaver starts"
+#~ msgstr "Време докато заключването се активира"
+
+#~ msgid "Display Settings"
+#~ msgstr "Настройки на екрана"
+
+#~ msgid "Add Mouse"
+#~ msgstr "Добавяне"
+
+#~ msgid "Delete Mouse"
+#~ msgstr "Изтриване"
+
+#~ msgid "Modify"
+#~ msgstr "Промяна"
+
 #~ msgid "Cannot add icon"
 #~ msgstr "Невъзможно е да се прибави икона"
 
@@ -6488,6 +6694,18 @@ msgstr "Експериментален бутонен модул за E17"
 #~ "Опитали сте се да поставите икона на програма,<br>която няма "
 #~ "съответниятeap файл.<br><br>Иконата не може да бъде добавена в IBar."
 
+#~ msgid "Temp 1"
+#~ msgstr "Темп 1"
+
+#~ msgid "Temp 2"
+#~ msgstr "Темп 2"
+
+#~ msgid "Temp 3"
+#~ msgstr "Темп 3"
+
+#~ msgid "ACPI Temperature"
+#~ msgstr "ACPI Температура"
+
 #~ msgid "Behavior"
 #~ msgstr "Поведение"
 
@@ -6593,18 +6811,12 @@ msgstr "Експериментален бутонен модул за E17"
 #~ msgid "Unsorted"
 #~ msgstr "Без подредба"
 
-#~ msgid "Remove Key"
-#~ msgstr "Премахване на клавиш"
-
 #~ msgid "Binding Context"
 #~ msgstr "Контекст"
 
 #~ msgid "Key & Action"
 #~ msgstr "Клавиши & Действие"
 
-#~ msgid "Binding"
-#~ msgstr "Бърз клавиш"
-
 #~ msgid ":"
 #~ msgstr ":"
 
@@ -6669,18 +6881,12 @@ msgstr "Експериментален бутонен модул за E17"
 #~ msgid "Dont let others see or modify this file"
 #~ msgstr "Забрана на други да виждат/модифицират този файл"
 
-#~ msgid "Custom settings"
-#~ msgstr "Потребителски настройки"
-
 #~ msgid "Group:"
 #~ msgstr "Група:"
 
 #~ msgid "Last Access:"
 #~ msgstr "Последен достъп:"
 
-#~ msgid "Last Modified:"
-#~ msgstr "Последна модификация:"
-
 #~ msgid "Me"
 #~ msgstr "Аз"
 
@@ -6696,9 +6902,6 @@ msgstr "Експериментален бутонен модул за E17"
 #~ msgid "By Mod Time"
 #~ msgstr "По време на мод."
 
-#~ msgid "New"
-#~ msgstr "Нова"
-
 #~ msgid "Directory"
 #~ msgstr "Директория"
 
@@ -7030,9 +7233,6 @@ msgstr "Експериментален бутонен модул за E17"
 #~ msgid "Mouse Pointer Size"
 #~ msgstr "Размер на показалеца"
 
-#~ msgid "Next Key Binding"
-#~ msgstr "Следващ бърз клавиш"
-
 #~ msgid "Prev Key Binding"
 #~ msgstr "Предишен бърз клавиш"
 
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index a76654b88..ad6b69022 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -20,6 +20,8 @@ static void _e_shelf_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void
 static void _e_shelf_cb_mouse_in(void *data, Evas *evas, Evas_Object *obj, void *event_info);
 static void _e_shelf_cb_mouse_out(void *data, Evas *evas, Evas_Object *obj, void *event_info);
 static int  _e_shelf_cb_id_sort(void *data1, void *data2);
+static int  _e_shelf_cb_hide_timer(void *data);
+static int  _e_shelf_cb_hide_animator(void *data);
 static void _e_shelf_menu_del_hook(void *data);
 static void _e_shelf_menu_pre_cb(void *data, E_Menu *m);
 
@@ -98,6 +100,7 @@ EAPI E_Shelf *
 e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, int layer, int id)
 {
    E_Shelf *es;
+   const char *option;
    char buf[1024];
    
    es = E_OBJECT_ALLOC(E_Shelf, E_SHELF_TYPE, _e_shelf_free);
@@ -134,7 +137,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
    evas_object_event_callback_add(es->o_event, EVAS_CALLBACK_MOUSE_UP, _e_shelf_cb_mouse_up, es);
    evas_object_event_callback_add(es->o_event, EVAS_CALLBACK_MOUSE_IN, _e_shelf_cb_mouse_in, es);
    evas_object_event_callback_add(es->o_event, EVAS_CALLBACK_MOUSE_OUT, _e_shelf_cb_mouse_out, es);
-   
+
    es->o_base = edje_object_add(es->evas);
    es->name = evas_stringshare_add(name);
    snprintf(buf, sizeof(buf), "e/shelf/%s/base", es->style);
@@ -165,6 +168,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
    e_gadcon_min_size_request_callback_set(es->gadcon,
 					  _e_shelf_gadcon_min_size_request,
 					  es);
+
    e_gadcon_size_request_callback_set(es->gadcon,
 				      _e_shelf_gadcon_size_request,
 				      es);
@@ -187,6 +191,19 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
    
    shelves = evas_list_append(shelves, es);
    shelves = evas_list_sort(shelves, -1, _e_shelf_cb_id_sort);
+   
+   es->hide_step = 0;
+   es->hide_timer = NULL;
+   es->hide_animator = NULL;
+  
+   option =  edje_object_data_get(es->o_base, "hidden_state_size");
+   if (option)
+     es->hidden_state_size = atoi(option);
+   else
+     es->hidden_state_size = 4;
+
+   es->hide_origin = -1;
+   
    return es;
 }
 
@@ -468,12 +485,15 @@ e_shelf_position_calc(E_Shelf *es)
       default:
 	break;
      }
+   es->hide_step = 0;
+   
    e_shelf_move_resize(es, es->x, es->y, es->w, es->h);
 }
 
 EAPI void 
 e_shelf_style_set(E_Shelf *es, const char *style) 
 {
+   const char *option;
    char buf[1024];
    
    E_OBJECT_CHECK(es);
@@ -493,6 +513,14 @@ 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);
+   else
+     es->hidden_state_size = 4;
+   
+   es->hide_origin = -1;
    e_gadcon_unpopulate(es->gadcon);
    e_gadcon_populate(es->gadcon);
 }
@@ -534,6 +562,12 @@ _e_shelf_free(E_Shelf *es)
 	ecore_timer_del(es->hide_timer);
 	es->hide_timer = NULL;
      }
+   if (es->hide_animator)
+     {
+	ecore_animator_del(es->hide_animator);
+	es->hide_animator = NULL;
+     }
+   
    if (es->menu)
      {
 	e_menu_post_deactivate_callback_set(es->menu, NULL, NULL);
@@ -689,7 +723,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
 	if (nw > es->zone->w) nw = es->zone->w;
 	if (nh > es->zone->h) nh = es->zone->h;
 	if (nh != es->h) ny = (es->zone->h - nh) / 2;
-	nx = 0;
+	// nx = 0;
 	break;
       case E_GADCON_ORIENT_RIGHT:
 	if (!es->fit_along) nh = es->h;
@@ -697,7 +731,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
 	if (nw > es->zone->w) nw = es->zone->w;
 	if (nh > es->zone->h) nh = es->zone->h;
 	if (nh != es->h) ny = (es->zone->h - nh) / 2;
-	nx = es->zone->w - nw;
+	// nx = es->zone->w - nw;
 	break;
       case E_GADCON_ORIENT_TOP:
 	if (!es->fit_along) nw = es->w;
@@ -705,7 +739,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
 	if (nw > es->zone->w) nw = es->zone->w;
 	if (nh > es->zone->h) nh = es->zone->h;
 	if (nw != es->w) nx = (es->zone->w - nw) / 2;
-	ny = 0;
+	// ny = 0;
 	break;
       case E_GADCON_ORIENT_BOTTOM:
 	if (!es->fit_along) nw = es->w;
@@ -713,7 +747,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
 	if (nw > es->zone->w) nw = es->zone->w;
 	if (nh > es->zone->h) nh = es->zone->h;
 	if (nw != es->w) nx = (es->zone->w - nw) / 2;
-	ny = es->zone->h - nh;
+	//ny = es->zone->h - nh;
 	break;
       case E_GADCON_ORIENT_CORNER_TL:
 	if (!es->fit_along) nw = es->w;
@@ -721,7 +755,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
 	if (nw > es->zone->w) nw = es->zone->w;
 	if (nh > es->zone->h) nh = es->zone->h;
 	if (nw != es->w) nx = 0;
-	ny = 0;
+	// ny = 0;
 	break;
       case E_GADCON_ORIENT_CORNER_TR:
 	if (!es->fit_along) nw = es->w;
@@ -729,7 +763,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
 	if (nw > es->zone->w) nw = es->zone->w;
 	if (nh > es->zone->h) nh = es->zone->h;
 	nx = es->zone->w - nw;
-	ny = 0;
+	// ny = 0;
 	break;
       case E_GADCON_ORIENT_CORNER_BL:
 	if (!es->fit_along) nw = es->w;
@@ -737,7 +771,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
 	if (nw > es->zone->w) nw = es->zone->w;
 	if (nh > es->zone->h) nh = es->zone->h;
 	if (nw != es->w) nx = 0;
-	ny = es->zone->h - nh;
+	// ny = es->zone->h - nh;
 	break;
       case E_GADCON_ORIENT_CORNER_BR:
 	if (!es->fit_along) nw = es->w;
@@ -745,7 +779,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
 	if (nw > es->zone->w) nw = es->zone->w;
 	if (nh > es->zone->h) nh = es->zone->h;
 	nx = es->zone->w - nw;
-	ny = es->zone->h - nh;
+	//ny = es->zone->h - nh;
 	break;
       case E_GADCON_ORIENT_CORNER_LT:
 	if (!es->fit_along) nh = es->h;
@@ -753,7 +787,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
 	if (nw > es->zone->w) nw = es->zone->w;
 	if (nh > es->zone->h) nh = es->zone->h;
 	if (nh != es->h) ny = 0;
-	nx = 0;
+	// nx = 0;
 	break;
       case E_GADCON_ORIENT_CORNER_RT:
 	if (!es->fit_along) nh = es->h;
@@ -761,7 +795,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
 	if (nw > es->zone->w) nw = es->zone->w;
 	if (nh > es->zone->h) nh = es->zone->h;
 	if (nh != es->h) ny = 0;
-	nx = es->zone->w - nw;
+	// nx = es->zone->w - nw;
 	break;
       case E_GADCON_ORIENT_CORNER_LB:
 	if (!es->fit_along) nh = es->h;
@@ -769,7 +803,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
 	if (nw > es->zone->w) nw = es->zone->w;
 	if (nh > es->zone->h) nh = es->zone->h;
 	if (nh != es->h) ny = es->zone->h - nh;
-	nx = 0;
+	// nx = 0;
 	break;
       case E_GADCON_ORIENT_CORNER_RB:
 	if (!es->fit_along) nh = es->h;
@@ -777,7 +811,7 @@ _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord
 	if (nw > es->zone->w) nw = es->zone->w;
 	if (nh > es->zone->h) nh = es->zone->h;
 	if (nh != es->h) ny = es->zone->h - nh;
-	nx = es->zone->w - nw;
+	// nx = es->zone->w - nw;
 	break;
       default:
 	break;
@@ -971,41 +1005,25 @@ _e_shelf_cb_mouse_in(void *data, Evas *evas, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_In *ev;
    E_Shelf *es;
-   
+
    es = data;
    ev = event_info;
    edje_object_signal_emit(es->o_base, "e,state,focused", "e");
    if (es->cfg->autohide)
      {
-	if (es->hidden)
-	  {
+	if (es->hidden) 
+	  {  
 	     es->hidden = 0;
 	     edje_object_signal_emit(es->o_base, "e,state,visible", "e");
+	     if(!es->hide_animator)
+	       es->hide_animator = ecore_animator_add(_e_shelf_cb_hide_animator, es);
+	     if (es->hide_timer)
+	       {    
+		  ecore_timer_del(es->hide_timer);
+		  es->hide_timer = NULL;
+	       }
 	  }
      }
-   if (es->hide_timer)
-     {
-	ecore_timer_del(es->hide_timer);
-	es->hide_timer = NULL;
-     }
-}
-
-static int
-_e_shelf_cb_hide_timer(void *data)
-{
-   E_Shelf *es;
-   
-   es = data;
-   if (!e_menu_grab_window_get())
-     {
-	if (!es->hidden)
-	  {
-	     edje_object_signal_emit(es->o_base, "e,state,hidden", "e");
-	  }
-     }
-   es->hide_timer = NULL;
-   es->hidden = 1;
-   return 0;
 }
 
 static void
@@ -1013,18 +1031,22 @@ _e_shelf_cb_mouse_out(void *data, Evas *evas, Evas_Object *obj, void *event_info
 {
    Evas_Event_Mouse_Out *ev;
    E_Shelf *es;
-   
+
    es = data;
    ev = event_info;
    if (es->cfg->autohide)
      {
 	Evas_Coord x, y, w, h;
-	
+
 	evas_object_geometry_get(es->o_base, &x, &y, &w, &h);
 	if (!E_INSIDE(ev->canvas.x, ev->canvas.y, x, y, w, h))
 	  {
-	     if (es->hide_timer) ecore_timer_del(es->hide_timer);
-	     es->hide_timer = ecore_timer_add(0.25, _e_shelf_cb_hide_timer, es);
+	     if(!es->hidden)
+	       {	
+		  es->hidden = 1; 
+		  if(!es->hide_timer)
+		    es->hide_timer = ecore_timer_add(1.0, _e_shelf_cb_hide_timer, es);
+	       }
 	  }
      }
    edje_object_signal_emit(es->o_base, "e,state,unfocused", "e");
@@ -1040,6 +1062,217 @@ _e_shelf_cb_id_sort(void *data1, void *data2)
    return (es1->id) > (es2->id);
 }
 
+static int
+_e_shelf_cb_hide_timer(void *data)
+{
+   E_Shelf *es;
+
+   es = data;
+
+   if(!es->hide_animator)
+     es->hide_animator = ecore_animator_add(_e_shelf_cb_hide_animator, es);
+
+   edje_object_signal_emit(es->o_base, "e,state,hidden", "e");
+   if(es->hide_timer)
+     {    
+	ecore_timer_del(es->hide_timer);
+	es->hide_timer = NULL;
+     }
+   return 1;
+}
+
+static int
+_e_shelf_cb_hide_animator(void *data)
+{
+   E_Shelf *es;
+   int step = 2, move = 0;
+
+   es = data;
+
+   switch(es->gadcon->orient)
+     {
+      case E_GADCON_ORIENT_TOP:
+      case E_GADCON_ORIENT_CORNER_TL:
+      case E_GADCON_ORIENT_CORNER_TR:
+	 /* TODO: step coefficient needs to be configurable */
+	 step = ((es->h - es->hidden_state_size) / e_config->framerate) * 2;
+	 if(es->hidden)
+	   {
+	      if (es->hide_origin == -1) es->hide_origin = es->y;
+	      if (es->hide_step < es->h - es->hidden_state_size)
+		{
+		   if (es->hide_step + step > es->h - es->hidden_state_size)
+		     {
+			move = es->hide_origin - es->h + es->hidden_state_size;
+			es->hide_step = es->h - es->hidden_state_size;
+		     }
+		   else
+		     {
+			move = es->y - step;
+			es->hide_step += step;
+		     }
+		   e_shelf_move(es, es->x, move);
+		}
+	      else goto end;
+	   }
+	 else
+	   {
+	      if(es->hide_step > 0)
+		{
+		   if (es->hide_step < step)
+		     {
+			move = es->hide_origin;
+			es->hide_step = 0;
+		     }
+		   else
+		     {
+			move = es->y + step;
+			es->hide_step -= step;	       
+		     }
+		   e_shelf_move(es, es->x, move);
+		}
+	      else goto end;
+	   }
+	 break;
+      case E_GADCON_ORIENT_BOTTOM:
+      case E_GADCON_ORIENT_CORNER_BL:
+      case E_GADCON_ORIENT_CORNER_BR:
+	 step = ((es->h - es->hidden_state_size) / e_config->framerate) * 2;
+	 if(es->hidden)
+	   {
+	      if (es->hide_origin == -1) es->hide_origin = es->y;
+	      if (es->hide_step < es->h - es->hidden_state_size)
+		{
+		   if (es->hide_step + step > es->h - es->hidden_state_size)
+		     {
+			move = es->hide_origin + es->h - es->hidden_state_size;
+			es->hide_step = es->h - es->hidden_state_size;
+		     }
+		   else
+		     {
+			move = es->y + step;
+			es->hide_step += step;
+		     }
+		   e_shelf_move(es, es->x, move);
+		}
+	      else goto end;
+	   }
+	 else
+	   {
+	      if(es->hide_step > 0)
+		{
+		   if (es->hide_step < step)
+		     {
+			move = es->hide_origin;
+			es->hide_step = 0;
+		     }
+		   else
+		     {
+			move = es->y - step;
+			es->hide_step -= step;	       
+		     }
+		   e_shelf_move(es, es->x, move);
+		}
+	      else goto end;
+	   }
+
+	 break;
+      case E_GADCON_ORIENT_LEFT:
+      case E_GADCON_ORIENT_CORNER_LB:
+      case E_GADCON_ORIENT_CORNER_LT:
+	 step = ((es->w - es->hidden_state_size) / e_config->framerate) * 2;
+	 if(es->hidden)
+	   {
+	      if (es->hide_origin == -1) es->hide_origin = es->x;
+	      if (es->hide_step < es->w - es->hidden_state_size)
+		{
+		   if (es->hide_step + step > es->w - es->hidden_state_size)
+		     {
+			move = es->hide_origin - es->w + es->hidden_state_size;
+			es->hide_step = es->w - es->hidden_state_size;
+		     }
+		   else
+		     {
+			move = es->x - step;
+			es->hide_step += step;
+		     }
+		   e_shelf_move(es, move, es->y);
+		}
+	      else goto end;
+	   }
+	 else
+	   {
+	      if (es->hide_step > 0)
+		{
+		   if (es->hide_step < step)
+		     {
+			move = es->hide_origin;
+			es->hide_step = 0;
+		     }
+		   else
+		     {
+			move = es->x + step;
+			es->hide_step -= step;	       
+		     }
+		   e_shelf_move(es, move, es->y);
+		}
+	      else goto end;
+	   }
+
+	 break; 
+      case E_GADCON_ORIENT_RIGHT:
+      case E_GADCON_ORIENT_CORNER_RB:
+      case E_GADCON_ORIENT_CORNER_RT:
+	 step = ((es->w - es->hidden_state_size) / e_config->framerate) * 2;
+	 if(es->hidden)
+	   {
+	      if (es->hide_origin == -1) es->hide_origin = es->x;
+	      if (es->hide_step < es->w - es->hidden_state_size)
+		{
+		   if (es->hide_step + step > es->w - es->hidden_state_size)
+		     {
+			move = es->hide_origin + es->w - es->hidden_state_size;
+			es->hide_step = es->w - es->hidden_state_size;
+		     }
+		   else
+		     {
+			move = es->x + step;
+			es->hide_step += step;
+		     }
+		   e_shelf_move(es, move, es->y);
+		}
+	      else goto end;
+	   }
+	 else
+	   {
+	      if (es->hide_step > 0)
+		{
+		   if (es->hide_step < step)
+		     {
+			move = es->hide_origin;
+			es->hide_step = 0;
+		     }
+		   else
+		     {
+			move = es->x - step;
+			es->hide_step -= step;	       
+		     }
+		   e_shelf_move(es, move, es->y);
+		}
+	      else goto end;
+	   }
+	 break; 
+      default:
+	 break;
+     }
+   return 1;
+
+end:
+   ecore_animator_del(es->hide_animator);
+   es->hide_animator = NULL;
+   return 1;
+}
+
 static void 
 _e_shelf_menu_del_hook(void *data) 
 {
diff --git a/src/bin/e_shelf.h b/src/bin/e_shelf.h
index f8f6b109c..7e1146e1a 100644
--- a/src/bin/e_shelf.h
+++ b/src/bin/e_shelf.h
@@ -28,12 +28,16 @@ struct _E_Shelf
    const char          *style;
    E_Config_Shelf      *cfg;
    unsigned char        fit_along : 1;
-   unsigned char        fit_size : 1;
-   unsigned char        hidden : 1;
+   unsigned char        fit_size  : 1;
+   unsigned char        hidden    : 1;
    int                  size;
    E_Config_Dialog     *config_dialog;
    E_Menu              *menu;
    Ecore_Timer         *hide_timer;
+   Ecore_Animator      *hide_animator;
+   int                  hide_step;
+   int                  hidden_state_size;
+   int			hide_origin;
 };
 
 EAPI int              e_shelf_init(void);