From ae8761404a1121025861e77c9c3c37544fc10802 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Wed, 25 Apr 2007 02:56:39 +0000
Subject: [PATCH] merge r5899-5910 from trunk

---
 openbox/client.c                    |   4 +-
 openbox/client_list_combined_menu.c |   8 +-
 openbox/client_list_menu.c          |   9 +-
 openbox/client_menu.c               |  46 +++----
 openbox/event.c                     | 112 ++++++++++++++---
 openbox/keyboard.c                  |   8 +-
 openbox/keyboard.h                  |   2 -
 openbox/menu.c                      | 102 ++++++++++++++--
 openbox/menu.h                      |  27 ++++-
 openbox/menuframe.c                 |  21 +++-
 openbox/menuframe.h                 |   3 +-
 openbox/openbox.c                   |   2 +-
 openbox/prop.c                      |   6 +-
 openbox/translate.c                 |  10 ++
 openbox/translate.h                 |   2 +
 po/ca.po                            | 175 ++++++++++++++------------
 po/de.po                            | 174 ++++++++++++++------------
 po/en@boldquot.po                   | 182 +++++++++++++++-------------
 po/en@quot.po                       | 182 +++++++++++++++-------------
 po/es.po                            | 175 ++++++++++++++------------
 po/fi.po                            | 175 ++++++++++++++------------
 po/fr.po                            | 175 ++++++++++++++------------
 po/hr.po                            | 175 ++++++++++++++------------
 po/ja.po                            | 177 +++++++++++++++------------
 po/no.po                            | 175 ++++++++++++++------------
 po/pl.po                            | 173 +++++++++++++++-----------
 po/pt.po                            | 175 ++++++++++++++------------
 po/ru.po                            | 175 ++++++++++++++------------
 po/sk.po                            | 143 +++++++++++++---------
 po/sv.po                            | 175 ++++++++++++++------------
 po/zh_TW.po                         | 177 +++++++++++++++------------
 render/font.c                       |  31 +++++
 render/render.h                     |   1 +
 33 files changed, 1893 insertions(+), 1284 deletions(-)

diff --git a/openbox/client.c b/openbox/client.c
index 51e93c17..4b8e621b 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -374,7 +374,6 @@ void client_manage(Window window)
              self->window, newx, newy, self->area.width, self->area.height);
     client_apply_startup_state(self, newx, newy);
 
-    keyboard_grab_for_client(self, TRUE);
     mouse_grab_for_client(self, TRUE);
 
     if (activate) {
@@ -490,7 +489,6 @@ void client_unmanage(ObClient *self)
         event_ignore_queued_enters();
     }
 
-    keyboard_grab_for_client(self, FALSE);
     mouse_grab_for_client(self, FALSE);
 
     /* remove the window from our save set */
@@ -1858,7 +1856,7 @@ void client_update_icons(ObClient *self)
         RrPixel32 *icon = ob_rr_theme->def_win_icon;
         gulong *data;
 
-        data = g_new(guint32, 48*48+2);
+        data = g_new(gulong, 48*48+2);
         data[0] = data[1] =  48;
         for (i = 0; i < 48*48; ++i)
             data[i+2] = (((icon[i] >> RrDefaultAlphaOffset) & 0xff) << 24) +
diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index adf3ff05..8412abe1 100644
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -70,10 +70,10 @@ static void self_update(ObMenuFrame *frame, gpointer data)
 
                 if (c->iconic) {
                     gchar *title = g_strdup_printf("(%s)", c->icon_title);
-                    e = menu_add_normal(menu, i, title, acts);
+                    e = menu_add_normal(menu, i, title, acts, FALSE);
                     g_free(title);
                 } else
-                    e = menu_add_normal(menu, i, c->title, acts);
+                    e = menu_add_normal(menu, i, c->title, acts, FALSE);
 
                 if (config_menu_client_list_icons
                         && (icon = client_icon(c, 32, 32))) {
@@ -94,7 +94,7 @@ static void self_update(ObMenuFrame *frame, gpointer data)
             act = action_from_string("Desktop", OB_USER_ACTION_MENU_SELECTION);
             act->data.desktop.desk = desktop;
             acts = g_slist_append(acts, act);
-            e = menu_add_normal(menu, 0, _("Go there..."), acts);
+            e = menu_add_normal(menu, 0, _("Go there..."), acts, TRUE);
             if (desktop == screen_desktop)
                 e->data.normal.enabled = FALSE;
         }
@@ -138,7 +138,7 @@ void client_list_combined_menu_startup(gboolean reconfig)
     if (!reconfig)
         client_add_destructor(client_dest, NULL);
 
-    combined_menu = menu_new(MENU_NAME, _("Windows"), NULL);
+    combined_menu = menu_new(MENU_NAME, _("Windows"), TRUE, NULL);
     menu_set_update_func(combined_menu, self_update);
     menu_set_execute_func(combined_menu, menu_execute);
 }
diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 5fbb3a63..208b31c1 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -75,7 +75,8 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
             act->data.desktop.desk = d->desktop;
             acts = g_slist_append(acts, act);
             e = menu_add_normal(menu, i,
-                                (c->iconic ? c->icon_title : c->title), acts);
+                                (c->iconic ? c->icon_title : c->title),
+                                acts, FALSE);
 
             if (config_menu_client_list_icons
                 && (icon = client_icon(c, 32, 32))) {
@@ -96,7 +97,7 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
         act = action_from_string("Desktop", OB_USER_ACTION_MENU_SELECTION);
         act->data.desktop.desk = d->desktop;
         acts = g_slist_append(acts, act);
-        e = menu_add_normal(menu, 0, _("Go there..."), acts);
+        e = menu_add_normal(menu, 0, _("Go there..."), acts, TRUE);
         if (d->desktop == screen_desktop)
             e->data.normal.enabled = FALSE;
     }
@@ -138,7 +139,7 @@ static void self_update(ObMenuFrame *frame, gpointer data)
             DesktopData *data = g_new(DesktopData, 1);
 
             data->desktop = i;
-            submenu = menu_new(name, screen_desktop_names[i], data);
+            submenu = menu_new(name, screen_desktop_names[i], FALSE, data);
             menu_set_update_func(submenu, desk_menu_update);
             menu_set_execute_func(submenu, desk_menu_execute);
             menu_set_destroy_func(submenu, desk_menu_destroy);
@@ -187,7 +188,7 @@ void client_list_menu_startup(gboolean reconfig)
     if (!reconfig)
         client_add_destructor(client_dest, NULL);
 
-    menu = menu_new(MENU_NAME, _("Desktops"), NULL);
+    menu = menu_new(MENU_NAME, _("Desktops"), TRUE, NULL);
     menu_set_update_func(menu, self_update);
 }
 
diff --git a/openbox/client_menu.c b/openbox/client_menu.c
index f67ea906..be767155 100644
--- a/openbox/client_menu.c
+++ b/openbox/client_menu.c
@@ -70,16 +70,14 @@ static void client_update(ObMenuFrame *frame, gpointer data)
     e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_ICONIFY;
 
     e = menu_find_entry_id(menu, CLIENT_MAXIMIZE);
-    g_free(e->data.normal.label);
-    e->data.normal.label =
-        g_strdup(frame->client->max_vert || frame->client->max_horz ?
-                 _("Restore") : _("Maximize"));
+    menu_entry_set_label(e,
+                         (frame->client->max_vert || frame->client->max_horz ?
+                          _("Restor&e") : _("Maximiz&e")), TRUE);
     e->data.normal.enabled =frame->client->functions & OB_CLIENT_FUNC_MAXIMIZE;
 
     e = menu_find_entry_id(menu, CLIENT_SHADE);
-    g_free(e->data.normal.label);
-    e->data.normal.label = g_strdup(frame->client->shaded ?
-                                    _("Roll down") : _("Roll up"));
+    menu_entry_set_label(e, (frame->client->shaded ?
+                             _("&Roll down") : _("&Roll up")), TRUE);
     e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_SHADE;
 
     e = menu_find_entry_id(menu, CLIENT_MOVE);
@@ -152,7 +150,7 @@ static void send_to_update(ObMenuFrame *frame, gpointer data)
         act->data.sendto.desk = desk;
         act->data.sendto.follow = FALSE;
         acts = g_slist_prepend(NULL, act);
-        e = menu_add_normal(menu, desk, name, acts);
+        e = menu_add_normal(menu, desk, name, acts, FALSE);
 
         if (frame->client->desktop == desk)
             e->data.normal.enabled = FALSE;
@@ -165,29 +163,31 @@ void client_menu_startup()
     ObMenu *menu;
     ObMenuEntry *e;
 
-    menu = menu_new(LAYER_MENU_NAME, _("Layer"), NULL);
+    menu = menu_new(LAYER_MENU_NAME, _("&Layer"), TRUE, NULL);
+    menu_show_all_shortcuts(menu, TRUE);
     menu_set_update_func(menu, layer_update);
 
     acts = g_slist_prepend(NULL, action_from_string
                            ("SendToTopLayer", OB_USER_ACTION_MENU_SELECTION));
-    menu_add_normal(menu, LAYER_TOP, _("Always on top"), acts);
+    menu_add_normal(menu, LAYER_TOP, _("Always on &top"), acts, TRUE);
 
     acts = g_slist_prepend(NULL, action_from_string
                            ("SendToNormalLayer",
                             OB_USER_ACTION_MENU_SELECTION));
-    menu_add_normal(menu, LAYER_NORMAL, _("Normal"), acts);
+    menu_add_normal(menu, LAYER_NORMAL, _("&Normal"), acts, TRUE);
 
     acts = g_slist_prepend(NULL, action_from_string
                            ("SendToBottomLayer",
                             OB_USER_ACTION_MENU_SELECTION));
-    menu_add_normal(menu, LAYER_BOTTOM, _("Always on bottom"),acts);
+    menu_add_normal(menu, LAYER_BOTTOM, _("Always on &bottom"),acts, TRUE);
 
 
-    menu = menu_new(SEND_TO_MENU_NAME, _("Send to desktop"), NULL);
+    menu = menu_new(SEND_TO_MENU_NAME, _("&Send to desktop"), TRUE, NULL);
     menu_set_update_func(menu, send_to_update);
 
 
-    menu = menu_new(CLIENT_MENU_NAME, _("Client menu"), NULL);
+    menu = menu_new(CLIENT_MENU_NAME, _("Client menu"), TRUE, NULL);
+    menu_show_all_shortcuts(menu, TRUE);
     menu_set_update_func(menu, client_update);
 
     menu_add_submenu(menu, CLIENT_SEND_TO, SEND_TO_MENU_NAME);
@@ -196,7 +196,7 @@ void client_menu_startup()
 
     acts = g_slist_prepend(NULL, action_from_string
                            ("Iconify", OB_USER_ACTION_MENU_SELECTION));
-    e = menu_add_normal(menu, CLIENT_ICONIFY, _("Iconify"), acts);
+    e = menu_add_normal(menu, CLIENT_ICONIFY, _("Ico&nify"), acts, TRUE);
     e->data.normal.mask = ob_rr_theme->iconify_mask;
     e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
     e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
@@ -205,7 +205,7 @@ void client_menu_startup()
     acts = g_slist_prepend(NULL, action_from_string
                            ("ToggleMaximizeFull",
                             OB_USER_ACTION_MENU_SELECTION));
-    e = menu_add_normal(menu, CLIENT_MAXIMIZE, "MAXIMIZE", acts);
+    e = menu_add_normal(menu, CLIENT_MAXIMIZE, "MAXIMIZE", acts, TRUE);
     e->data.normal.mask = ob_rr_theme->max_mask; 
     e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
     e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
@@ -213,15 +213,15 @@ void client_menu_startup()
 
     acts = g_slist_prepend(NULL, action_from_string
                            ("Raise", OB_USER_ACTION_MENU_SELECTION));
-    menu_add_normal(menu, CLIENT_RAISE, _("Raise to top"), acts);
+    menu_add_normal(menu, CLIENT_RAISE, _("Raise to &top"), acts, TRUE);
 
     acts = g_slist_prepend(NULL, action_from_string
                            ("Lower", OB_USER_ACTION_MENU_SELECTION));
-    menu_add_normal(menu, CLIENT_LOWER, _("Lower to bottom"),acts);
+    menu_add_normal(menu, CLIENT_LOWER, _("Lower to &bottom"),acts, TRUE);
 
     acts = g_slist_prepend(NULL, action_from_string
                            ("ToggleShade", OB_USER_ACTION_MENU_SELECTION));
-    e = menu_add_normal(menu, CLIENT_SHADE, "SHADE", acts);
+    e = menu_add_normal(menu, CLIENT_SHADE, "SHADE", acts, TRUE);
     e->data.normal.mask = ob_rr_theme->shade_mask;
     e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
     e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
@@ -230,23 +230,23 @@ void client_menu_startup()
     acts = g_slist_prepend(NULL, action_from_string
                            ("ToggleDecorations",
                             OB_USER_ACTION_MENU_SELECTION));
