From: Dana Jansens <danakj@orodu.net>
Date: Tue, 12 Jun 2007 14:35:47 +0000 (+0000)
Subject: merge r7500-7514 from trunk
X-Git-Tag: release-3.4.3~75
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=28760f8d43291f3f256d12ecc1d14ed17cead546;p=dana%2Fopenbox.git

merge r7500-7514 from trunk
---

diff --git a/openbox/action.c b/openbox/action.c
index 4c745b2d..6248d143 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -60,8 +60,12 @@ static void client_action_end(union ActionData *data, gboolean allow_enters)
                    event will come as a GrabNotify which is ignored, so this
                    makes a fake enter event
                 */
-                if ((c = client_under_pointer()) && c != data->any.c)
+                if ((c = client_under_pointer()) && c != data->any.c) {
+                    ob_debug_type(OB_DEBUG_FOCUS,
+                                  "Generating fake enter because we did a "
+                                  "mouse-event action");
                     event_enter_client(c);
+                }
             }
         }
 }
diff --git a/openbox/client.c b/openbox/client.c
index 15b61352..29b27d1d 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -327,6 +327,7 @@ void client_manage(Window window)
          self->type == OB_CLIENT_TYPE_UTILITY ||
          self->type == OB_CLIENT_TYPE_DIALOG))
     {
+        /* XXX use focus_cycle_valid_target instead... */
         activate = TRUE;
     }
 
@@ -532,7 +533,16 @@ void client_manage(Window window)
     /* this has to happen before we try focus the window, but we want it to
        happen after the client's stacking has been determined or it looks bad
     */
-    client_show(self);
+    {
+        gulong ignore_start;
+        if (!config_focus_under_mouse)
+            ignore_start = event_start_ignore_all_enters();
+
+        client_show(self);
+
+        if (!config_focus_under_mouse)
+            event_end_ignore_all_enters(ignore_start);
+    }
 
     if (activate) {
         gboolean stacked = client_restore_session_stacking(self);
@@ -616,14 +626,14 @@ void client_unmanage(ObClient *self)
     XSelectInput(ob_display, self->window, NoEventMask);
 
     /* ignore enter events from the unmap so it doesnt mess with the focus */
-    if (!client_focused(self) || !config_focus_under_mouse)
+    if (!config_focus_under_mouse)
         ignore_start = event_start_ignore_all_enters();
 
     frame_hide(self->frame);
     /* flush to send the hide to the server quickly */
     XFlush(ob_display);
 
-    if (!client_focused(self) || !config_focus_under_mouse)
+    if (!config_focus_under_mouse)
         event_end_ignore_all_enters(ignore_start);
 
     mouse_grab_for_client(self, FALSE);
@@ -1569,7 +1579,16 @@ void client_update_normal_hints(ObClient *self)
     
         if (size.flags & PResizeInc && size.width_inc && size.height_inc)
             SIZE_SET(self->size_inc, size.width_inc, size.height_inc);
+
+        ob_debug("Normal hints: min size (%d %d) max size (%d %d)\n   "
+                 "size inc (%d %d) base size (%d %d)\n",
+                 self->min_size.width, self->min_size.height,
+                 self->max_size.width, self->max_size.height,
+                 self->size_inc.width, self->size_inc.height,
+                 self->base_size.width, self->base_size.height);
     }
+    else
+        ob_debug("Normal hints: not set\n");
 }
 
 void client_setup_decor_and_functions(ObClient *self, gboolean reconfig)
@@ -1708,12 +1727,8 @@ void client_setup_decor_and_functions(ObClient *self, gboolean reconfig)
 
     /* finally, the user can have requested no decorations, which overrides
        everything (but doesnt give it a border if it doesnt have one) */
-    if (self->undecorated) {
-        if (config_theme_keepborder)
-            self->decorations &= OB_FRAME_DECOR_BORDER;
-        else
-            self->decorations = 0;
-    }
+    if (self->undecorated)
+        self->decorations = 0;
 
     /* if we don't have a titlebar, then we cannot shade! */
     if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR))
@@ -2477,6 +2492,19 @@ gboolean client_hide(ObClient *self)
             event_cancel_all_key_grabs();
         }
 
+        /* We don't need to ignore enter events here.
+           The window can hide/iconify in 3 different ways:
+           1 - through an x message. in this case we ignore all enter events
+               caused by responding to the x message (unless underMouse)
+           2 - by a keyboard action. in this case we ignore all enter events
+               caused by the action
+           3 - by a mouse action. in this case they are doing stuff with the
+               mouse and focus _should_ move.
+
+           Also in action_end, we simulate an enter event that can't be ignored
+           so trying to ignore them is futile in case 3 anyways
+        */
+
         frame_hide(self->frame);
         hide = TRUE;
 
@@ -2666,9 +2694,61 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h,
        the updated frame dimensions. */
     frame_adjust_area(self->frame, FALSE, TRUE, TRUE);
 