-    menu_add_normal(menu, CLIENT_DECORATE, _("Decorate"), acts);
+    menu_add_normal(menu, CLIENT_DECORATE, _("&Decorate"), acts, TRUE);
 
     menu_add_separator(menu, -1, NULL);
 
     acts = g_slist_prepend(NULL, action_from_string
                            ("Move", OB_USER_ACTION_MENU_SELECTION));
-    menu_add_normal(menu, CLIENT_MOVE, _("Move"), acts);
+    menu_add_normal(menu, CLIENT_MOVE, _("&Move"), acts, TRUE);
 
     acts = g_slist_prepend(NULL, action_from_string
                            ("Resize", OB_USER_ACTION_MENU_SELECTION));
-    menu_add_normal(menu, CLIENT_RESIZE, _("Resize"), acts);
+    menu_add_normal(menu, CLIENT_RESIZE, _("Resi&ze"), acts, TRUE);
 
     menu_add_separator(menu, -1, NULL);
 
     acts = g_slist_prepend(NULL, action_from_string
                            ("Close", OB_USER_ACTION_MENU_SELECTION));
-    e = menu_add_normal(menu, CLIENT_CLOSE, _("Close"), acts);
+    e = menu_add_normal(menu, CLIENT_CLOSE, _("&Close"), acts, TRUE);
     e->data.normal.mask = ob_rr_theme->close_mask;
     e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
     e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
diff --git a/openbox/event.c b/openbox/event.c
index c3fab03e..4a60194b 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -39,6 +39,7 @@
 #include "group.h"
 #include "stacking.h"
 #include "extensions.h"
+#include "translate.h"
 
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
@@ -51,6 +52,9 @@
 #ifdef HAVE_SIGNAL_H
 #  include <signal.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h> /* for usleep() */
+#endif
 #ifdef XKB
 #  include <X11/XKBlib.h>
 #endif
@@ -72,6 +76,7 @@ typedef struct
 
 static void event_process(const XEvent *e, gpointer data);
 static void event_handle_root(XEvent *e);
+static void event_handle_menu_shortcut(XEvent *e);
 static void event_handle_menu(XEvent *e);
 static void event_handle_dock(ObDock *s, XEvent *e);
 static void event_handle_dockapp(ObDockApp *app, XEvent *e);
@@ -589,7 +594,7 @@ static void event_process(const XEvent *ec, gpointer data)
                     mouse_event(client, e);
                 } else if (e->type == KeyPress) {
                     keyboard_event((focus_cycle_target ? focus_cycle_target :
-                                    client), e);
+                                    (client ? client : focus_client)), e);
                 }
             }
         }
@@ -1262,7 +1267,7 @@ static void event_handle_dockapp(ObDockApp *app, XEvent *e)
     }
 }
 
-ObMenuFrame* find_active_menu()
+static ObMenuFrame* find_active_menu()
 {
     GList *it;
     ObMenuFrame *ret = NULL;
@@ -1276,7 +1281,7 @@ ObMenuFrame* find_active_menu()
     return ret;
 }
 
-ObMenuFrame* find_active_or_last_menu()
+static ObMenuFrame* find_active_or_last_menu()
 {
     ObMenuFrame *ret = NULL;
 
@@ -1286,6 +1291,77 @@ ObMenuFrame* find_active_or_last_menu()
     return ret;
 }
 
+static void event_handle_menu_shortcut(XEvent *ev)
+{
+    gunichar unikey = 0;
+    ObMenuFrame *frame;
+    GList *start;
+    GList *it;
+    ObMenuEntryFrame *found = NULL;
+    guint num_found = 0;
+
+    {
+        const char *key;
+        if ((key = translate_keycode(ev->xkey.keycode)) == NULL)
+            return;
+        unikey = g_utf8_get_char_validated(key, -1);
+        if (unikey == (gunichar)-1 || unikey == (gunichar)-2 || unikey == 0)
+            return;
+    }
+
+    if ((frame = find_active_or_last_menu()) == NULL)
+        return;
+
+
+    if (!frame->entries)
+        return; /* nothing in the menu anyways */
+
+    /* start after the selected one */
+    start = frame->entries;
+    if (frame->selected) {
+        for (it = start; frame->selected != it->data; it = g_list_next(it))
+            g_assert(it != NULL); /* nothing was selected? */
+        /* next with wraparound */
+        start = g_list_next(it);
+        if (start == NULL) start = frame->entries;
+    }
+
+    it = start;
+    do {
+        ObMenuEntryFrame *e = it->data;
+        gunichar entrykey = 0;
+
+        if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL)
+            entrykey = e->entry->data.normal.shortcut;
+        else if (e->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
+            entrykey = e->entry->data.submenu.submenu->shortcut;
+
+        if (unikey == entrykey) {
+            if (found == NULL) found = e;
+            ++num_found;
+        }
+
+        /* next with wraparound */
+        it = g_list_next(it);
+        if (it == NULL) it = frame->entries;
+    } while (it != start);
+
+    if (found) {
+        if (found->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+            num_found == 1)
+        {
+            menu_frame_select(frame, found, TRUE);
+            usleep(50000);
+            menu_entry_frame_execute(found, ev->xkey.state,
+                                     ev->xkey.time);
+        } else {
+            menu_frame_select(frame, found, TRUE);
+            if (num_found == 1)
+                menu_frame_select_next(frame->child);
+        }
+    }
+}
+
 static void event_handle_menu(XEvent *ev)
 {
     ObMenuFrame *f;
@@ -1307,7 +1383,7 @@ static void event_handle_menu(XEvent *ev)
             if (e->ignore_enters)
                 --e->ignore_enters;
             else
-                menu_frame_select(e->frame, e);
+                menu_frame_select(e->frame, e, FALSE);
         }
         break;
     case LeaveNotify:
@@ -1315,28 +1391,35 @@ static void event_handle_menu(XEvent *ev)
             (f = find_active_menu()) && f->selected == e &&
             e->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU)
         {
-            menu_frame_select(e->frame, NULL);
+            menu_frame_select(e->frame, NULL, FALSE);
         }
     case MotionNotify:   
         if ((e = menu_entry_frame_under(ev->xmotion.x_root,   
                                         ev->xmotion.y_root)))
-            menu_frame_select(e->frame, e);   
+            menu_frame_select(e->frame, e, FALSE);
         break;
     case KeyPress:
         if (ev->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
-            menu_frame_hide_all();
+            if ((f = find_active_or_last_menu()) && f->parent)
+                menu_frame_select(f, NULL, TRUE);
+            else
+                menu_frame_hide_all();
         else if (ev->xkey.keycode == ob_keycode(OB_KEY_RETURN)) {
             ObMenuFrame *f;
-            if ((f = find_active_menu()))
-                menu_entry_frame_execute(f->selected, ev->xkey.state,
-                                         ev->xkey.time);
+            if ((f = find_active_menu())) {
+                if (f->child)
+                    menu_frame_select_next(f->child);
+                else
+                    menu_entry_frame_execute(f->selected, ev->xkey.state,
+                                             ev->xkey.time);
+            }
         } else if (ev->xkey.keycode == ob_keycode(OB_KEY_LEFT)) {
             ObMenuFrame *f;
-            if ((f = find_active_or_last_menu()) && f->parent)
-                menu_frame_select(f, NULL);
+            if ((f = find_active_or_last_menu()))
+                menu_frame_select(f, NULL, TRUE);
         } else if (ev->xkey.keycode == ob_keycode(OB_KEY_RIGHT)) {
             ObMenuFrame *f;
-            if ((f = find_active_or_last_menu()) && f->child)
+            if ((f = find_active_menu()) && f->child)
                 menu_frame_select_next(f->child);
         } else if (ev->xkey.keycode == ob_keycode(OB_KEY_UP)) {
             ObMenuFrame *f;
@@ -1346,7 +1429,8 @@ static void event_handle_menu(XEvent *ev)
             ObMenuFrame *f;
             if ((f = find_active_or_last_menu()))
                 menu_frame_select_next(f);
-        }
+        } else
+            event_handle_menu_shortcut(ev);
         break;
     }
 }
diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 71164ac3..6adb0aa9 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -68,18 +68,12 @@ static void grab_for_window(Window win, gboolean grab)
     }
 }
 
-void keyboard_grab_for_client(ObClient *c, gboolean grab)
-{
-    grab_for_window(c->window, grab);
-}
-
 static void grab_keys(gboolean grab)
 {
     GList *it;
 
     grab_for_window(screen_support_win, grab);
-    for (it = client_list; it; it = g_list_next(it))
-        grab_for_window(((ObClient*)it->data)->window, grab);
+    grab_for_window(RootWindow(ob_display, ob_screen), grab);
 }
 
 static gboolean chain_timeout(gpointer data)
diff --git a/openbox/keyboard.h b/openbox/keyboard.h
index 23b93684..80709fa5 100644
--- a/openbox/keyboard.h
+++ b/openbox/keyboard.h
@@ -46,6 +46,4 @@ gboolean keyboard_process_interactive_grab(const XEvent *e,
                                            struct _ObClient **client);
 gboolean keyboard_interactively_grabbed();
 
-void keyboard_grab_for_client(struct _ObClient *c, gboolean grab);
-
 #endif
diff --git a/openbox/menu.c b/openbox/menu.c
index 311701a7..7197868b 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -54,6 +54,9 @@ static void parse_menu_separator(ObParseInst *i,
                                  gpointer data);
 static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                        gpointer data);
+static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut,
+                               gchar **strippedlabel, guint *position);
+
 
 static void client_dest(ObClient *client, gpointer data)
 {
@@ -178,6 +181,60 @@ static ObMenu* menu_from_name(gchar *name)
     return self;
 }  
 
+#define VALID_SHORTCUT(c) (((c) >= '0' && (c) <= '9') || \
+                           ((c) >= 'A' && (c) <= 'Z') || \
+                           ((c) >= 'a' && (c) <= 'z'))
+
+static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut,
+                               gchar **strippedlabel, guint *position)
+{
+    gunichar shortcut = 0;
+    
+    *position = 0;
+
+    g_assert(strippedlabel != NULL);
+
+    if (label == NULL) {
+        *strippedlabel = NULL;
+    } else {
+        gchar *i;
+
+        *strippedlabel = g_strdup(label);
+
+        /* if allow_shortcut is false, then you can't use the &, instead you
+           have to just use the first valid character
+        */
+
+        i = strchr(*strippedlabel, '&');
+        if (allow_shortcut && i != NULL) {
+            /* there is an ampersand in the string */
+
+            /* you have to use a printable ascii character for shortcuts
+               don't allow space either, so you can have like "a & b"
+            */
+            if (VALID_SHORTCUT(*(i+1))) {
+                shortcut = g_unichar_tolower(g_utf8_get_char(i+1));
+                *position = i - *strippedlabel;
+
+                /* remove the & from the string */
+                for (; *i != '\0'; ++i)
+                    *i = *(i+1);
+            }
+        } else {
+            /* there is no ampersand, so find the first valid character to use
+               instead */
+
+            for (i = *strippedlabel; *i != '\0'; ++i)
+                if (VALID_SHORTCUT(*i)) {
+                    *position = i - *strippedlabel;
+                    shortcut = g_unichar_tolower(g_utf8_get_char(i));
+                    break;
+                }
+        }
+    }
+    return shortcut;
+}
+
 static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                             gpointer data)
 {
@@ -195,7 +252,7 @@ static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                     if (a)
                         acts = g_slist_append(acts, a);
                 }
-            menu_add_normal(state->parent, -1, label, acts);
+            menu_add_normal(state->parent, -1, label, acts, FALSE);
             g_free(label);
         }
     }
@@ -232,7 +289,7 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         if (!parse_attr_string("label", node, &title))
             goto parse_menu_fail;
 
-        if ((menu = menu_new(name, title, NULL))) {
+        if ((menu = menu_new(name, title, FALSE, NULL))) {
             menu->pipe_creator = state->pipe_creator;
             if (parse_attr_string("execute", node, &script)) {
                 menu->execute = parse_expand_tilde(script);
@@ -256,15 +313,18 @@ parse_menu_fail:
     g_free(script);
 }
 
-ObMenu* menu_new(const gchar *name, const gchar *title, gpointer data)
+ObMenu* menu_new(const gchar *name, const gchar *title,
+                 gboolean allow_shortcut, gpointer data)
 {
     ObMenu *self;
 
     self = g_new0(ObMenu, 1);
     self->name = g_strdup(name);
-    self->title = g_strdup(title);
     self->data = data;
 
+    self->shortcut = parse_shortcut(title, allow_shortcut, &self->title,
+                                    &self->shortcut_position);
+
     g_hash_table_replace(menu_hash, self->name, self);
 
     return self;
@@ -325,7 +385,7 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
         ObMenuEntryFrame *e = frame->entries->data;
         if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
             e->entry->data.normal.enabled)
-                menu_frame_select(frame, e);
+                menu_frame_select(frame, e, FALSE);
     }
 }
 