+    /* gets the frame's position */
+    frame_client_gravity(self->frame, x, y, *w, *h);
+
+    /* these positions are frame positions, not client positions */
+
+    /* set the size and position if fullscreen */
+    if (self->fullscreen) {
+        Rect *a;
+        guint i;
+
+        i = screen_find_monitor(&desired_area);
+        a = screen_physical_area_monitor(i);
+
+        *x = a->x;
+        *y = a->y;
+        *w = a->width;
+        *h = a->height;
+
+        user = FALSE; /* ignore if the client can't be moved/resized when it
+                         is fullscreening */
+    } else if (self->max_horz || self->max_vert) {
+        Rect *a;
+        guint i;
+
+        i = screen_find_monitor(&desired_area);
+        a = screen_area_monitor(self->desktop, i);
+
+        /* set the size and position if maximized */
+        if (self->max_horz) {
+            *x = a->x;
+            *w = a->width - self->frame->size.left - self->frame->size.right;
+        }
+        if (self->max_vert) {
+            *y = a->y;
+            *h = a->height - self->frame->size.top - self->frame->size.bottom;
+        }
+
+        user = FALSE; /* ignore if the client can't be moved/resized when it
+                         is maximizing */
+    }
+
+    /* gets the client's position */
+    frame_frame_gravity(self->frame, x, y, *w, *h);
+
     /* work within the prefered sizes given by the window */
     if (!(*w == self->area.width && *h == self->area.height)) {
         gint basew, baseh, minw, minh;
+        gint incw, inch, minratio, maxratio;
+
+        incw = self->fullscreen || self->max_horz ? 1 : self->size_inc.width;
+        inch = self->fullscreen || self->max_vert ? 1 : self->size_inc.height;
+        minratio = self->fullscreen || (self->max_horz && self->max_vert) ?
+            0 : self->min_ratio;
+        maxratio = self->fullscreen || (self->max_horz && self->max_vert) ?
+            0 : self->max_ratio;
 
         /* base size is substituted with min size if not specified */
         if (self->base_size.width || self->base_size.height) {
@@ -2700,19 +2780,19 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h,
         *h -= baseh;
 
         /* keep to the increments */
-        *w /= self->size_inc.width;
-        *h /= self->size_inc.height;
+        *w /= incw;
+        *h /= inch;
 
         /* you cannot resize to nothing */
         if (basew + *w < 1) *w = 1 - basew;
         if (baseh + *h < 1) *h = 1 - baseh;
   
         /* save the logical size */
-        *logicalw = self->size_inc.width > 1 ? *w : *w + basew;
-        *logicalh = self->size_inc.height > 1 ? *h : *h + baseh;
+        *logicalw = incw > 1 ? *w : *w + basew;
+        *logicalh = inch > 1 ? *h : *h + baseh;
 
-        *w *= self->size_inc.width;
-        *h *= self->size_inc.height;
+        *w *= incw;
+        *h *= inch;
 
         *w += basew;
         *h += baseh;
@@ -2722,77 +2802,31 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h,
         *w -= self->base_size.width;
         *h -= self->base_size.height;
 
-        if (!self->fullscreen) {
-            if (self->min_ratio)
-                if (*h * self->min_ratio > *w) {
-                    *h = (gint)(*w / self->min_ratio);
+        if (minratio)
+            if (*h * minratio > *w) {
+                *h = (gint)(*w / minratio);
 
-                    /* you cannot resize to nothing */
-                    if (*h < 1) {
-                        *h = 1;
-                        *w = (gint)(*h * self->min_ratio);
-                    }
+                /* you cannot resize to nothing */
+                if (*h < 1) {
+                    *h = 1;
+                    *w = (gint)(*h * minratio);
                 }
-            if (self->max_ratio)
-                if (*h * self->max_ratio < *w) {
-                    *h = (gint)(*w / self->max_ratio);
-
-                    /* you cannot resize to nothing */
-                    if (*h < 1) {
-                        *h = 1;
-                        *w = (gint)(*h * self->min_ratio);
-                    }
+            }
+        if (maxratio)
+            if (*h * maxratio < *w) {
+                *h = (gint)(*w / maxratio);
+
+                /* you cannot resize to nothing */
+                if (*h < 1) {
+                    *h = 1;
+                    *w = (gint)(*h * minratio);
                 }
-        }
+            }
 
         *w += self->base_size.width;
         *h += self->base_size.height;
     }
 
-    /* gets the frame's position */
-    frame_client_gravity(self->frame, x, y, *w, *h);
-
-    /* these positions are frame positions, not client positions */
-
-    /* set the size and position if fullscreen */
-    if (self->fullscreen) {
-        Rect *a;
-        guint i;
-
-        i = screen_find_monitor(&desired_area);
-        a = screen_physical_area_monitor(i);
-
-        *x = a->x;
-        *y = a->y;
-        *w = a->width;
-        *h = a->height;
-
-        user = FALSE; /* ignore if the client can't be moved/resized when it
-                         is fullscreening */
-    } else if (self->max_horz || self->max_vert) {
-        Rect *a;
-        guint i;
-
-        i = screen_find_monitor(&desired_area);
-        a = screen_area_monitor(self->desktop, i);
-
-        /* set the size and position if maximized */
-        if (self->max_horz) {
-            *x = a->x;
-            *w = a->width - self->frame->size.left - self->frame->size.right;
-        }
-        if (self->max_vert) {
-            *y = a->y;
-            *h = a->height - self->frame->size.top - self->frame->size.bottom;
-        }
-
-        user = FALSE; /* ignore if the client can't be moved/resized when it
-                         is maximizing */
-    }
-
-    /* gets the client's position */
-    frame_frame_gravity(self->frame, x, y, *w, *h);
-
     /* these override the above states! if you cant move you can't move! */
     if (user) {
         if (!(self->functions & OB_CLIENT_FUNC_MOVE)) {
@@ -3204,6 +3238,9 @@ void client_set_desktop_recursive(ObClient *self,
         /* raise if it was not already on the desktop */
         if (old != DESKTOP_ALL)
             stacking_raise(CLIENT_AS_WINDOW(self));
+        /* the new desktop's geometry may be different, so we may need to
+           resize, for example if we are maximized */
+        client_reconfigure(self);
         if (STRUT_EXISTS(self->strut))
             screen_update_areas();
     }
diff --git a/openbox/event.c b/openbox/event.c
index 2d44bc51..9dd78c17 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1932,8 +1932,7 @@ void event_cancel_all_key_grabs()
            on from the KeyPress. If the grab is left on, and focus
            moves during that time, it will be NotifyWhileGrabbed, and
            applications like to ignore those! */
-        if (!keyboard_interactively_grabbed())
-            XUngrabKeyboard(ob_display, CurrentTime);
+        XUngrabKeyboard(ob_display, CurrentTime);
 
 }
 
diff --git a/openbox/focus.c b/openbox/focus.c
index 303388be..6d66382a 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -126,7 +126,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus,
            backup fallback though)
         */
         if ((allow_omnipresent || c->desktop == screen_desktop) &&
-            client_normal(c) &&
+            focus_cycle_target_valid(c, FALSE, FALSE, FALSE, FALSE) &&
             (allow_refocus || client_focus_target(c) != old) &&
             client_focus(c))
         {
@@ -145,7 +145,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus,
            a splashscreen or a desktop window (save the desktop as a
            backup fallback though)
         */
-        if (c->type == OB_CLIENT_TYPE_DESKTOP &&
+        if (focus_cycle_target_valid(c, FALSE, FALSE, FALSE, TRUE) &&
             (allow_refocus || client_focus_target(c) != old) &&
             client_focus(c))
         {
diff --git a/openbox/frame.c b/openbox/frame.c
index eba679a9..746bc610 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -335,14 +335,18 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
         self->max_horz = self->client->max_horz;
         self->max_vert = self->client->max_vert;
 
-        if (self->decorations & OB_FRAME_DECOR_BORDER) {
+        if (self->decorations & OB_FRAME_DECOR_BORDER ||
+            (self->client->undecorated && config_theme_keepborder))
             self->bwidth = ob_rr_theme->fbwidth;
+        else
+            self->bwidth = 0;
+
+        if (self->decorations & OB_FRAME_DECOR_BORDER) {
             self->cbwidth_l = self->cbwidth_r = ob_rr_theme->cbwidthx;
             self->cbwidth_t = self->cbwidth_b = ob_rr_theme->cbwidthy;
-        } else {
-            self->bwidth = self->cbwidth_l = self->cbwidth_t =
+        } else
+            self->cbwidth_l = self->cbwidth_t =
                 self->cbwidth_r = self->cbwidth_b = 0;
-        }
 
         if (self->max_horz) {
             self->cbwidth_l = self->cbwidth_r = 0;
diff --git a/openbox/place.c b/openbox/place.c
index 0b8309a2..c30a27f9 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -213,176 +213,114 @@ static GSList* area_remove(GSList *list, Rect *a)
     return result;
 }
 
-static gint area_cmp(gconstpointer p1, gconstpointer p2, gpointer data)
+enum {
+    IGNORE_FULLSCREEN = 1 << 0,
+    IGNORE_MAXIMIZED  = 1 << 1,
+    IGNORE_MENUTOOL   = 1 << 2,
+    /*IGNORE_SHADED     = 1 << 3,*/
+    IGNORE_NONGROUP   = 1 << 3,
+    IGNORE_BELOW      = 1 << 4,
+    IGNORE_NONFOCUS   = 1 << 5,
+    IGNORE_END        = 1 << 6
+};
+
+static gboolean place_nooverlap(ObClient *c, gint *x, gint *y)
 {
-    ObClient *c = data;
-    Rect *carea = &c->frame->area;
-    const Rect *a1 = p1, *a2 = p2;
-    gboolean diffhead = FALSE;
-    guint i;
-    Rect *a;
-
-    for (i = 0; i < screen_num_monitors; ++i) {
-        a = screen_physical_area_monitor(i);
-        if (RECT_CONTAINS(*a, a1->x, a1->y) &&
-            !RECT_CONTAINS(*a, a2->x, a2->y))
-        {
-            diffhead = TRUE;
-            break;
-        }
-    }
-
-    /* has to be more than me in the group */
-    if (diffhead && client_has_group_siblings(c)) {
-        guint *num, most;
-        GSList *it;
-
-        /* find how many clients in the group are on each monitor, use the
-           monitor with the most in it */
-        num = g_new0(guint, screen_num_monitors);
-        for (it = c->group->members; it; it = g_slist_next(it))
-            if (it->data != c)
-                ++num[client_monitor(it->data)];
-        most = 0;
-        for (i = 1; i < screen_num_monitors; ++i)
-            if (num[i] > num[most])
-                most = i;
-
-        g_free(num);
-
-        a = screen_physical_area_monitor(most);
-        if (RECT_CONTAINS(*a, a1->x, a1->y))
-            return -1;
-        if (RECT_CONTAINS(*a, a2->x, a2->y))
-            return 1;
-    }
-
-    return MIN((a1->width - carea->width), (a1->height - carea->height)) -
-        MIN((a2->width - carea->width), (a2->height - carea->height));
-}
-
-typedef enum
-{
-    SMART_FULL,
-    SMART_GROUP,
-    SMART_FOCUSED
-} ObSmartType;
-
-#define SMART_IGNORE(placer, c) \
-    (placer == c || c->shaded || !c->frame->visible || \
-     c->type == OB_CLIENT_TYPE_SPLASH || c->type == OB_CLIENT_TYPE_DESKTOP || \
-     ((c->type == OB_CLIENT_TYPE_MENU || c->type == OB_CLIENT_TYPE_TOOLBAR) &&\
-      client_has_parent(c)) || \
-     (c->desktop != DESKTOP_ALL && \
-      c->desktop != (placer->desktop == DESKTOP_ALL ? \
-                     screen_desktop : placer->desktop)))
-
-static gboolean place_smart(ObClient *client, gint *x, gint *y,
-                            ObSmartType type, gboolean ignore_max)
-{
-    gboolean ret = FALSE;
-    GSList *spaces = NULL, *sit;
-    GList *it;
     Rect **areas;
-    guint i;
-
-    if (type == SMART_GROUP) {
-        /* has to be more than me in the group */
-        if (!client_has_group_siblings(client))
-            return FALSE;
-    }
+    gint ignore;
+    gboolean ret;
+    gint maxsize;
+    GSList *spaces = NULL, *sit, *maxit;
+
+    areas = pick_head(c);
+    ret = FALSE;
+    maxsize = 0;
+    maxit = NULL;
+
+    /* try ignoring different things to find empty space */
+    for (ignore = 0; ignore < IGNORE_END && !ret; ignore = (ignore << 1) + 1) {
+        guint i;
+
+        /* try all monitors in order of preference */
+        for (i = 0; i < screen_num_monitors && !ret; ++i) {
+            GList *it;
+
+            /* add the whole monitor */
+            spaces = area_add(spaces, areas[i]);
+
+            /* go thru all the windows */
+            for (it = client_list; it; it = g_list_next(it)) {
+                ObClient *test = it->data;
+
+                /* should we ignore this client? */
+                if (screen_showing_desktop) continue;
+                if (c == test) continue;
+                if (test->iconic) continue;
+                if (c->desktop != DESKTOP_ALL) {
+                    if (test->desktop != c->desktop &&
+                        test->desktop != DESKTOP_ALL) continue;
+                } else {
+                    if (test->desktop != screen_desktop &&
+                        test->desktop != DESKTOP_ALL) continue;
+                }
+                if (test->type == OB_CLIENT_TYPE_SPLASH ||
+                    test->type == OB_CLIENT_TYPE_DESKTOP) continue;
+
+
+                if ((ignore & IGNORE_FULLSCREEN) &&
+                    test->fullscreen) continue;
+                if ((ignore & IGNORE_MAXIMIZED) &&
+                    test->max_horz && test->max_vert) continue;
+                if ((ignore & IGNORE_MENUTOOL) &&
+                    (test->type == OB_CLIENT_TYPE_MENU ||
+                     test->type == OB_CLIENT_TYPE_TOOLBAR) &&
+                    client_has_parent(c)) continue;
+                /*
+                if ((ignore & IGNORE_SHADED) &&
+                    test->shaded) continue;
+                */
+                if ((ignore & IGNORE_NONGROUP) &&
+                    client_has_group_siblings(c) &&
+                    test->group != c->group) continue;
+                if ((ignore & IGNORE_BELOW) &&
+                    test->layer < c->layer) continue;
+                if ((ignore & IGNORE_NONFOCUS) &&
+                    focus_client != test) continue;
+
+                /* don't ignore this window, so remove it from the available
+                   area */
+                spaces = area_remove(spaces, &test->frame->area);
+            }
 
-    areas = pick_head(client);
+            for (sit = spaces; sit; sit = g_slist_next(sit)) {
+                Rect *r = sit->data;
 
-    for (i = 0; i < screen_num_monitors && !ret; ++i) {
-        spaces = area_add(spaces, areas[i]);
-
-        /* stay out from under windows in higher layers */
-        for (it = stacking_list; it; it = g_list_next(it)) {
-            ObClient *c;
-
-            if (WINDOW_IS_CLIENT(it->data)) {
-                c = it->data;
-                if (ignore_max &&
-                    (c->fullscreen || (c->max_vert && c->max_horz)))
-                    continue;
-            } else
-                continue;
-
-            if (c->layer > client->layer) {
-                if (!SMART_IGNORE(client, c))
-                    spaces = area_remove(spaces, &c->frame->area);
-            } else
-                break;
-        }
-
-        if (type == SMART_FULL || type == SMART_FOCUSED) {
-            gboolean found_foc = FALSE, stop = FALSE;
-            ObClient *foc;
-
-            foc = focus_order_find_first(client->desktop == DESKTOP_ALL ?
-                                         screen_desktop : client->desktop);
-
-            for (; it && !stop; it = g_list_next(it)) {
-                ObClient *c;
-
-                if (WINDOW_IS_CLIENT(it->data)) {
-                    c = it->data;
-                    if (ignore_max &&
-                        (c->fullscreen || (c->max_vert && c->max_horz)))
-                        continue;
-                } else
-                    continue;
-
-                if (!SMART_IGNORE(client, c)) {
-                    if (type == SMART_FOCUSED)
-                        if (found_foc)
-                            stop = TRUE;
-                    if (!stop)
-                        spaces = area_remove(spaces, &c->frame->area);
+                if (r->width >= c->frame->area.width &&
+                    r->height >= c->frame->area.height &&
+                    r->width > maxsize)
+                {
+                    maxsize = r->width;
+                    maxit = sit;
                 }
-
-                if (c == foc)
-                    found_foc = TRUE;
             }
-        } else if (type == SMART_GROUP) {
-            for (sit = client->group->members; sit; sit = g_slist_next(sit)) {
-                ObClient *c = sit->data;
-                if (!SMART_IGNORE(client, c))
-                    spaces = area_remove(spaces, &c->frame->area);
-            }
-        } else
-            g_assert_not_reached();
-
-        spaces = g_slist_sort_with_data(spaces, area_cmp, client);
-
-        for (sit = spaces; sit; sit = g_slist_next(sit)) {
-            Rect *r = sit->data;
-
-            if (!ret) {
-                if (r->width >= client->frame->area.width &&
-                    r->height >= client->frame->area.height) {
-                    ret = TRUE;
-                    if (client->type == OB_CLIENT_TYPE_DIALOG ||
-                        type != SMART_FULL)
-                    {
-                        *x = r->x + (r->width - client->frame->area.width)/2;
-                        *y = r->y + (r->height - client->frame->area.height)/2;
-                    } else {
-                        *x = r->x;
-                        *y = r->y;
-                    }
-                }
+
+            if (maxit) {
+                Rect *r = maxit->data;
+
+                /* center it in the area */
+                *x = r->x + (r->width - c->frame->area.width) / 2;
+                *y = r->y + (r->height - c->frame->area.height) / 2;
+                ret = TRUE;
             }
 
-            g_free(r);
+            while (spaces) {
+                g_free(spaces->data);
+                spaces = g_slist_delete_link(spaces, spaces);
+            }
         }
-        g_slist_free(spaces);
-        spaces = NULL;
     }
 
     g_free(areas);
-
     return ret;
 }
 
@@ -392,8 +330,9 @@ static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
     gint px, py;
     Rect *area;
 
+    if (!screen_pointer_pos(&px, &py))
+        return FALSE;
     area = pick_pointer_head(client);
-    screen_pointer_pos(&px, &py);
 
     l = area->x;
     t = area->y;
@@ -500,22 +439,21 @@ static gboolean place_transient_splash(ObClient *client, gint *x, gint *y)
 gboolean place_client(ObClient *client, gint *x, gint *y,
                       ObAppSettings *settings)
 {
-    gboolean ret = FALSE;
+    gboolean ret;
+
     if (client->positioned)
         return FALSE;
-    if (place_transient_splash(client, x, y))
-        ret = TRUE;
-    else if (!(
+
+    /* try a number of methods */
+    ret = place_transient_splash(client, x, y) ||
         place_per_app_setting(client, x, y, settings) ||
-        ((config_place_policy == OB_PLACE_POLICY_MOUSE) ?
-         place_under_mouse(client, x, y) :
-         place_smart(client, x, y, SMART_FULL, FALSE)   ||
-         place_smart(client, x, y, SMART_FULL, TRUE)    ||
-         place_smart(client, x, y, SMART_GROUP, FALSE)  ||
-         place_smart(client, x, y, SMART_GROUP, TRUE)   ||
-         place_smart(client, x, y, SMART_FOCUSED, TRUE) ||
-         place_random(client, x, y))))
-        g_assert_not_reached(); /* the last one better succeed */
+        (config_place_policy == OB_PLACE_POLICY_MOUSE &&
+         place_under_mouse(client, x, y)) ||
+        place_nooverlap(client, x, y) ||
+        place_under_mouse(client, x, y) ||
+        place_random(client, x, y);
+    g_assert(ret);
+
     /* get where the client should be */
     frame_frame_gravity(client->frame, x, y,
                         client->area.width, client->area.height);
diff --git a/po/ar.po b/po/ar.po
index 370b499f..4ef8d16c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-26 03:11+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -115,7 +115,7 @@ msgstr "أغلق (&C)"
 msgid "Invalid button '%s' specified in config file"
 msgstr "زر غير صحيح '%s' محدد في ملف الإعدادات"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "يتعارض مع ارتباط المفاتيح في ملف الإعدادات"
 
@@ -124,22 +124,22 @@ msgstr "يتعارض مع ارتباط المفاتيح في ملف الإعدا
 msgid "Unable to find a valid menu file '%s'"
 msgstr "لم أعثر على ملف قائمة سليم '%s'"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "فشل تنفيذ أمر ل pipe-menu '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "خرج غير سليم من pipe-menu '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "حاولت الوصول إلى القائمة '%s' لكنها غير موجودة"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "المزيد..."
 
@@ -288,7 +288,7 @@ msgstr "تعذّر الحصول على انتقاء مدير النوافذ عل
 msgid "The WM on screen %d is not exiting"
 msgstr "مدير النوافذ على الشاشة %Id لا وجود له"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "سطح المكتب %Ii"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index d5f49205..846e756d 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-06-01 19:02+0530\n"
 "Last-Translator: Runa Bhattacharjee <runabh@gmail.com>\n"
 "Language-Team: Bengali (India) <en@li.org>\n"
@@ -115,7 +115,7 @@ msgstr "বন্ধ করুন (&C)"
 msgid "Invalid button '%s' specified in config file"
 msgstr "কনফিগ ফাইলে অবৈধ বাটন '%s' উল্লিখিত হয়েছে"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "কনফিগ ফাইলে কি-বাইন্ডিং সংক্রান্ত দ্বন্দ্ব"
 
@@ -124,22 +124,22 @@ msgstr "কনফিগ ফাইলে কি-বাইন্ডিং সং
 msgid "Unable to find a valid menu file '%s'"
 msgstr "বৈধ মেনু ফাইল '%s' সনাক্ত করতে ব্যর্থ"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "পাইপ-মেনু '%s'-র জন্য কমান্ড সঞ্চালন করতে ব্যর্থ: %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "পাইপ-মেনু '%s' থেকে অবৈধ ফলাফল প্রাপ্ত হয়েছে"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "অনুপস্থিত মেনু '%s' ব্যবহারের প্রচেষ্টা হয়েছে"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "অতিরিক্ত..."
 
@@ -291,7 +291,7 @@ msgstr "পর্দা %d-এ উইন্ডো পরিচালন ব্
 msgid "The WM on screen %d is not exiting"
 msgstr "পর্দা %d-র উপর চলমান উইন্ডো পরিচালন ব্যবস্থাটি বন্ধ করতে ব্যর্থ"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"
diff --git a/po/ca.po b/po/ca.po
index 64ce4437..c41a179a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-28 15:54+0200\n"
 "Last-Translator: David Majà Martínez <davidmaja@gmail.com>\n"
 "Language-Team: catalan\n"
@@ -112,7 +112,7 @@ msgstr "&Tanca"
 msgid "Invalid button '%s' specified in config file"
 msgstr "El botó especificat al fitxer de configuració '%s' no és vàlid."
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Conflicte amb la tecla vinculada en el fitxer de configuració"
 
@@ -121,23 +121,23 @@ msgstr "Conflicte amb la tecla vinculada en el fitxer de configuració"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "No s'ha pogut trobar un fitxer de menú '%s' vàlid"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr ""
 "S'ha produït un error en executar l'ordre per al menú de conducte '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "La sortida del menú de conducte '%s' no és vàlida"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "S'ha intentat accedir al menú '%s' ja que no existeix"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Més..."
 
@@ -298,7 +298,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr "El gestor de finestres de la pantalla %d no està sortint"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "escriptori %i"
diff --git a/po/cs.po b/po/cs.po
index 15d71b3f..de2f20bd 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-06-04 12:46+0200\n"
 "Last-Translator: tezlo <tezlo@gmx.net>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -115,7 +115,7 @@ msgstr "&Zavřít"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Neplatné tlačítko '%s' v konfiguračním souboru"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt klávesových zkratek v konfiguračním souboru"
 
@@ -124,23 +124,23 @@ msgstr "Konflikt klávesových zkratek v konfiguračním souboru"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Nepodařilo se najít platný menu soubor '%s'"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Nepodařilo se spustit příkaz pro pipe-menu '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Neplatný výstup z pipe-menu '%s'"
 
 # TODO: heh
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Pokus o přístup k menu '%s', ale ono neexistuje"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Víc..."
 
@@ -293,7 +293,7 @@ msgstr "Nepodařilo se získat výseč pro window manager na obrazovce %d"
 msgid "The WM on screen %d is not exiting"
 msgstr "Window manager na obrazovce %d ne a ne skončit"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "plochu %i"
diff --git a/po/de.po b/po/de.po
index b798ab56..807cd471 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-06-04 00:47+0200\n"
 "Last-Translator: Sebastian Sareyko <public@nooms.de>\n"
 "Language-Team:  <de@li.org>\n"
@@ -112,7 +112,7 @@ msgstr "&Schlie
 msgid "Invalid button '%s' specified in config file"
 msgstr "Unzulässiger Knopf '%s' in der Konfigurationsdatei angegeben"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt mit Tastenkombination in der Konfigurationsdatei"
 
@@ -121,22 +121,22 @@ msgstr "Konflikt mit Tastenkombination in der Konfigurationsdatei"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Konnte keine gültige Menü-Datei '%s' finden"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Konnte Befehl '%s' für pipe-menu nicht ausführen: %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Ungültige Ausgabe vom pipe-menu '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Das Menü '%s' wurde bei dem Versuch darauf zuzugreifen nicht gefunden"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Mehr..."
 
@@ -290,7 +290,7 @@ msgstr "Konnte die Fenstermanager auswahl auf Bildschirm %d nicht reservieren"
 msgid "The WM on screen %d is not exiting"
 msgstr "Der Fenstermanager auf Bildschirm %d beendet sich nicht"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index aad9171e..c1ae9728 100644
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openbox 3.4.1\n"
+"Project-Id-Version: openbox 3.4.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
-"PO-Revision-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
+"PO-Revision-Date: 2007-06-10 19:32-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -138,7 +138,7 @@ msgstr "&Close"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Invalid button ‘%s’ specified in config file"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Conflict with key binding in config file"
 
@@ -147,22 +147,22 @@ msgstr "Conflict with key binding in config file"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Unable to find a valid menu file ‘%s’"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Failed to execute command for pipe-menu '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Invalid output from pipe-menu ‘%s’"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Attempted to access menu ‘%s’ but it does not exist"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "More..."
 
@@ -311,7 +311,7 @@ msgstr "Could not acquire window manager selection on screen %d"
 msgid "The WM on screen %d is not exiting"
 msgstr "The WM on screen %d is not exiting"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"
diff --git a/po/en@quot.po b/po/en@quot.po
index c8a89706..daa0c94c 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openbox 3.4.1\n"
+"Project-Id-Version: openbox 3.4.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
-"PO-Revision-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
+"PO-Revision-Date: 2007-06-10 19:32-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -135,7 +135,7 @@ msgstr "&Close"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Invalid button ‘%s’ specified in config file"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Conflict with key binding in config file"
 
@@ -144,22 +144,22 @@ msgstr "Conflict with key binding in config file"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Unable to find a valid menu file ‘%s’"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Failed to execute command for pipe-menu '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Invalid output from pipe-menu ‘%s’"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Attempted to access menu ‘%s’ but it does not exist"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "More..."
 
@@ -308,7 +308,7 @@ msgstr "Could not acquire window manager selection on screen %d"
 msgid "The WM on screen %d is not exiting"
 msgstr "The WM on screen %d is not exiting"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"
diff --git a/po/es.po b/po/es.po
index d59fa1ce..a0470e72 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-22 20:48+0200\n"
 "Last-Translator:  Gustavo Varela <gustavo.varela [en] gmail [punto] com>\n"
 "Language-Team: None\n"
@@ -112,7 +112,7 @@ msgstr "&Cerrar"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Botón invalido '%s' especificado en el archivo de configuración"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Conflicto con la combinación de teclas en el archivo de configuración"
 
@@ -121,22 +121,22 @@ msgstr "Conflicto con la combinación de teclas en el archivo de configuración"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "No es posible encontrar un archivo de menú '%s' valido"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Falló al ejecutar el comando para el pipe-menu '%s': '%s'"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Salida inválida del pipe-menu '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Intentó acceder al menú '%s' pero este no existe"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Más..."
 
@@ -293,7 +293,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr "El WM en la pantalla %d no esta saliendo"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "Escritorio %i"
diff --git a/po/et.po b/po/et.po
index ce9f388d..d1b207e7 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-21 20:11+0300\n"
 "Last-Translator: Andres Järv <andresjarv@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -114,7 +114,7 @@ msgstr "S&ulge"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Vigane nupp '%s' määratletud konfiguratsioonifailis"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt kiirklahviga konfiguratsioonifailis"
 
@@ -123,22 +123,22 @@ msgstr "Konflikt kiirklahviga konfiguratsioonifailis"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Ei suudetud leida kehtivat menüüfaili '%s'"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Ei suudetud käivitada torumenüü '%s' käsku: %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Vigane väljund torumenüüst '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Üritati ligi pääseda menüüle '%s', aga seda pole olemas"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Rohkem..."
 
@@ -289,7 +289,7 @@ msgstr "Ei suuda hankida aknahaldurite loetelu ekraanil %d"
 msgid "The WM on screen %d is not exiting"
 msgstr "Aknahaldur ekraanil %d ei sulgu"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "töölaud %i"
diff --git a/po/fi.po b/po/fi.po
index abf6d45b..6f4f8f84 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-21 00:06+0200\n"
 "Last-Translator: Lauri Hakko\n"
 "Language-Team: None\n"
@@ -113,7 +113,7 @@ msgstr "&Sulje"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Virheellinen painike '%s' määritelty konfiguraatio tiedostossa"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Päällekäisiä key bindejä konfiguraatio tiedostossa"
 
@@ -122,22 +122,22 @@ msgstr "Päällekäisiä key bindejä konfiguraatio tiedostossa"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Toimivaa menu tiedostoa ei löytynyt '%s'"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Putki-menun komennon suorittaminen epäonnistui '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Virheellinen tulos putki-menusta '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Menun '%s' lukemista yritettiin mutta sitä ei ole olemassa"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Lisää..."
 
@@ -286,7 +286,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "työtila %i"
diff --git a/po/fr.po b/po/fr.po
index 983846ea..f6b44f67 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-21 00:53+0200\n"
 "Last-Translator: Cyrille Bagard <nocbos@gmail.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -113,7 +113,7 @@ msgstr "&Fermer"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Bouton indiqué dans le fichier de configuration '%s' invalide"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Conflit entre les raccourcis clavier dans le fichier de configuration"
 
@@ -122,22 +122,22 @@ msgstr "Conflit entre les raccourcis clavier dans le fichier de configuration"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Impossible de trouver un fichier de menus valide '%s'"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Echec lors de l'exécution de la commande pour un pipe-menu '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Sortie du pipe-menu invalide '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Tentative d'accès au menu '%s' qui n'existe pas"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "D'avantage..."
 
@@ -300,7 +300,7 @@ msgid "The WM on screen %d is not exiting"
 msgstr ""
 "Le gestionnaire de fenêtres sur l'écran %d n'est pas en train de quitter"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "bureau %i"
diff --git a/po/it.po b/po/it.po
index 1f3189ec..0fe36b06 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-06-04 03:06+0200\n"
 "Last-Translator: Davide Truffa <davide@catoblepa.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -111,7 +111,7 @@ msgstr "&Chiudi"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Il pulsante '%s' specificato nel file di configurazione non è valido"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr ""
 "Conflitto con la scorciatoia da tastiera specificata nel file di "
@@ -122,22 +122,22 @@ msgstr ""
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Impossibile trovare il file di menu '%s'"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Impossibile eseguire il comando nel pipe-menu '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "L'output del pipe-menu '%s' non è valido"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Tentativo di accedere al menu '%s'. Il menu non esiste"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Ancora..."
 
@@ -292,7 +292,7 @@ msgstr "Impossibile acquisire la selezione del window manager sullo schermo %d"
 msgid "The WM on screen %d is not exiting"
 msgstr "Il WM sullo schermo %d non sta terminando"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"
diff --git a/po/ja.po b/po/ja.po
index 94d0d63a..c9723c50 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-06-07 14:49+0200\n"
 "Last-Translator: Yukihiro Nakai <nakai@gnome.gr.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -114,7 +114,7 @@ msgstr "閉じる(&C)"
 msgid "Invalid button '%s' specified in config file"
 msgstr ""
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr ""
 
@@ -123,22 +123,22 @@ msgstr ""
 msgid "Unable to find a valid menu file '%s'"
 msgstr ""
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr ""
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr ""
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr ""
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr ""
 
@@ -279,7 +279,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index cad61291..81501bc3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-24 16:39+0200\n"
 "Last-Translator: Mark Pustjens <pustjens@dds.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -113,7 +113,7 @@ msgstr "&Sluiten"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Ongeldige knop '%s' gespecificeerd in het configuratie bestand"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Conflict met toetsen binding in het configuratie bestand"
 
@@ -122,22 +122,22 @@ msgstr "Conflict met toetsen binding in het configuratie bestand"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Het vinden van een geldig menu bestand '%s' is mislukt"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Uitvoeren mislukt van het commando '%s' voor pipe-menu: %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Ongeldige uitvoer van pipe-menu '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Toegang gevraagd tot menu '%s' maar het besstaat niet"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Meer..."
 
@@ -289,7 +289,7 @@ msgstr "Kon window manager selectie op scherm %d niet verkrijgen"
 msgid "The WM on screen %d is not exiting"
 msgstr "De window manager op scherm %d sluit zichzelf niet af"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "bureaublad %i"
diff --git a/po/no.po b/po/no.po
index 828cf974..0a32bf36 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-20 18:41+0200\n"
 "Last-Translator: Michael Kjelbergvik Thung <postlogic@switch-case.org>\n"
 "Language-Team: None\n"
@@ -112,7 +112,7 @@ msgstr "&Lukk"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Ugyldig tast '%s' spesifisert i konfigurasjonsfilen"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt med hurtigtastbinding i konfigurasjonsfilen"
 
@@ -121,22 +121,22 @@ msgstr "Konflikt med hurtigtastbinding i konfigurasjonsfilen"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Kan ikke finne en gyldig menyfil '%s'"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Kunne ikke kjøre kommando for pipe-meny '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Ugyldig utdata fra pipe-menyen '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Forsøkte å åpne menyen '%s', men denne finnes ikke"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Mer..."
 
@@ -285,7 +285,7 @@ msgstr "Kunne ikke hendte vindusbehandlerens markering på skjerm %d"
 msgid "The WM on screen %d is not exiting"
 msgstr "Vindusbehandleren på skjerm %d vil ikke avslutte"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "skrivebord %i"
diff --git a/po/openbox.pot b/po/openbox.pot
index 255bc496..50ba83cd 100644
--- a/po/openbox.pot
+++ b/po/openbox.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "Invalid button '%s' specified in config file"
 msgstr ""
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr ""
 
@@ -122,22 +122,22 @@ msgstr ""
 msgid "Unable to find a valid menu file '%s'"
 msgstr ""
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr ""
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr ""
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr ""
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr ""
 
@@ -278,7 +278,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index a0877418..b5759b4c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-21 18:09+0100\n"
 "Last-Translator: Paweł Rusinek <p.rusinek@gmail.com>\n"
 "Language-Team: None\n"
@@ -113,7 +113,7 @@ msgstr "Z&amknij"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Niepoprawny klawisz '%s' użyty w pliku konfiguracyjnym"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt z powiązaniem klawiaturowym w pliku konfiguracyjnym"
 
@@ -122,22 +122,22 @@ msgstr "Konflikt z powiązaniem klawiaturowym w pliku konfiguracyjnym"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Nie można odnaleźć poprawnego pliku menu '%s'"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Nie udało się wykonać polecenia dla pipe-menu '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Niepoprawny wynik z pipe-menu '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Plik menu '%s' nie istnieje"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Więcej..."
 
@@ -292,7 +292,7 @@ msgstr "Nie można uzyskać wyboru menedżera okien na ekranie %d"
 msgid "The WM on screen %d is not exiting"
 msgstr "Menedżer okien na ekranie %d nie kończy działania"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "pulpit %i"
diff --git a/po/pt.po b/po/pt.po
index 30110cad..0e2c60b2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-23 00:34+0200\n"
 "Last-Translator: Althaser <Althaser@gmail.com>\n"
 "Language-Team: None\n"
@@ -113,7 +113,7 @@ msgstr "&Fechar"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Botão inválido '%s' especificado no ficheiro de configuração"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Conflito com tecla de atalho no ficheiro de configuração"
 
@@ -122,22 +122,22 @@ msgstr "Conflito com tecla de atalho no ficheiro de configura
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Incapaz de encontrar um ficheiro de menu válido '%s'"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Falha no comando de execução para o menu de processamento '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Resultado inválido do menu de processamento '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Tentei aceder ao menu '%s' mas ele não existe"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Mais..."
 
@@ -290,7 +290,7 @@ msgstr "N
 msgid "The WM on screen %d is not exiting"
 msgstr "O gestor de janelas no ecrã %d não está fechando"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "área de trabalho %i"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c2264c4d..6cf68b49 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-22 19:35+0200\n"
 "Last-Translator: Og Maciel <ogmaciel@ubuntu.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
@@ -114,7 +114,7 @@ msgstr "&Fechar"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Botão inválido '%s' especificado no arquivo de configuração"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Conflito com associação de chave no arquivo de configuração"
 
@@ -123,22 +123,22 @@ msgstr "Conflito com associação de chave no arquivo de configuração"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Não foi possível encontrar um arquivo de menu '%s' válido"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Falha ao executar comando para menu de processamento '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Saída inválida do menu de processamento '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Tentou acessar menu '%s' mas ele não existe"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Mais.."
 
@@ -295,7 +295,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr "O gerenciador de janelas na tela %d não está saindo"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "área de trabalho %i"
diff --git a/po/ru.po b/po/ru.po
index 5285c689..e0be75aa 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-24 19:41+0100\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
@@ -113,7 +113,7 @@ msgstr "Закрыть(&C)"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Некорректная клавиша '%s' упомянута в конфигурационном файле"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Конфликт привязок клавиш в конфигурационном файле"
 
@@ -122,22 +122,22 @@ msgstr "Конфликт привязок клавиш в конфигураци
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Не могу найти корректный файл меню '%s'"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Не могу запустить команду pipe-меню '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Некорректный вывод pipe-меню '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Попытка доступа к несуществующему меню '%s'."
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Больше..."
 
@@ -290,7 +290,7 @@ msgstr "Не могу получить выбор менеджера окон н
 msgid "The WM on screen %d is not exiting"
 msgstr "Менеджер окон на экране %d не завершается"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "рабочий стол %i"
diff --git a/po/sk.po b/po/sk.po
index ba0014c5..e178dde0 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox-3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-27 13:43Central Europe Daylight Time\n"
 "Last-Translator: Jozef Riha <jose1711@gmail.com\n"
 "Language-Team: Slovak <LL@li.org>\n"
@@ -112,7 +112,7 @@ msgstr "Z&avrieť"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Neplatné tlačidlo '%s' špecifikované v konfiguračnom súbore"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt priradenie klávesov v konfiguračnom súbore"
 
@@ -121,22 +121,22 @@ msgstr "Konflikt priradenie klávesov v konfiguračnom súbore"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Nepodarilo sa nájsť platný súbor menu '%s'"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Nepodarilo sa spustiť príkaz pre pipe-menu '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Neplatný výstup z pipe-menu '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Pokus o sprístupnenie menu '%s', ale to neexistuje"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Viac..."
 
@@ -289,7 +289,7 @@ msgstr "Nepodarilo sa získať výber okenného manažéra na obrazovke %d"
 msgid "The WM on screen %d is not exiting"
 msgstr "Okenný manažér na obrazovke %d sa neukončuje"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "plocha %i"
diff --git a/po/sv.po b/po/sv.po
index 27973dc1..394fa2cf 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-22 00:29+0200\n"
 "Last-Translator: Mikael Magnusson <mikachu@icculus.org>\n"
 "Language-Team: None\n"
@@ -112,7 +112,7 @@ msgstr "St
 msgid "Invalid button '%s' specified in config file"
 msgstr "Ogiltig knapp '%s' angiven i konfigurationsfilen"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt med annan tangentbindning i konfigurationsfilen"
 
@@ -121,22 +121,22 @@ msgstr "Konflikt med annan tangentbindning i konfigurationsfilen"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Kunde inte hitta en giltig menyfil '%s'"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Misslyckades att köra kommando för pipe-menyn '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Ogiltig utdata från pipe-menyn '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Försökte öppna menyn '%s', men den finns inte"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Mer..."
 
@@ -286,7 +286,7 @@ msgstr "Kunde inte erh
 msgid "The WM on screen %d is not exiting"
 msgstr "Fönsterhanteraren på skärm %d avslutar inte"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "skrivbord %i"
diff --git a/po/vi.po b/po/vi.po
index e7626864..cde26577 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-06-07 06:50-0500\n"
 "Last-Translator: Quan Tran <qeed.quan@gmail.com>\n"
 "Language-Team: None\n"
@@ -112,7 +112,7 @@ msgstr "Đón&g"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Sai nút '%s' ở trong hình thể"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "Xung đột với chữ trói ở trong hình thể"
 
@@ -121,22 +121,22 @@ msgstr "Xung đột với chữ trói ở trong hình thể"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Không có thể tìm vững chắc thực đơn '%s'"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Không có thể chạy lệnh cho ống-thực đơn '%s': %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Vô hiệu sản xuất của ống-thực đơn '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Thử mở thực đơn '%s' nhưng mà cái đó không có"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "Thêm nữa"
 
@@ -287,7 +287,7 @@ msgstr "Không thể lấy được chương trình quản lý cửa sổ ở tr
 msgid "The WM on screen %d is not exiting"
 msgstr "Chương trình quản lý cửa sổ trên màn hình %d không đi ra"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "chỗ làm việc %i"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2f892603..5c3e58ed 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-28 13:00+0800\n"
 "Last-Translator: Xiaoyu PENG <peng.xiaoyu@gmail.com>\n"
 "Language-Team: None\n"
@@ -112,7 +112,7 @@ msgstr "关闭(&C)"
 msgid "Invalid button '%s' specified in config file"
 msgstr "配置文件中指定的按钮 '%s' 无效"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "配置文件中的组合键冲突"
 
@@ -121,22 +121,22 @@ msgstr "配置文件中的组合键冲突"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "无法找到有效的菜单文件 '%s'"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "执行管道菜单的命令 '%s' 时失败: %s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "无效的管道菜单输出 '%s'"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "尝试读取菜单 '%s'，但是它不存在"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "更多..."
 
@@ -285,7 +285,7 @@ msgstr "在屏幕 %d 无法被选为窗口管理器"
 msgid "The WM on screen %d is not exiting"
 msgstr "屏幕 %d 的窗口管理器没有退出"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "桌面 %i"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6b2d3d39..031112fc 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-09 21:06-0400\n"
+"POT-Creation-Date: 2007-06-10 19:32-0400\n"
 "PO-Revision-Date: 2007-05-23 16:22+0200\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -113,7 +113,7 @@ msgstr "關閉(&C)"
 msgid "Invalid button '%s' specified in config file"
 msgstr "在配置檔中指定的按鈕「%s」無效"
 
-#: openbox/keyboard.c:164
+#: openbox/keyboard.c:163
 msgid "Conflict with key binding in config file"
 msgstr "與配置檔中的按鍵組合衝突"
 
@@ -122,22 +122,22 @@ msgstr "與配置檔中的按鍵組合衝突"
 msgid "Unable to find a valid menu file '%s'"
 msgstr "無法找到有效的選單檔案「%s」"
 
-#: openbox/menu.c:151
+#: openbox/menu.c:168
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "執行命令於管線選單「%s」時失敗：%s"
 
-#: openbox/menu.c:168
+#: openbox/menu.c:182
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "從管線選單「%s」的輸出無效"
 
-#: openbox/menu.c:181
+#: openbox/menu.c:195
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "試圖存取選單「%s」但是它不存在"
 
-#: openbox/menu.c:342 openbox/menu.c:343
+#: openbox/menu.c:356 openbox/menu.c:357
 msgid "More..."
 msgstr "更多…"
 
@@ -286,7 +286,7 @@ msgstr "無法於螢幕 %d 獲選為視窗管理員"
 msgid "The WM on screen %d is not exiting"
 msgstr "螢幕 %d 中的視窗管理員並未離開"
 
-#: openbox/screen.c:991
+#: openbox/screen.c:993
 #, c-format
 msgid "desktop %i"
 msgstr "桌面 %i"