@@ -404,14 +464,15 @@ void menu_entry_remove(ObMenuEntry *self)
 }
 
 ObMenuEntry* menu_add_normal(ObMenu *self, gint id, const gchar *label,
-                             GSList *actions)
+                             GSList *actions, gboolean allow_shortcut)
 {
     ObMenuEntry *e;
 
     e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_NORMAL, id);
-    e->data.normal.label = g_strdup(label);
     e->data.normal.actions = actions;
 
+    menu_entry_set_label(e, label, allow_shortcut);
+
     self->entries = g_list_append(self->entries, e);
     return e;
 }
@@ -432,7 +493,8 @@ ObMenuEntry* menu_add_separator(ObMenu *self, gint id, const gchar *label)
     ObMenuEntry *e;
 
     e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SEPARATOR, id);
-    e->data.separator.label = g_strdup(label);
+
+    menu_entry_set_label(e, label, FALSE);
 
     self->entries = g_list_append(self->entries, e);
     return e;
@@ -480,3 +542,27 @@ void menu_find_submenus(ObMenu *self)
             e->data.submenu.submenu = menu_from_name(e->data.submenu.name);
     }
 }
+
+void menu_entry_set_label(ObMenuEntry *self, const gchar *label,
+                          gboolean allow_shortcut)
+{
+    switch (self->type) {
+    case OB_MENU_ENTRY_TYPE_SEPARATOR:
+        g_free(self->data.separator.label);
+        self->data.separator.label = g_strdup(label);
+        break;
+    case OB_MENU_ENTRY_TYPE_NORMAL:
+        g_free(self->data.normal.label);
+        self->data.normal.shortcut =
+            parse_shortcut(label, allow_shortcut, &self->data.normal.label,
+                           &self->data.normal.shortcut_position);
+        break;
+    default:
+        g_assert_not_reached();
+    }
+}
+
+void menu_show_all_shortcuts(ObMenu *self, gboolean show)
+{
+    self->show_all_shortcuts = show;
+}
diff --git a/openbox/menu.h b/openbox/menu.h
index 5b8810fd..2315351a 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -48,6 +48,15 @@ struct _ObMenu
     gchar *name;
     /* Displayed title */
     gchar *title;
+    /*! The shortcut key that would be used to activate this menu if it was
+      displayed as a submenu */
+    gunichar shortcut;
+    /*! The shortcut's position in the string */
+    guint shortcut_position;
+
+    /*! If the shortcut key should be shown in menu entries even when it
+      is the first character in the string */
+    gboolean show_all_shortcuts;
 
     /* Command to execute to rebuild the menu */
     gchar *execute;
@@ -75,6 +84,10 @@ typedef enum
 
 struct _ObNormalMenuEntry {
     gchar *label;
+    /*! The shortcut key that would be used to activate this menu entry */
+    gunichar shortcut;
+    /*! The shortcut's position in the string */
+    guint shortcut_position;
 
     /* state */
     gboolean enabled;
@@ -120,12 +133,17 @@ struct _ObMenuEntry
 void menu_startup(gboolean reconfig);
 void menu_shutdown(gboolean reconfig);
 
-ObMenu* menu_new(const gchar *name, const gchar *title, gpointer data);
+/*! @param allow_shortcut this should be false when the label is coming from
+           outside data like window or desktop titles */
+ObMenu* menu_new(const gchar *name, const gchar *title,
+                 gboolean allow_shortcut, gpointer data);
 void menu_free(ObMenu *menu);
 
 /* Repopulate a pipe-menu by running its command */
 void menu_pipe_execute(ObMenu *self);
 
+void menu_show_all_shortcuts(ObMenu *self, gboolean show);
+
 void menu_show(gchar *name, gint x, gint y, struct _ObClient *client);
 
 void menu_set_update_func(ObMenu *menu, ObMenuUpdateFunc func);
@@ -133,14 +151,19 @@ void menu_set_execute_func(ObMenu *menu, ObMenuExecuteFunc func);
 void menu_set_destroy_func(ObMenu *menu, ObMenuDestroyFunc func);
 
 /* functions for building menus */
+/*! @param allow_shortcut this should be false when the label is coming from
+           outside data like window or desktop titles */
 ObMenuEntry* menu_add_normal(ObMenu *menu, gint id, const gchar *label,
-                             GSList *actions);
+                             GSList *actions, gboolean allow_shortcut);
 ObMenuEntry* menu_add_submenu(ObMenu *menu, gint id, const gchar *submenu);
 ObMenuEntry* menu_add_separator(ObMenu *menu, gint id, const gchar *label);
 
 void menu_clear_entries(ObMenu *menu);
 void menu_entry_remove(ObMenuEntry *self);
 
+void menu_entry_set_label(ObMenuEntry *self, const gchar *label,
+                          gboolean allow_shortcut);
+
 ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id);
 
 /* fills in the submenus, for use when a menu is being shown */
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 4cb2083d..d92f47df 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -318,6 +318,13 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
                    self->a_text_selected :
                    self->a_text_normal));
         text_a->texture[0].data.text.string = self->entry->data.normal.label;
+        if (self->frame->menu->show_all_shortcuts ||
+            self->entry->data.normal.shortcut_position > 0)
+        {
+            text_a->texture[0].data.text.shortcut =
+                self->entry->data.normal.shortcut;
+        } else
+            text_a->texture[0].data.text.shortcut = 0;
         break;
     case OB_MENU_ENTRY_TYPE_SUBMENU:
         text_a = (self == self->frame->selected ?
@@ -325,6 +332,11 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
                   self->a_text_normal);
         sub = self->entry->data.submenu.submenu;
         text_a->texture[0].data.text.string = sub ? sub->title : "";
+        if (self->frame->menu->show_all_shortcuts ||
+            sub->shortcut_position > 0) {
+            text_a->texture[0].data.text.shortcut = sub->shortcut;
+        } else
+            text_a->texture[0].data.text.shortcut = 0;
         break;
     case OB_MENU_ENTRY_TYPE_SEPARATOR:
         if (self->entry->data.separator.label != NULL)
@@ -886,7 +898,8 @@ static gboolean menu_entry_frame_submenu_timeout(gpointer data)
     return FALSE;
 }
 
-void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry)
+void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
+                       gboolean immediate)
 {
     ObMenuEntryFrame *old = self->selected;
     ObMenuFrame *oldchild = self->child;
@@ -913,7 +926,7 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry)
         menu_entry_frame_render(self->selected);
 
         if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
-            if (config_submenu_show_delay) {
+            if (config_submenu_show_delay && !immediate) {
                 /* initiate a new submenu open request */
                 ob_main_loop_timeout_add(ob_main_loop,
                                          config_submenu_show_delay * 1000,
@@ -988,7 +1001,7 @@ void menu_frame_select_previous(ObMenuFrame *self)
             }
         }
     }
-    menu_frame_select(self, it ? it->data : NULL);
+    menu_frame_select(self, it ? it->data : NULL, TRUE);
 }
 
 void menu_frame_select_next(ObMenuFrame *self)
@@ -1014,5 +1027,5 @@ void menu_frame_select_next(ObMenuFrame *self)
             }
         }
     }
-    menu_frame_select(self, it ? it->data : NULL);
+    menu_frame_select(self, it ? it->data : NULL, TRUE);
 }
diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index 016700a7..4cd27d37 100644
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -124,7 +124,8 @@ void menu_frame_hide(ObMenuFrame *self);
 void menu_frame_hide_all();
 void menu_frame_hide_all_client(struct _ObClient *client);
 
-void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry);
+void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
+                       gboolean immediate);
 void menu_frame_select_previous(ObMenuFrame *self);
 void menu_frame_select_next(ObMenuFrame *self);
 
diff --git a/openbox/openbox.c b/openbox/openbox.c
index dac9d222..fc2e78c0 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -111,7 +111,7 @@ gint main(gint argc, gchar **argv)
     g_set_prgname(argv[0]);
 
     if (chdir(g_get_home_dir()) == -1)
-        g_message(_("Unable to change to home directory (%s): %s"),
+        g_message(_("Unable to change to home directory '%s': %s"),
                   g_get_home_dir(), g_strerror(errno));
      
     /* parse out command line args */
diff --git a/openbox/prop.c b/openbox/prop.c
index d13a0515..efb46bd4 100644
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -302,8 +302,7 @@ gboolean prop_get_string_locale(Window win, Atom prop, gchar **ret)
     gchar *s;
 
     if (get_stringlist(win, prop, &list, &nstr) && nstr) {
-        s = g_convert(list[0], strlen(list[0]), "UTF-8", "ISO-8859-1",
-                      NULL, NULL, NULL);
+        s = g_locale_to_utf8(list[0], -1, NULL, NULL, NULL);
         XFreeStringList(list);
         if (s) {
             *ret = s;
@@ -332,8 +331,7 @@ gboolean prop_get_strings_locale(Window win, Atom prop, gchar ***ret)
         (*ret)[count] = NULL; /* null terminated list */
 
         for (i = 0, it = strs; it; ++i, it = g_slist_next(it)) {
-            (*ret)[i] = g_convert(it->data, -1, "UTF-8", "ISO-8859-1",
-                                  NULL, NULL, NULL);
+            (*ret)[i] = g_locale_to_utf8(it->data, -1, NULL, NULL, NULL);
             /* make sure translation did not fail */
             if (!(*ret)[i])
                 (*ret)[i] = g_strdup("");
diff --git a/openbox/translate.c b/openbox/translate.c
index a26017e5..97066519 100644
--- a/openbox/translate.c
+++ b/openbox/translate.c
@@ -139,3 +139,13 @@ translation_fail:
     g_strfreev(parsed);
     return ret;
 }
+
+const gchar *translate_keycode(guint keycode)
+{
+    KeySym sym;
+    const gchar *ret = NULL;
+
+    if ((sym = XKeycodeToKeysym(ob_display, keycode, 0)) != NoSymbol)
+        ret = XKeysymToString(sym);
+    return g_locale_to_utf8(ret, -1, NULL, NULL, NULL);
+}
diff --git a/openbox/translate.h b/openbox/translate.h
index 8249514e..14efe73d 100644
--- a/openbox/translate.h
+++ b/openbox/translate.h
@@ -24,4 +24,6 @@
 gboolean translate_button(const gchar *str, guint *state, guint *keycode);
 gboolean translate_key(const gchar *str, guint *state, guint *keycode);
 
+/*! Give the string form of a keycode */
+const gchar *translate_keycode(guint keycode);
 #endif
diff --git a/po/ca.po b/po/ca.po
index b7e683d5..5e5c03e7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
 "PO-Revision-Date: 2004-01-25 20:41+0100\n"
 "Last-Translator: David Majà Martínez <davidmaja@gmail.com>\n"
 "Language-Team: catalan\n"
@@ -23,77 +23,93 @@ msgstr "Vés aquí..."
 msgid "Desktops"
 msgstr "Escriptoris"
 
-#: openbox/client_menu.c:76
-msgid "Restore"
-msgstr "Restaura"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Restor&e"
+msgstr "Restaur&a"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
-msgstr "Maximitza"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Maximiz&e"
+msgstr "M&aximitza"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
-msgstr "Desenrotlla"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll down"
+msgstr "Desen&rotlla"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
-msgstr "Enrotlla"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll up"
+msgstr "En&rotlla"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
 msgstr "Tots els escriptoris"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
-msgstr "Capa"
+#: openbox/client_menu.c:166
+#, fuzzy
+msgid "&Layer"
+msgstr "Ca&pa"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
-msgstr "Sempre a sobre"
+#: openbox/client_menu.c:172
+#, fuzzy
+msgid "Always on &top"
+msgstr "Sempre a so&bre"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
-msgstr "Normal"
+#: openbox/client_menu.c:177
+#, fuzzy
+msgid "&Normal"
+msgstr "&Normal"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
-msgstr "Sempre a sota"
+#: openbox/client_menu.c:182
+#, fuzzy
+msgid "Always on &bottom"
+msgstr "Sempre a so&ta"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
-msgstr "A l'escriptori"
+#: openbox/client_menu.c:185
+#, fuzzy
+msgid "&Send to desktop"
+msgstr "A l'&escriptori"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr "Menú del client"
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
-msgstr "Minimitza"
+#: openbox/client_menu.c:200
+#, fuzzy
+msgid "Ico&nify"
+msgstr "Mi&nimitza"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
-msgstr "Posa a sobre"
+#: openbox/client_menu.c:217
+#, fuzzy
+msgid "Raise to &top"
+msgstr "Posa a so&bre"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
-msgstr "Posa a sota"
+#: openbox/client_menu.c:221
+#, fuzzy
+msgid "Lower to &bottom"
+msgstr "Posa a so&ta"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
-msgstr "Decoració"
+#: openbox/client_menu.c:234
+#, fuzzy
+msgid "&Decorate"
+msgstr "&Decoració"
 
-#: openbox/client_menu.c:239
-msgid "Move"
-msgstr "Mou"
+#: openbox/client_menu.c:240
+#, fuzzy
+msgid "&Move"
+msgstr "&Mou"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
-msgstr "Redimensiona"
+#: openbox/client_menu.c:244
+#, fuzzy
+msgid "Resi&ze"
+msgstr "Redimen&siona"
 
-#: openbox/client_menu.c:249
-msgid "Close"
-msgstr "Tanca"
+#: openbox/client_menu.c:250
+#, fuzzy
+msgid "&Close"
+msgstr "Tan&ca"
 
 #: openbox/openbox.c:106
 msgid "Couldn't set locale from environment."
@@ -101,7 +117,7 @@ msgstr ""
 
 #: openbox/openbox.c:114
 #, fuzzy, c-format
-msgid "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
 msgstr "No és pot crear el directori '%s': %s"
 
 #: openbox/openbox.c:165
@@ -126,67 +142,76 @@ msgid "Copyright (c)"
 msgstr ""
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
 msgstr ""
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr ""
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 #, fuzzy
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "--sm-client-id necessita un argument\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
 msgstr ""
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr ""
+
+#: openbox/openbox.c:413
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +219,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 #, fuzzy
 msgid "--config-file requires an argument\n"
 msgstr "--sm-save-file necessita un argument\n"
diff --git a/po/de.po b/po/de.po
index d8b4a32c..0b042c2b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
 "PO-Revision-Date: 2006-06-11 10:41+0200\n"
 "Last-Translator: Sebastian Vahl <svahl@web.de>\n"
 "Language-Team:  <de@li.org>\n"
@@ -22,77 +22,92 @@ msgstr "Gehe zu..."
 msgid "Desktops"
 msgstr ""
 
-#: openbox/client_menu.c:76
-msgid "Restore"
-msgstr "Wiederherstellen"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Restor&e"
+msgstr "Wi&ederherstellen"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
-msgstr "Maximieren"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Maximiz&e"
+msgstr "Maximi&eren"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
-msgstr "Abrollen"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll down"
+msgstr "Ab&rollen"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
-msgstr "Aufrollen"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll up"
+msgstr "Auf&rollen"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
 msgstr "Alle Desktops"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
-msgstr "Fenster"
+#: openbox/client_menu.c:166
+#, fuzzy
+msgid "&Layer"
+msgstr "&Fenster"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
-msgstr "Immer im Vordergrund"
+#: openbox/client_menu.c:172
+#, fuzzy
+msgid "Always on &top"
+msgstr "Immer im &Vordergrund"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
-msgstr ""
+#: openbox/client_menu.c:177
+msgid "&Normal"
+msgstr "&Normal"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
-msgstr "Immer im Hintergrund"
+#: openbox/client_menu.c:182
+#, fuzzy
+msgid "Always on &bottom"
+msgstr "Immer im &Hintergrund"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
-msgstr "An Desktop senden"
+#: openbox/client_menu.c:185
+#, fuzzy
+msgid "&Send to desktop"
+msgstr "&An Desktop senden"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr ""
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
-msgstr "Minimieren"
+#: openbox/client_menu.c:200
+#, fuzzy
+msgid "Ico&nify"
+msgstr "Mi&nimieren"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
-msgstr "In den Vordergrund"
+#: openbox/client_menu.c:217
+#, fuzzy
+msgid "Raise to &top"
+msgstr "In den &Vordergrund"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
-msgstr "In den Hintergrund"
+#: openbox/client_menu.c:221
+#, fuzzy
+msgid "Lower to &bottom"
+msgstr "In den &Hintergrund"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
-msgstr "Dekoriere"
+#: openbox/client_menu.c:234
+#, fuzzy
+msgid "&Decorate"
+msgstr "&Dekoriere"
 
-#: openbox/client_menu.c:239
-msgid "Move"
-msgstr "Verschieben"
+#: openbox/client_menu.c:240
+#, fuzzy
+msgid "&Move"
+msgstr "Vers&chieben"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
-msgstr "Größe ändern"
+#: openbox/client_menu.c:244
+#, fuzzy
+msgid "Resi&ze"
+msgstr "&Größe ändern"
 
-#: openbox/client_menu.c:249
-msgid "Close"
-msgstr "Schließen"
+#: openbox/client_menu.c:250
+#, fuzzy
+msgid "&Close"
+msgstr "&Schließen"
 
 #: openbox/openbox.c:106
 msgid "Couldn't set locale from environment."
@@ -100,7 +115,7 @@ msgstr ""
 
 #: openbox/openbox.c:114
 #, fuzzy, c-format
-msgid "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
 msgstr "Das Verzeichnis '%s' konnte nicht angelegt werden: %s"
 
 #: openbox/openbox.c:165
@@ -125,67 +140,76 @@ msgid "Copyright (c)"
 msgstr ""
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
 msgstr ""
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr ""
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 #, fuzzy
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "--sm-client-id benötigt ein Argument\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
 msgstr ""
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr ""
+
+#: openbox/openbox.c:413
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -193,7 +217,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 #, fuzzy
 msgid "--config-file requires an argument\n"
 msgstr "--sm-save-file benötigt ein Argument\n"
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index e20d4e20..e1a36815 100644
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.4.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
-"PO-Revision-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
+"PO-Revision-Date: 2007-04-24 21:37-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -49,77 +49,77 @@ msgstr "Go there..."
 msgid "Desktops"
 msgstr "Desktops"
 
-#: openbox/client_menu.c:76
-msgid "Restore"
-msgstr "Restore"
+#: openbox/client_menu.c:75
+msgid "Restor&e"
+msgstr "Restor&e"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
-msgstr "Maximize"
+#: openbox/client_menu.c:75
+msgid "Maximiz&e"
+msgstr "Maximiz&e"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
-msgstr "Roll down"
+#: openbox/client_menu.c:80
+msgid "&Roll down"
+msgstr "&Roll down"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
-msgstr "Roll up"
+#: openbox/client_menu.c:80
+msgid "&Roll up"
+msgstr "&Roll up"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
 msgstr "All desktops"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
-msgstr "Layer"
+#: openbox/client_menu.c:166
+msgid "&Layer"
+msgstr "&Layer"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
-msgstr "Always on top"
+#: openbox/client_menu.c:172
+msgid "Always on &top"
+msgstr "Always on &top"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
-msgstr "Normal"
+#: openbox/client_menu.c:177
+msgid "&Normal"
+msgstr "&Normal"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
-msgstr "Always on bottom"
+#: openbox/client_menu.c:182
+msgid "Always on &bottom"
+msgstr "Always on &bottom"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
-msgstr "Send to desktop"
+#: openbox/client_menu.c:185
+msgid "&Send to desktop"
+msgstr "&Send to desktop"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr "Client menu"
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
-msgstr "Iconify"
+#: openbox/client_menu.c:200
+msgid "Ico&nify"
+msgstr "Ico&nify"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
-msgstr "Raise to top"
+#: openbox/client_menu.c:217
+msgid "Raise to &top"
+msgstr "Raise to &top"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
-msgstr "Lower to bottom"
+#: openbox/client_menu.c:221
+msgid "Lower to &bottom"
+msgstr "Lower to &bottom"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
-msgstr "Decorate"
+#: openbox/client_menu.c:234
+msgid "&Decorate"
+msgstr "&Decorate"
 
-#: openbox/client_menu.c:239
-msgid "Move"
-msgstr "Move"
+#: openbox/client_menu.c:240
+msgid "&Move"
+msgstr "&Move"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
-msgstr "Resize"
+#: openbox/client_menu.c:244
+msgid "Resi&ze"
+msgstr "Resi&ze"
 
-#: openbox/client_menu.c:249
-msgid "Close"
-msgstr "Close"
+#: openbox/client_menu.c:250
+msgid "&Close"
+msgstr "&Close"
 
 #: openbox/openbox.c:106
 msgid "Couldn't set locale from environment."
@@ -127,8 +127,8 @@ msgstr "Couldn't set locale from environment."
 
 #: openbox/openbox.c:114
 #, c-format
-msgid "Unable to change to home directory (%s): %s"
-msgstr "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
+msgstr "Unable to change to home directory '%s': %s"
 
 #: openbox/openbox.c:165
 msgid "X server does not support locale."
@@ -152,74 +152,84 @@ msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
-msgstr ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
+msgstr "Syntax: openbox [options]\n"
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
+"\n"
 "Options:\n"
 "\n"
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr "  --config-file FILE  Specify the file to load for the config file\n"
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr "  --sm-disable        Disable connection to session manager\n"
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "  --sm-client-id ID   Specify session management ID\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
-msgstr "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
+msgstr "  --sm-save-file FILE Specify file to load a saved session from\n"
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Replace the currently running window manager\n"
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Display this help and exit\n"
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Display the version and exit\n"
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
 msgstr ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr "  --reconfigure       Reload Openbox's configuration\n"
+
+#: openbox/openbox.c:413
+msgid ""
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+"\n"
+"Debugging options:\n"
+"\n"
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
+msgstr "  --sync              Run in synchronous mode\n"
+
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Display debugging output\n"
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
-msgstr "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
+msgstr "  --debug-focus       Display debugging output for focus handling\n"
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -230,7 +240,7 @@ msgstr ""
 "Please report bugs at %s\n"
 "\n"
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 msgid "--config-file requires an argument\n"
 msgstr "--config-file requires an argument\n"
 
diff --git a/po/en@quot.po b/po/en@quot.po
index 23903c12..72a046a8 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -29,8 +29,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.4.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
-"PO-Revision-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
+"PO-Revision-Date: 2007-04-24 21:37-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -46,77 +46,77 @@ msgstr "Go there..."
 msgid "Desktops"
 msgstr "Desktops"
 
-#: openbox/client_menu.c:76
-msgid "Restore"
-msgstr "Restore"
+#: openbox/client_menu.c:75
+msgid "Restor&e"
+msgstr "Restor&e"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
-msgstr "Maximize"
+#: openbox/client_menu.c:75
+msgid "Maximiz&e"
+msgstr "Maximiz&e"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
-msgstr "Roll down"
+#: openbox/client_menu.c:80
+msgid "&Roll down"
+msgstr "&Roll down"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
-msgstr "Roll up"
+#: openbox/client_menu.c:80
+msgid "&Roll up"
+msgstr "&Roll up"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
 msgstr "All desktops"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
-msgstr "Layer"
+#: openbox/client_menu.c:166
+msgid "&Layer"
+msgstr "&Layer"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
-msgstr "Always on top"
+#: openbox/client_menu.c:172
+msgid "Always on &top"
+msgstr "Always on &top"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
-msgstr "Normal"
+#: openbox/client_menu.c:177
+msgid "&Normal"
+msgstr "&Normal"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
-msgstr "Always on bottom"
+#: openbox/client_menu.c:182
+msgid "Always on &bottom"
+msgstr "Always on &bottom"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
-msgstr "Send to desktop"
+#: openbox/client_menu.c:185
+msgid "&Send to desktop"
+msgstr "&Send to desktop"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr "Client menu"
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
-msgstr "Iconify"
+#: openbox/client_menu.c:200
+msgid "Ico&nify"
+msgstr "Ico&nify"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
-msgstr "Raise to top"
+#: openbox/client_menu.c:217
+msgid "Raise to &top"
+msgstr "Raise to &top"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
-msgstr "Lower to bottom"
+#: openbox/client_menu.c:221
+msgid "Lower to &bottom"
+msgstr "Lower to &bottom"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
-msgstr "Decorate"
+#: openbox/client_menu.c:234
+msgid "&Decorate"
+msgstr "&Decorate"
 
-#: openbox/client_menu.c:239
-msgid "Move"
-msgstr "Move"
+#: openbox/client_menu.c:240
+msgid "&Move"
+msgstr "&Move"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
-msgstr "Resize"
+#: openbox/client_menu.c:244
+msgid "Resi&ze"
+msgstr "Resi&ze"
 
-#: openbox/client_menu.c:249
-msgid "Close"
-msgstr "Close"
+#: openbox/client_menu.c:250
+msgid "&Close"
+msgstr "&Close"
 
 #: openbox/openbox.c:106
 msgid "Couldn't set locale from environment."
@@ -124,8 +124,8 @@ msgstr "Couldn't set locale from environment."
 
 #: openbox/openbox.c:114
 #, c-format
-msgid "Unable to change to home directory (%s): %s"
-msgstr "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
+msgstr "Unable to change to home directory '%s': %s"
 
 #: openbox/openbox.c:165
 msgid "X server does not support locale."
@@ -149,74 +149,84 @@ msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
-msgstr ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
+msgstr "Syntax: openbox [options]\n"
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
+"\n"
 "Options:\n"
 "\n"
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr "  --config-file FILE  Specify the file to load for the config file\n"
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr "  --sm-disable        Disable connection to session manager\n"
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "  --sm-client-id ID   Specify session management ID\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
-msgstr "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
+msgstr "  --sm-save-file FILE Specify file to load a saved session from\n"
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Replace the currently running window manager\n"
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Display this help and exit\n"
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Display the version and exit\n"
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
 msgstr ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr "  --reconfigure       Reload Openbox's configuration\n"
+
+#: openbox/openbox.c:413
+msgid ""
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+"\n"
+"Debugging options:\n"
+"\n"
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
+msgstr "  --sync              Run in synchronous mode\n"
+
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Display debugging output\n"
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
-msgstr "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
+msgstr "  --debug-focus       Display debugging output for focus handling\n"
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -227,7 +237,7 @@ msgstr ""
 "Please report bugs at %s\n"
 "\n"
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 msgid "--config-file requires an argument\n"
 msgstr "--config-file requires an argument\n"
 
diff --git a/po/es.po b/po/es.po
index 693827ad..427bb5fa 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
 "PO-Revision-Date: 2005-03-25 09:31+0100\n"
 "Last-Translator: Miguel Calleja Gómez <mcg79@lycos.es>\n"
 "Language-Team: None\n"
@@ -23,77 +23,93 @@ msgstr "Ir ahí..."
 msgid "Desktops"
 msgstr "Escritorios"
 
-#: openbox/client_menu.c:76
-msgid "Restore"
-msgstr "Restaurar"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Restor&e"
+msgstr "Rest&aurar"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
-msgstr "Maximizar"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Maximiz&e"
+msgstr "Maximiz&ar"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
-msgstr "Desenrollar"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll down"
+msgstr "Desen&rollar"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
-msgstr "Enrollar"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll up"
+msgstr "En&rollar"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
 msgstr "Todos los escritorios"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
-msgstr "Capa"
+#: openbox/client_menu.c:166
+#, fuzzy
+msgid "&Layer"
+msgstr "Ca&pa"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
-msgstr "Siempre encima"
+#: openbox/client_menu.c:172
+#, fuzzy
+msgid "Always on &top"
+msgstr "Siempre &encima"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
-msgstr "Normal"
+#: openbox/client_menu.c:177
+#, fuzzy
+msgid "&Normal"
+msgstr "&Normal"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
-msgstr "Siempre debajo"
+#: openbox/client_menu.c:182
+#, fuzzy
+msgid "Always on &bottom"
+msgstr "Siempre &debajo"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
-msgstr "Enviar a escritorio"
+#: openbox/client_menu.c:185
+#, fuzzy
+msgid "&Send to desktop"
+msgstr "&Enviar a escritorio"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr "Menú del cliente"
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
-msgstr "Minimizar"
+#: openbox/client_menu.c:200
+#, fuzzy
+msgid "Ico&nify"
+msgstr "Mi&nimizar"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
-msgstr "Poner en primer plano"
+#: openbox/client_menu.c:217
+#, fuzzy
+msgid "Raise to &top"
+msgstr "Poner en p&rimer plano"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
-msgstr "Poner en último plano"
+#: openbox/client_menu.c:221
+#, fuzzy
+msgid "Lower to &bottom"
+msgstr "Poner en ú&ltimo plano"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
-msgstr "Decorar"
+#: openbox/client_menu.c:234
+#, fuzzy
+msgid "&Decorate"
+msgstr "&Decorar"
 
-#: openbox/client_menu.c:239
-msgid "Move"
-msgstr "Mover"
+#: openbox/client_menu.c:240
+#, fuzzy
+msgid "&Move"
+msgstr "&Mover"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
-msgstr "Redimensionar"
+#: openbox/client_menu.c:244
+#, fuzzy
+msgid "Resi&ze"
+msgstr "Redimen&sionar"
 
-#: openbox/client_menu.c:249
-msgid "Close"
-msgstr "Cerrar"
+#: openbox/client_menu.c:250
+#, fuzzy
+msgid "&Close"
+msgstr "&Cerrar"
 
 #: openbox/openbox.c:106
 msgid "Couldn't set locale from environment."
@@ -101,7 +117,7 @@ msgstr ""
 
 #: openbox/openbox.c:114
 #, fuzzy, c-format
-msgid "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
 msgstr "No se puede crear el directorio '%s': %s"
 
 #: openbox/openbox.c:165
@@ -126,67 +142,76 @@ msgid "Copyright (c)"
 msgstr ""
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
 msgstr ""
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr ""
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 #, fuzzy
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "--sm-client-id necesita un argumento\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
 msgstr ""
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr ""
+
+#: openbox/openbox.c:413
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +219,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 #, fuzzy
 msgid "--config-file requires an argument\n"
 msgstr "--sm-save-file necesita un argumento\n"
diff --git a/po/fi.po b/po/fi.po
index e0baba2c..0fe5ceae 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
 "PO-Revision-Date: 2005-03-15 21:29+0200\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@hut.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -23,77 +23,93 @@ msgstr "Näytä tämä..."
 msgid "Desktops"
 msgstr "Työtilat"
 
-#: openbox/client_menu.c:76
-msgid "Restore"
-msgstr "Palauta"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Restor&e"
+msgstr "P&alauta"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
-msgstr "Suurenna"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Maximiz&e"
+msgstr "Suurenn&a"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
-msgstr "Rullaa auki"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll down"
+msgstr "&Rullaa auki"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
-msgstr "Rullaa"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll up"
+msgstr "&Rullaa"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
 msgstr "Kaikkiin työtiloihin"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
-msgstr "Kerros"
+#: openbox/client_menu.c:166
+#, fuzzy
+msgid "&Layer"
+msgstr "K&erros"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
-msgstr "Aina päällimmäinen"
+#: openbox/client_menu.c:172
+#, fuzzy
+msgid "Always on &top"
+msgstr "Aina &päällimmäinen"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
-msgstr "Tavallinen"
+#: openbox/client_menu.c:177
+#, fuzzy
+msgid "&Normal"
+msgstr "&Tavallinen"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
-msgstr "Aina alimmainen"
+#: openbox/client_menu.c:182
+#, fuzzy
+msgid "Always on &bottom"
+msgstr "Aina &alimmainen"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
-msgstr "Siirrä työtilaan"
+#: openbox/client_menu.c:185
+#, fuzzy
+msgid "&Send to desktop"
+msgstr "Siirrä &työtilaan"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr "Ikkunan valikko"
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
-msgstr "Pienennä"
+#: openbox/client_menu.c:200
+#, fuzzy
+msgid "Ico&nify"
+msgstr "Pie&nennä"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
-msgstr "Nosta päällimmäiseksi"
+#: openbox/client_menu.c:217
+#, fuzzy
+msgid "Raise to &top"
+msgstr "Nosta &päällimmäiseksi"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
-msgstr "Laske alimmaiseksi"
+#: openbox/client_menu.c:221
+#, fuzzy
+msgid "Lower to &bottom"
+msgstr "&Laske alimmaiseksi"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
-msgstr "Piirrä/poista kehykset"
+#: openbox/client_menu.c:234
+#, fuzzy
+msgid "&Decorate"
+msgstr "Piirrä/poista &kehykset"
 
-#: openbox/client_menu.c:239
-msgid "Move"
-msgstr "Siirrä"
+#: openbox/client_menu.c:240
+#, fuzzy
+msgid "&Move"
+msgstr "S&iirrä"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
-msgstr "Muuta kokoa"
+#: openbox/client_menu.c:244
+#, fuzzy
+msgid "Resi&ze"
+msgstr "&Muuta kokoa"
 
-#: openbox/client_menu.c:249
-msgid "Close"
-msgstr "Sulje"
+#: openbox/client_menu.c:250
+#, fuzzy
+msgid "&Close"
+msgstr "&Sulje"
 
 #: openbox/openbox.c:106
 msgid "Couldn't set locale from environment."
@@ -101,7 +117,7 @@ msgstr ""
 
 #: openbox/openbox.c:114
 #, fuzzy, c-format
-msgid "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
 msgstr "Hakemiston \"%s\" luonti epäonnistui: %s"
 
 #: openbox/openbox.c:165
@@ -126,67 +142,76 @@ msgid "Copyright (c)"
 msgstr ""
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
 msgstr ""
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr ""
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 #, fuzzy
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "--sm-client-id tarvitsee parametrin\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
 msgstr ""
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr ""
+
+#: openbox/openbox.c:413
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +219,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 #, fuzzy
 msgid "--config-file requires an argument\n"
 msgstr "--sm-save-file tarvitsee parametrin\n"
diff --git a/po/fr.po b/po/fr.po
index 8c42f67d..0d66159f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
 "PO-Revision-Date: 2004-06-11 23:06+0200\n"
 "Last-Translator: Julien Louis <leonptitlouis@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -23,77 +23,93 @@ msgstr "Aller 
 msgid "Desktops"
 msgstr "Bureaux"
 
-#: openbox/client_menu.c:76
-msgid "Restore"
-msgstr "Restaurer"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Restor&e"
+msgstr "R&estaurer"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
-msgstr "Maximiser"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Maximiz&e"
+msgstr "Maximis&er"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
-msgstr "Dérouler"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll down"
+msgstr "Dé&rouler"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
-msgstr "Enrouler"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll up"
+msgstr "En&rouler"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
 msgstr "Tous les bureaux"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
-msgstr "Emplacement"
+#: openbox/client_menu.c:166
+#, fuzzy
+msgid "&Layer"
+msgstr "E&mplacement"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
-msgstr "Toujours au premier plan"
+#: openbox/client_menu.c:172
+#, fuzzy
+msgid "Always on &top"
+msgstr "Toujours au &premier plan"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
-msgstr "Normal"
+#: openbox/client_menu.c:177
+#, fuzzy
+msgid "&Normal"
+msgstr "&Normal"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
-msgstr "Toujours en arrière plan"
+#: openbox/client_menu.c:182
+#, fuzzy
+msgid "Always on &bottom"
+msgstr "Toujours en &arrière plan"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
-msgstr "Envoyer vers le bureau"
+#: openbox/client_menu.c:185
+#, fuzzy
+msgid "&Send to desktop"
+msgstr "Envoyer vers le &bureau"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr "Menu de la fenêtre"
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
-msgstr "Iconifier"
+#: openbox/client_menu.c:200
+#, fuzzy
+msgid "Ico&nify"
+msgstr "Ico&nifier"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
-msgstr "Mettre au premier plan"
+#: openbox/client_menu.c:217
+#, fuzzy
+msgid "Raise to &top"
+msgstr "Mettre au &premier plan"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
-msgstr "Mettre en arrière plan"
+#: openbox/client_menu.c:221
+#, fuzzy
+msgid "Lower to &bottom"
+msgstr "Mettre en &arrière plan"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
-msgstr "Décorer"
+#: openbox/client_menu.c:234
+#, fuzzy
+msgid "&Decorate"
+msgstr "Dé&corer"
 
-#: openbox/client_menu.c:239
-msgid "Move"
-msgstr "Déplacer"
+#: openbox/client_menu.c:240
+#, fuzzy
+msgid "&Move"
+msgstr "&Déplacer"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
-msgstr "Redimensionner"
+#: openbox/client_menu.c:244
+#, fuzzy
+msgid "Resi&ze"
+msgstr "Redimen&sionner"
 
-#: openbox/client_menu.c:249
-msgid "Close"
-msgstr "Fermer"
+#: openbox/client_menu.c:250
+#, fuzzy
+msgid "&Close"
+msgstr "&Fermer"
 
 #: openbox/openbox.c:106
 msgid "Couldn't set locale from environment."
@@ -101,7 +117,7 @@ msgstr ""
 
 #: openbox/openbox.c:114
 #, fuzzy, c-format
-msgid "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
 msgstr "Impossible de créer le répertoire '%s': %s"
 
 #: openbox/openbox.c:165
@@ -126,67 +142,76 @@ msgid "Copyright (c)"
 msgstr ""
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
 msgstr ""
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr ""
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 #, fuzzy
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "--sm-client-id requiert un argument\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
 msgstr ""
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr ""
+
+#: openbox/openbox.c:413
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +219,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 #, fuzzy
 msgid "--config-file requires an argument\n"
 msgstr "--sm-save-file requiert un argument\n"
diff --git a/po/hr.po b/po/hr.po
index b429887b..ba0ba5f2 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
 "PO-Revision-Date: 2006-09-05 16:45+0100\n"
 "Last-Translator: Daniel Radetic <drade@boobah.info>\n"
 "Language-Team: None\n"
@@ -23,77 +23,93 @@ msgstr "Odi na..."
 msgid "Desktops"
 msgstr "Radne površine"
 
-#: openbox/client_menu.c:76
-msgid "Restore"
-msgstr "Ponovno uspostavi"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Restor&e"
+msgstr "Ponovno uspostav&i"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
-msgstr "Maksimiziraj"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Maximiz&e"
+msgstr "Maks&imiziraj"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
-msgstr "Spusti dolje"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll down"
+msgstr "Sp&usti dolje"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
-msgstr "Povuci gore"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll up"
+msgstr "Pov&uci gore"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
 msgstr "Sve radne površine"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
-msgstr "Razina"
+#: openbox/client_menu.c:166
+#, fuzzy
+msgid "&Layer"
+msgstr "&Razina"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
-msgstr "Uvijek na vrhu"
+#: openbox/client_menu.c:172
+#, fuzzy
+msgid "Always on &top"
+msgstr "Uvijek na &vrhu"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
-msgstr "Normalno"
+#: openbox/client_menu.c:177
+#, fuzzy
+msgid "&Normal"
+msgstr "&Normalno"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
-msgstr "Uvijek na dnu"
+#: openbox/client_menu.c:182
+#, fuzzy
+msgid "Always on &bottom"
+msgstr "Uvijek na &dnu"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
-msgstr "Pošalji na radnu površinu"
+#: openbox/client_menu.c:185
+#, fuzzy
+msgid "&Send to desktop"
+msgstr "&Pošalji na radnu površinu"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr "Meni klijenta"
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
-msgstr "Ikonificiraj"
+#: openbox/client_menu.c:200
+#, fuzzy
+msgid "Ico&nify"
+msgstr "Iko&nificiraj"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
-msgstr "Podigni na vrh"
+#: openbox/client_menu.c:217
+#, fuzzy
+msgid "Raise to &top"
+msgstr "Podigni na &vrh"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
-msgstr "Spusti na dno"
+#: openbox/client_menu.c:221
+#, fuzzy
+msgid "Lower to &bottom"
+msgstr "Spusti na &dno"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
-msgstr "Dekoriraj"
+#: openbox/client_menu.c:234
+#, fuzzy
+msgid "&Decorate"
+msgstr "De&koriraj"
 
-#: openbox/client_menu.c:239
-msgid "Move"
-msgstr "Pomakni"
+#: openbox/client_menu.c:240
+#, fuzzy
+msgid "&Move"
+msgstr "Po&makni"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
-msgstr "Promjeni veličinu"
+#: openbox/client_menu.c:244
+#, fuzzy
+msgid "Resi&ze"
+msgstr "Prom&jeni veličinu"
 
-#: openbox/client_menu.c:249
-msgid "Close"
-msgstr "Zatvori"
+#: openbox/client_menu.c:250
+#, fuzzy
+msgid "&Close"
+msgstr "&Zatvori"
 
 #: openbox/openbox.c:106
 msgid "Couldn't set locale from environment."
@@ -101,7 +117,7 @@ msgstr ""
 
 #: openbox/openbox.c:114
 #, fuzzy, c-format
-msgid "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
 msgstr "Nemogu napraviti direktorij '%s': %s"
 
 #: openbox/openbox.c:165
@@ -126,67 +142,76 @@ msgid "Copyright (c)"
 msgstr ""
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
 msgstr ""
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr ""
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 #, fuzzy
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "--sm-client-id zahtjeva argument\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
 msgstr ""
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr ""
+
+#: openbox/openbox.c:413
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +219,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 #, fuzzy
 msgid "--config-file requires an argument\n"
 msgstr "--sm-save-file zahtjeva argument\n"
diff --git a/po/ja.po b/po/ja.po
index 99e9d08b..d290f663 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
 "PO-Revision-Date: 2003-11-20 15:00+0900\n"
 "Last-Translator: Yukihiro Nakai <nakai@gnome.gr.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -23,77 +23,93 @@ msgstr "移動する..."
 msgid "Desktops"
 msgstr "デスクトップ"
 
-#: openbox/client_menu.c:76
-msgid "Restore"
-msgstr "リストア"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Restor&e"
+msgstr "リストア(&E)"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
-msgstr "最大化"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Maximiz&e"
+msgstr "最大化(&E)"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
-msgstr "ロールダウン"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll down"
+msgstr "ロールダウン(&R)"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
-msgstr "ロールアップ"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll up"
+msgstr "ロールアップ(&R)"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
-msgstr "すべてのデスクトップ"
+msgstr "すべてのデスクトップ(&A)"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
-msgstr "レイヤー"
+#: openbox/client_menu.c:166
+#, fuzzy
+msgid "&Layer"
+msgstr "レイヤー(&L)"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
-msgstr "常に最上位にする"
+#: openbox/client_menu.c:172
+#, fuzzy
+msgid "Always on &top"
+msgstr "常に最上位にする(&T)"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
-msgstr "ノーマル"
+#: openbox/client_menu.c:177
+#, fuzzy
+msgid "&Normal"
+msgstr "ノーマル(&N)"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
-msgstr "常に最下位にする"
+#: openbox/client_menu.c:182
+#, fuzzy
+msgid "Always on &bottom"
+msgstr "常に最下位にする(&B)"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
-msgstr "デスクトップに送る"
+#: openbox/client_menu.c:185
+#, fuzzy
+msgid "&Send to desktop"
+msgstr "デスクトップに送る(&S)"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr "クライアントメニュー"
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
-msgstr "アイコン化"
+#: openbox/client_menu.c:200
+#, fuzzy
+msgid "Ico&nify"
+msgstr "アイコン化(&N)"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
-msgstr "最上位に上げる"
+#: openbox/client_menu.c:217
+#, fuzzy
+msgid "Raise to &top"
+msgstr "最上位に上げる(&T)"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
-msgstr "最下位に下げる"
+#: openbox/client_menu.c:221
+#, fuzzy
+msgid "Lower to &bottom"
+msgstr "最下位に下げる(&B)"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
-msgstr "装飾"
+#: openbox/client_menu.c:234
+#, fuzzy
+msgid "&Decorate"
+msgstr "装飾(&D)"
 
-#: openbox/client_menu.c:239
-msgid "Move"
-msgstr "移動"
+#: openbox/client_menu.c:240
+#, fuzzy
+msgid "&Move"
+msgstr "移動(&M)"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
-msgstr "リサイズ"
+#: openbox/client_menu.c:244
+#, fuzzy
+msgid "Resi&ze"
+msgstr "リサイズ(&Z)"
 
-#: openbox/client_menu.c:249
-msgid "Close"
-msgstr "閉じる"
+#: openbox/client_menu.c:250
+#, fuzzy
+msgid "&Close"
+msgstr "閉じる(&C)"
 
 #: openbox/openbox.c:106
 msgid "Couldn't set locale from environment."
@@ -101,7 +117,7 @@ msgstr ""
 
 #: openbox/openbox.c:114
 #, fuzzy, c-format
-msgid "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
 msgstr "ディレクトリ'%s'を作れません: %s"
 
 #: openbox/openbox.c:165
@@ -126,67 +142,76 @@ msgid "Copyright (c)"
 msgstr ""
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
 msgstr ""
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr ""
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 #, fuzzy
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "--sm-client-id には引数が必要です\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
 msgstr ""
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr ""
+
+#: openbox/openbox.c:413
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +219,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 #, fuzzy
 msgid "--config-file requires an argument\n"
 msgstr "--sm-save-file には引数が必要です\n"
diff --git a/po/no.po b/po/no.po
index 4530ddf5..e057f1f9 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
 "PO-Revision-Date: 2004-03-29 18:33:39+0200\n"
 "Last-Translator: Øyvind Albrigtsen\n"
 "Language-Team: None\n"
@@ -23,77 +23,93 @@ msgstr "G
 msgid "Desktops"
 msgstr "Skrivebord"
 
-#: openbox/client_menu.c:76
-msgid "Restore"
-msgstr "Tilbakestill"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Restor&e"
+msgstr "Tilbak&estill"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
-msgstr "Maximer"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Maximiz&e"
+msgstr "Maxim&er"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
-msgstr "Rull ned"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll down"
+msgstr "&Rull ned"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
-msgstr "Rull opp"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll up"
+msgstr "&Rull opp"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
 msgstr "Alle skrivebord"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
-msgstr "Lag"
+#: openbox/client_menu.c:166
+#, fuzzy
+msgid "&Layer"
+msgstr "La&g"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
-msgstr "Alltid øverst"
+#: openbox/client_menu.c:172
+#, fuzzy
+msgid "Always on &top"
+msgstr "Alltid ø&verst"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
-msgstr "Normal"
+#: openbox/client_menu.c:177
+#, fuzzy
+msgid "&Normal"
+msgstr "&Normal"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
-msgstr "Alltid nederst"
+#: openbox/client_menu.c:182
+#, fuzzy
+msgid "Always on &bottom"
+msgstr "Alltid &nederst"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
-msgstr "Send til"
+#: openbox/client_menu.c:185
+#, fuzzy
+msgid "&Send to desktop"
+msgstr "&Send til"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr "Klient meny"
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
-msgstr "Minimer"
+#: openbox/client_menu.c:200
+#, fuzzy
+msgid "Ico&nify"
+msgstr "&Minimer"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
-msgstr "Legg øverst"
+#: openbox/client_menu.c:217
+#, fuzzy
+msgid "Raise to &top"
+msgstr "Legg ø&verst"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
-msgstr "Legg nederst"
+#: openbox/client_menu.c:221
+#, fuzzy
+msgid "Lower to &bottom"
+msgstr "Legg &nederst"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
-msgstr "Dekorer"
+#: openbox/client_menu.c:234
+#, fuzzy
+msgid "&Decorate"
+msgstr "&Dekorer"
 
-#: openbox/client_menu.c:239
-msgid "Move"
-msgstr "Flytt"
+#: openbox/client_menu.c:240
+#, fuzzy
+msgid "&Move"
+msgstr "&Flytt"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
-msgstr "Endre størrelse"
+#: openbox/client_menu.c:244
+#, fuzzy
+msgid "Resi&ze"
+msgstr "Endre s&tørrelse"
 
-#: openbox/client_menu.c:249
-msgid "Close"
-msgstr "Lukk"
+#: openbox/client_menu.c:250
+#, fuzzy
+msgid "&Close"
+msgstr "&Lukk"
 
 #: openbox/openbox.c:106
 msgid "Couldn't set locale from environment."
@@ -101,7 +117,7 @@ msgstr ""
 
 #: openbox/openbox.c:114
 #, fuzzy, c-format
-msgid "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
 msgstr "Kunde ikke lage katalogen '%s': %s"
 
 #: openbox/openbox.c:165
@@ -126,67 +142,76 @@ msgid "Copyright (c)"
 msgstr ""
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
 msgstr ""
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr ""
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 #, fuzzy
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "--sm-client-id krever et argument\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
 msgstr ""
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr ""
+
+#: openbox/openbox.c:413
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +219,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 #, fuzzy
 msgid "--config-file requires an argument\n"
 msgstr "--sm-save-file krever et argument\n"
diff --git a/po/pl.po b/po/pl.po
index 64a673ca..c74aa17c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
 "PO-Revision-Date: 2004-09-07 21:17+0200\n"
 "Last-Translator: Madej <madej@afn.no-ip.org>\n"
 "Language-Team: NONE\n"
@@ -23,77 +23,93 @@ msgstr "Przejdź..."
 msgid "Desktops"
 msgstr "Pulpit"
 
-#: openbox/client_menu.c:76
-msgid "Restore"
-msgstr "Przywróć"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Restor&e"
+msgstr "Prz&ywróć"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
-msgstr "Maksymalizuj"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Maximiz&e"
+msgstr "Maks&ymalizuj"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
-msgstr "Rozwiń"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll down"
+msgstr "Ro&zwiń"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
-msgstr "Zwiń"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll up"
+msgstr "&Zwiń"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
 msgstr "Wszystkie pulpity"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
+#: openbox/client_menu.c:166
+#, fuzzy
+msgid "&Layer"
 msgstr "Warstwa"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
-msgstr "Zawsze na wierzchu"
+#: openbox/client_menu.c:172
+#, fuzzy
+msgid "Always on &top"
+msgstr "Zawsze na &wierzchu"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
-msgstr "Normalnie"
+#: openbox/client_menu.c:177
+#, fuzzy
+msgid "&Normal"
+msgstr "&Normalnie"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
-msgstr "Zawsze pod spodem"
+#: openbox/client_menu.c:182
+#, fuzzy
+msgid "Always on &bottom"
+msgstr "Zawsze pod &spodem"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
-msgstr "Wyślij na pulpit"
+#: openbox/client_menu.c:185
+#, fuzzy
+msgid "&Send to desktop"
+msgstr "Wyślij na &pulpit"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr "Menu klienta"
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
-msgstr "Minimalizuj"
+#: openbox/client_menu.c:200
+#, fuzzy
+msgid "Ico&nify"
+msgstr "Mi&nimalizuj"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
-msgstr "Wyślij na wierzch"
+#: openbox/client_menu.c:217
+#, fuzzy
+msgid "Raise to &top"
+msgstr "Wyślij na &wierzch"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
-msgstr "Wyślij na spód"
+#: openbox/client_menu.c:221
+#, fuzzy
+msgid "Lower to &bottom"
+msgstr "Wyślij na &spód"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
-msgstr "Obramówka"
+#: openbox/client_menu.c:234
+#, fuzzy
+msgid "&Decorate"
+msgstr "&Obramówka"
 
-#: openbox/client_menu.c:239
-msgid "Move"
-msgstr "Przesuń"
+#: openbox/client_menu.c:240
+#, fuzzy
+msgid "&Move"
+msgstr "Prz&esuń"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
-msgstr "Zmień rozmiar"
+#: openbox/client_menu.c:244
+#, fuzzy
+msgid "Resi&ze"
+msgstr "Zmień &rozmiar"
 
-#: openbox/client_menu.c:249
-msgid "Close"
-msgstr "Zamknij"
+#: openbox/client_menu.c:250
+#, fuzzy
+msgid "&Close"
+msgstr "Z&amknij"
 
 #: openbox/openbox.c:106
 msgid "Couldn't set locale from environment."
@@ -101,7 +117,7 @@ msgstr ""
 
 #: openbox/openbox.c:114
 #, fuzzy, c-format
-msgid "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
 msgstr "Nie mogę utworzyć katalogu '%s': %s"
 
 #: openbox/openbox.c:165
@@ -126,67 +142,76 @@ msgid "Copyright (c)"
 msgstr ""
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
 msgstr ""
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr ""
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 #, fuzzy
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "--sm-client-id wymaga argumentu\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
 msgstr ""
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr ""
+
+#: openbox/openbox.c:413
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +219,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 #, fuzzy
 msgid "--config-file requires an argument\n"
 msgstr "--sm-save-file wymaga argumentu\n"
diff --git a/po/pt.po b/po/pt.po
index 6312441f..4e67948a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
 "PO-Revision-Date: 2004-03-29 18:33:39+0200\n"
 "Last-Translator: Gonçalo Ferreira <gonsas@gmail.com>\n"
 "Language-Team: None\n"
@@ -23,77 +23,93 @@ msgstr "Ir at
 msgid "Desktops"
 msgstr "Áreas de trabalho"
 
-#: openbox/client_menu.c:76
-msgid "Restore"
-msgstr "Restaurar"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Restor&e"
+msgstr "Rest&aurar"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
-msgstr "Maximizar"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Maximiz&e"
+msgstr "M&aximizar"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
-msgstr "Desenrolar"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll down"
+msgstr "Desen&rolar"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
-msgstr "Enrolar"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll up"
+msgstr "En&rolar"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
 msgstr "Todas as áreas de trabalho"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
-msgstr "Camada"
+#: openbox/client_menu.c:166
+#, fuzzy
+msgid "&Layer"
+msgstr "&Camada"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
-msgstr "Sempre em cima"
+#: openbox/client_menu.c:172
+#, fuzzy
+msgid "Always on &top"
+msgstr "Sempre em &cima"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
-msgstr "Normal"
+#: openbox/client_menu.c:177
+#, fuzzy
+msgid "&Normal"
+msgstr "&Normal"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
-msgstr "Sempre no fundo"
+#: openbox/client_menu.c:182
+#, fuzzy
+msgid "Always on &bottom"
+msgstr "Sempre no &fundo"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
-msgstr "Enviar para área de trabalho"
+#: openbox/client_menu.c:185
+#, fuzzy
+msgid "&Send to desktop"
+msgstr "&Enviar para área de trabalho"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr "Menu de clientes"
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
-msgstr "Minimizar"
+#: openbox/client_menu.c:200
+#, fuzzy
+msgid "Ico&nify"
+msgstr "Mi&nimizar"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
-msgstr "Elevar ao topo"
+#: openbox/client_menu.c:217
+#, fuzzy
+msgid "Raise to &top"
+msgstr "Elevar ao &topo"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
-msgstr "Baixar ao fundo"
+#: openbox/client_menu.c:221
+#, fuzzy
+msgid "Lower to &bottom"
+msgstr "Baixar ao f&undo"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
-msgstr "Decorar"
+#: openbox/client_menu.c:234
+#, fuzzy
+msgid "&Decorate"
+msgstr "&Decorar"
 
-#: openbox/client_menu.c:239
-msgid "Move"
-msgstr "Mover"
+#: openbox/client_menu.c:240
+#, fuzzy
+msgid "&Move"
+msgstr "&Mover"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
-msgstr "Redimensionar"
+#: openbox/client_menu.c:244
+#, fuzzy
+msgid "Resi&ze"
+msgstr "Redimen&sionar"
 
-#: openbox/client_menu.c:249
-msgid "Close"
-msgstr "Fechar"
+#: openbox/client_menu.c:250
+#, fuzzy
+msgid "&Close"
+msgstr "&Fechar"
 
 #: openbox/openbox.c:106
 msgid "Couldn't set locale from environment."
@@ -101,7 +117,7 @@ msgstr ""
 
 #: openbox/openbox.c:114
 #, fuzzy, c-format
-msgid "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
 msgstr "Incapaz de criar o directório '%s': %s "
 
 #: openbox/openbox.c:165
@@ -126,67 +142,76 @@ msgid "Copyright (c)"
 msgstr ""
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
 msgstr ""
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr ""
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 #, fuzzy
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "--sm-client-id requer um argumento\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
 msgstr ""
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr ""
+
+#: openbox/openbox.c:413
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +219,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 #, fuzzy
 msgid "--config-file requires an argument\n"
 msgstr "--sm-save-file requer um argumento\n"
diff --git a/po/ru.po b/po/ru.po
index efc10f0f..a197fd31 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
 "PO-Revision-Date: 2004-04-23 13:00+0300\n"
 "Last-Translator: Alexey Remizov <alexey@remizov.pp.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
@@ -23,77 +23,93 @@ msgstr "Перейти..."
 msgid "Desktops"
 msgstr "Рабочие места"
 
-#: openbox/client_menu.c:76
-msgid "Restore"
-msgstr "Восстановить"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Restor&e"
+msgstr "Восстановить(&E)"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
-msgstr "Развернуть на весь экран"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Maximiz&e"
+msgstr "Развернуть на весь экран(&E)"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
-msgstr "Раскрутить"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll down"
+msgstr "Раскрутить(&R)"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
-msgstr "Скрутить"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll up"
+msgstr "Скрутить(&R)"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
 msgstr "Все рабочие места"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
-msgstr "Расположить"
+#: openbox/client_menu.c:166
+#, fuzzy
+msgid "&Layer"
+msgstr "Расположить(&L)"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
-msgstr "Всегда на переднем плане"
+#: openbox/client_menu.c:172
+#, fuzzy
+msgid "Always on &top"
+msgstr "Всегда на переднем плане(&T)"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
-msgstr "Обычно"
+#: openbox/client_menu.c:177
+#, fuzzy
+msgid "&Normal"
+msgstr "Обычно(&N)"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
-msgstr "Всегда на заднем плане"
+#: openbox/client_menu.c:182
+#, fuzzy
+msgid "Always on &bottom"
+msgstr "Всегда на заднем плане(&B)"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
-msgstr "Переместить на рабочее место"
+#: openbox/client_menu.c:185
+#, fuzzy
+msgid "&Send to desktop"
+msgstr "Переместить на рабочее место(&S)"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr "Меню клиента"
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
-msgstr "Свернуть"
+#: openbox/client_menu.c:200
+#, fuzzy
+msgid "Ico&nify"
+msgstr "Свернуть(&N)"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
-msgstr "Поднять на передний план"
+#: openbox/client_menu.c:217
+#, fuzzy
+msgid "Raise to &top"
+msgstr "Поднять на передний план(&T)"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
-msgstr "Опустить на задний план"
+#: openbox/client_menu.c:221
+#, fuzzy
+msgid "Lower to &bottom"
+msgstr "Опустить на задний план(&B)"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
-msgstr "Убрать оформление"
+#: openbox/client_menu.c:234
+#, fuzzy
+msgid "&Decorate"
+msgstr "Убрать оформление(&D)"
 
-#: openbox/client_menu.c:239
-msgid "Move"
-msgstr "Переместить"
+#: openbox/client_menu.c:240
+#, fuzzy
+msgid "&Move"
+msgstr "Переместить(&M)"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
-msgstr "Изменить размер"
+#: openbox/client_menu.c:244
+#, fuzzy
+msgid "Resi&ze"
+msgstr "Изменить размер(&Z)"
 
-#: openbox/client_menu.c:249
-msgid "Close"
-msgstr "Закрыть"
+#: openbox/client_menu.c:250
+#, fuzzy
+msgid "&Close"
+msgstr "Закрыть(&C)"
 
 #: openbox/openbox.c:106
 msgid "Couldn't set locale from environment."
@@ -101,7 +117,7 @@ msgstr ""
 
 #: openbox/openbox.c:114
 #, fuzzy, c-format
-msgid "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
 msgstr "Невозможно создать каталог '%s': %s"
 
 #: openbox/openbox.c:165
@@ -126,67 +142,76 @@ msgid "Copyright (c)"
 msgstr ""
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
 msgstr ""
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr ""
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 #, fuzzy
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "--sm-client-id требует параметр\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
 msgstr ""
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr ""
+
+#: openbox/openbox.c:413
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +219,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 #, fuzzy
 msgid "--config-file requires an argument\n"
 msgstr "--sm-save-file требует параметр\n"
diff --git a/po/sk.po b/po/sk.po
index eda5e044..31685d26 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox-3.3rc2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
 "PO-Revision-Date: 2006-08-25 00:52+0200\n"
 "Last-Translator: Jozef Riha <jose1711@gmail.com\n"
 "Language-Team: Slovak <LL@li.org>\n"
@@ -23,76 +23,92 @@ msgstr "Prejsť na..."
 msgid "Desktops"
 msgstr "Plochy"
 
-#: openbox/client_menu.c:76
-msgid "Restore"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Restor&e"
 msgstr "Obnoviť"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Maximiz&e"
 msgstr "Maximalizovať"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll down"
 msgstr "Rozvinúť"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll up"
 msgstr "Zvinúť"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
 msgstr "VÅ¡etky plochy"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
+#: openbox/client_menu.c:166
+#, fuzzy
+msgid "&Layer"
 msgstr "Vrstva"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
+#: openbox/client_menu.c:172
+#, fuzzy
+msgid "Always on &top"
 msgstr "Vždy navrchu"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
+#: openbox/client_menu.c:177
+#, fuzzy
+msgid "&Normal"
 msgstr "Normálna"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
+#: openbox/client_menu.c:182
+#, fuzzy
+msgid "Always on &bottom"
 msgstr "Vždy dole"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
+#: openbox/client_menu.c:185
+#, fuzzy
+msgid "&Send to desktop"
 msgstr "Poslať na plochu"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr "Menu klienta"
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
+#: openbox/client_menu.c:200
+#, fuzzy
+msgid "Ico&nify"
 msgstr "Do ikony"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
+#: openbox/client_menu.c:217
+#, fuzzy
+msgid "Raise to &top"
 msgstr "Presunúť navrch"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
+#: openbox/client_menu.c:221
+#, fuzzy
+msgid "Lower to &bottom"
 msgstr "Presunúť naspodok"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
+#: openbox/client_menu.c:234
+#, fuzzy
+msgid "&Decorate"
 msgstr "Dekorácia"
 
-#: openbox/client_menu.c:239
-msgid "Move"
+#: openbox/client_menu.c:240
+#, fuzzy
+msgid "&Move"
 msgstr "Presunúť"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
+#: openbox/client_menu.c:244
+#, fuzzy
+msgid "Resi&ze"
 msgstr "Zmena veľkosti"
 
-#: openbox/client_menu.c:249
-msgid "Close"
+#: openbox/client_menu.c:250
+#, fuzzy
+msgid "&Close"
 msgstr "Zavrieť"
 
 #: openbox/openbox.c:106
@@ -101,7 +117,7 @@ msgstr ""
 
 #: openbox/openbox.c:114
 #, fuzzy, c-format
-msgid "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
 msgstr "Nebolo možné vytvoriť adresár '%s': %s"
 
 #: openbox/openbox.c:165
@@ -126,67 +142,76 @@ msgid "Copyright (c)"
 msgstr ""
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
 msgstr ""
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr ""
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 #, fuzzy
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "--sm-client-id vyžaduje parameter\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
 msgstr ""
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr ""
+
+#: openbox/openbox.c:413
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +219,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 #, fuzzy
 msgid "--config-file requires an argument\n"
 msgstr "--sm-save-file vyžaduje parameter\n"
diff --git a/po/sv.po b/po/sv.po
index d15efc88..a152e354 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
 "PO-Revision-Date: 2004-03-29 18:33:39+0200\n"
 "Last-Translator: Mikael Magnusson <mikachu@icculus.org>\n"
 "Language-Team: None\n"
@@ -23,77 +23,93 @@ msgstr "G
 msgid "Desktops"
 msgstr "Skrivbord"
 
-#: openbox/client_menu.c:76
-msgid "Restore"
-msgstr "Återställ"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Restor&e"
+msgstr "Åt&erställ"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
-msgstr "Maximera"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Maximiz&e"
+msgstr "Maxim&era"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
-msgstr "Rulla ner"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll down"
+msgstr "&Rulla ner"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
-msgstr "Rulla upp"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll up"
+msgstr "&Rulla upp"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
 msgstr "Alla skrivbord"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
-msgstr "Lager"
+#: openbox/client_menu.c:166
+#, fuzzy
+msgid "&Layer"
+msgstr "&Lager"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
-msgstr "Alltid överst"
+#: openbox/client_menu.c:172
+#, fuzzy
+msgid "Always on &top"
+msgstr "Alltid ö&verst"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
-msgstr "Normal"
+#: openbox/client_menu.c:177
+#, fuzzy
+msgid "&Normal"
+msgstr "&Normal"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
-msgstr "Alltid underst"
+#: openbox/client_menu.c:182
+#, fuzzy
+msgid "Always on &bottom"
+msgstr "Alltid &underst"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
-msgstr "Skicka till"
+#: openbox/client_menu.c:185
+#, fuzzy
+msgid "&Send to desktop"
+msgstr "&Skicka till"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr "Klientmeny"
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
-msgstr "Minimera"
+#: openbox/client_menu.c:200
+#, fuzzy
+msgid "Ico&nify"
+msgstr "Mi&nimera"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
-msgstr "Lägg överst"
+#: openbox/client_menu.c:217
+#, fuzzy
+msgid "Raise to &top"
+msgstr "Lägg ö&verst"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
-msgstr "Lägg underst"
+#: openbox/client_menu.c:221
+#, fuzzy
+msgid "Lower to &bottom"
+msgstr "Lägg &underst"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
-msgstr "Dekorera"
+#: openbox/client_menu.c:234
+#, fuzzy
+msgid "&Decorate"
+msgstr "&Dekorera"
 
-#: openbox/client_menu.c:239
-msgid "Move"
-msgstr "Flytta"
+#: openbox/client_menu.c:240
+#, fuzzy
+msgid "&Move"
+msgstr "&Flytta"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
-msgstr "Ändra storlek"
+#: openbox/client_menu.c:244
+#, fuzzy
+msgid "Resi&ze"
+msgstr "Ändra s&torlek"
 
-#: openbox/client_menu.c:249
-msgid "Close"
-msgstr "Stäng"
+#: openbox/client_menu.c:250
+#, fuzzy
+msgid "&Close"
+msgstr "Stän&g"
 
 #: openbox/openbox.c:106
 msgid "Couldn't set locale from environment."
@@ -101,7 +117,7 @@ msgstr ""
 
 #: openbox/openbox.c:114
 #, fuzzy, c-format
-msgid "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
 msgstr "Kunde inte skapa katalogen '%s': %s"
 
 #: openbox/openbox.c:165
@@ -126,67 +142,76 @@ msgid "Copyright (c)"
 msgstr ""
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
 msgstr ""
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr ""
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 #, fuzzy
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "--sm-client-id kräver ett argument\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
 msgstr ""
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr ""
+
+#: openbox/openbox.c:413
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +219,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 #, fuzzy
 msgid "--config-file requires an argument\n"
 msgstr "--sm-save-file kräver ett argument\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 46a083fc..14af4740 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.3rc2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-04-24 11:39-0400\n"
+"POT-Creation-Date: 2007-04-24 21:37-0400\n"
 "PO-Revision-Date: 2006-03-01 12:00+0800\n"
 "Last-Translator: Wei-Lun Chao <william.chao@ossii.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -24,77 +24,93 @@ msgstr "到那裡去..."
 msgid "Desktops"
 msgstr "桌面"
 
-#: openbox/client_menu.c:76
-msgid "Restore"
-msgstr "還原"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Restor&e"
+msgstr "還原(&E)"
 
-#: openbox/client_menu.c:76
-msgid "Maximize"
-msgstr "最大化"
+#: openbox/client_menu.c:75
+#, fuzzy
+msgid "Maximiz&e"
+msgstr "最大化(&E)"
 
-#: openbox/client_menu.c:82
-msgid "Roll down"
-msgstr "向下捲動"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll down"
+msgstr "向下捲動(&R)"
 
-#: openbox/client_menu.c:82
-msgid "Roll up"
-msgstr "向上捲動"
+#: openbox/client_menu.c:80
+#, fuzzy
+msgid "&Roll up"
+msgstr "向上捲動(&R)"
 
-#: openbox/client_menu.c:144
+#: openbox/client_menu.c:142
 msgid "All desktops"
-msgstr "所有桌面"
+msgstr "所有桌面(&A)"
 
-#: openbox/client_menu.c:168
-msgid "Layer"
-msgstr "圖層"
+#: openbox/client_menu.c:166
+#, fuzzy
+msgid "&Layer"
+msgstr "圖層(&L)"
 
-#: openbox/client_menu.c:173
-msgid "Always on top"
-msgstr "最上層"
+#: openbox/client_menu.c:172
+#, fuzzy
+msgid "Always on &top"
+msgstr "最上層(&T)"
 
-#: openbox/client_menu.c:178
-msgid "Normal"
-msgstr "一般"
+#: openbox/client_menu.c:177
+#, fuzzy
+msgid "&Normal"
+msgstr "一般(&N)"
 
-#: openbox/client_menu.c:183
-msgid "Always on bottom"
-msgstr "最下層"
+#: openbox/client_menu.c:182
+#, fuzzy
+msgid "Always on &bottom"
+msgstr "最下層(&B)"
 
-#: openbox/client_menu.c:186
-msgid "Send to desktop"
-msgstr "傳送到桌面"
+#: openbox/client_menu.c:185
+#, fuzzy
+msgid "&Send to desktop"
+msgstr "傳送到桌面(&S)"
 
 #: openbox/client_menu.c:190
 msgid "Client menu"
 msgstr "客戶端選單"
 
-#: openbox/client_menu.c:199
-msgid "Iconify"
-msgstr "最小化"
+#: openbox/client_menu.c:200
+#, fuzzy
+msgid "Ico&nify"
+msgstr "最小化(&N)"
 
-#: openbox/client_menu.c:216
-msgid "Raise to top"
-msgstr "提到最上層"
+#: openbox/client_menu.c:217
+#, fuzzy
+msgid "Raise to &top"
+msgstr "提到最上層(&T)"
 
-#: openbox/client_menu.c:220
-msgid "Lower to bottom"
-msgstr "降到最下層"
+#: openbox/client_menu.c:221
+#, fuzzy
+msgid "Lower to &bottom"
+msgstr "降到最下層(&B)"
 
-#: openbox/client_menu.c:233
-msgid "Decorate"
-msgstr "裝飾"
+#: openbox/client_menu.c:234
+#, fuzzy
+msgid "&Decorate"
+msgstr "裝飾(&D)"
 
-#: openbox/client_menu.c:239
-msgid "Move"
-msgstr "移動"
+#: openbox/client_menu.c:240
+#, fuzzy
+msgid "&Move"
+msgstr "移動(&M)"
 
-#: openbox/client_menu.c:243
-msgid "Resize"
-msgstr "重新調整大小"
+#: openbox/client_menu.c:244
+#, fuzzy
+msgid "Resi&ze"
+msgstr "重新調整大小(&Z)"
 
-#: openbox/client_menu.c:249
-msgid "Close"
-msgstr "關閉"
+#: openbox/client_menu.c:250
+#, fuzzy
+msgid "&Close"
+msgstr "關閉(&C)"
 
 #: openbox/openbox.c:106
 msgid "Couldn't set locale from environment."
@@ -102,7 +118,7 @@ msgstr ""
 
 #: openbox/openbox.c:114
 #, fuzzy, c-format
-msgid "Unable to change to home directory (%s): %s"
+msgid "Unable to change to home directory '%s': %s"
 msgstr "無法製作目錄 '%s': %s"
 
 #: openbox/openbox.c:165
@@ -127,67 +143,76 @@ msgid "Copyright (c)"
 msgstr ""
 
 #: openbox/openbox.c:400
-msgid ""
-"Syntax: openbox [options]\n"
-"\n"
+msgid "Syntax: openbox [options]\n"
 msgstr ""
 
 #: openbox/openbox.c:401
 msgid ""
+"\n"
 "Options:\n"
 "\n"
 msgstr ""
 
 #: openbox/openbox.c:402
-msgid ""
-"  --reconfigure       Tell the currently running instance of Openbox to\n"
-"                      reconfigure (and then exit immediately)\n"
-msgstr ""
-
-#: openbox/openbox.c:406
 msgid "  --config-file FILE  Specify the file to load for the config file\n"
 msgstr ""
 
-#: openbox/openbox.c:409
+#: openbox/openbox.c:404
 msgid "  --sm-disable        Disable connection to session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:411
+#: openbox/openbox.c:405
 #, fuzzy
 msgid "  --sm-client-id ID   Specify session management ID\n"
 msgstr "--sm-client-id 要求引數\n"
 
-#: openbox/openbox.c:412
-msgid "  --sm-save-file FILE Specify file to load a saved sessionfrom\n"
+#: openbox/openbox.c:406
+msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
 msgstr ""
 
-#: openbox/openbox.c:415
+#: openbox/openbox.c:408
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:417
+#: openbox/openbox.c:409
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:418
+#: openbox/openbox.c:410
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:419
+#: openbox/openbox.c:411
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:412
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr ""
+
+#: openbox/openbox.c:413
 msgid ""
-"  --sync              Run in synchronous mode (this is slow and meant for\n"
-"                      debugging X routines)\n"
+"\n"
+"Debugging options:\n"
+"\n"
+msgstr ""
+
+#: openbox/openbox.c:414
+msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:422
+#: openbox/openbox.c:415
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:423
-msgid "  --debug-focus       Display debugging output\n"
+#: openbox/openbox.c:416
+msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:424
+#: openbox/openbox.c:417
 #, c-format
 msgid ""
 "\n"
@@ -195,7 +220,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:448
 #, fuzzy
 msgid "--config-file requires an argument\n"
 msgstr "--sm-save-file 要求引數\n"
diff --git a/render/font.c b/render/font.c
index 266a0086..bd4dcfc2 100644
--- a/render/font.c
+++ b/render/font.c
@@ -175,6 +175,7 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
     XftColor c;
     gint mw;
     PangoRectangle rect;
+    PangoAttrList* attrs = NULL;
 
     /* center the text vertically
        We do this centering based on the 'baseline' since different fonts have
@@ -188,9 +189,33 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
     w = area->width - 4;
     h = area->height;
 
+    /* * * set up the layout * * */
+
+    if (t->shortcut) {
+        gchar *i;
+        gchar *lowertext;
+
+        lowertext = g_utf8_strdown(t->string, -1);
+        i = g_utf8_strchr(lowertext, -1, t->shortcut);
+        if (i != NULL) {
+            PangoAttribute *a;
+
+            a = pango_attr_underline_new(PANGO_UNDERLINE_LOW);
+            a->start_index = i - lowertext;
+            a->end_index = i - lowertext +
+                g_unichar_to_utf8(t->shortcut, NULL);
+
+            attrs = pango_attr_list_new();
+            pango_attr_list_insert(attrs, a);
+        }
+        g_free(lowertext);
+    }
+
     pango_layout_set_text(t->font->layout, t->string, -1);
     pango_layout_set_width(t->font->layout, w * PANGO_SCALE);
 
+    /* * * end of setting up the layout * * */
+
     pango_layout_get_pixel_extents(t->font->layout, NULL, &rect);
     mw = rect.width;
 
@@ -213,6 +238,9 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
         c.color.blue = t->shadow_color->b | t->shadow_color->b << 8;
         c.color.alpha = 0xffff * t->shadow_alpha / 255;
         c.pixel = t->shadow_color->pixel;
+
+        pango_layout_set_attributes(t->font->layout, NULL);
+
         /* see below... */
         pango_xft_render_layout_line
             (d, &c, pango_layout_get_line(t->font->layout, 0),
@@ -226,6 +254,9 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
     c.color.alpha = 0xff | 0xff << 8; /* fully opaque text */
     c.pixel = t->color->pixel;
 
+    pango_layout_set_attributes(t->font->layout, attrs);
+    if (attrs != NULL) pango_attr_list_unref(attrs);
+
     /* layout_line() uses y to specify the baseline
        The line doesn't need to be freed, it's a part of the layout */
     pango_xft_render_layout_line
diff --git a/render/render.h b/render/render.h
index 7beef9c9..26de9e48 100644
--- a/render/render.h
+++ b/render/render.h
@@ -126,6 +126,7 @@ struct _RrTextureText {
     gint shadow_offset_y;
     RrColor *shadow_color;
     gchar shadow_alpha;
+    gunichar shortcut; /*!< Underline this character */
 };
 
 struct _RrPixmapMask {
-- 
2.34.1