diff --git a/openbox/actions.c b/openbox/actions.c
index cfe0bdde..75d4af05 100644
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -275,12 +275,12 @@ void actions_run_acts(GSList *acts,
}
}
-gboolean actions_interactive_act_running()
+gboolean actions_interactive_act_running(void)
{
return interactive_act != NULL;
}
-void actions_interactive_cancel_act()
+void actions_interactive_cancel_act(void)
{
if (interactive_act) {
interactive_act->def->i_cancel(interactive_act->options);
@@ -306,7 +306,7 @@ static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state)
return FALSE;
}
-static void actions_interactive_end_act()
+static void actions_interactive_end_act(void)
{
if (interactive_act) {
ungrab_keyboard();
diff --git a/openbox/actions/addremovedesktop.c b/openbox/actions/addremovedesktop.c
index c8904d3c..8125b9bb 100644
--- a/openbox/actions/addremovedesktop.c
+++ b/openbox/actions/addremovedesktop.c
@@ -14,7 +14,7 @@ static gpointer setup_remove_func(ObParseInst *i,
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_addremovedesktop_startup()
+void action_addremovedesktop_startup(void)
{
actions_register("AddDesktop",
setup_add_func,
diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index 06858c05..47141ac6 100644
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@ -1,6 +1,6 @@
#include "all.h"
-void action_all_startup()
+void action_all_startup(void)
{
action_execute_startup();
action_debug_startup();
diff --git a/openbox/actions/breakchroot.c b/openbox/actions/breakchroot.c
index bfdbf16c..9804091b 100644
--- a/openbox/actions/breakchroot.c
+++ b/openbox/actions/breakchroot.c
@@ -3,7 +3,7 @@
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_breakchroot_startup()
+void action_breakchroot_startup(void)
{
actions_register("BreakChroot",
NULL, NULL,
diff --git a/openbox/actions/close.c b/openbox/actions/close.c
index 37260e13..ab75e05d 100644
--- a/openbox/actions/close.c
+++ b/openbox/actions/close.c
@@ -3,7 +3,7 @@
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_close_startup()
+void action_close_startup(void)
{
actions_register("Close",
NULL, NULL,
diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c
index 7b4bd11e..965ac993 100644
--- a/openbox/actions/cyclewindows.c
+++ b/openbox/actions/cyclewindows.c
@@ -31,7 +31,7 @@ static void i_cancel_func(gpointer options);
static void end_cycle(gboolean cancel, guint state, Options *o);
-void action_cyclewindows_startup()
+void action_cyclewindows_startup(void)
{
actions_register("NextWindow", setup_forward_func, free_func,
run_func, i_input_func, i_cancel_func);
diff --git a/openbox/actions/debug.c b/openbox/actions/debug.c
index bbc9cca2..f71b685d 100644
--- a/openbox/actions/debug.c
+++ b/openbox/actions/debug.c
@@ -9,7 +9,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_debug_startup()
+void action_debug_startup(void)
{
actions_register("Debug",
setup_func,
diff --git a/openbox/actions/decorations.c b/openbox/actions/decorations.c
index bee25f3e..e85fb8ef 100644
--- a/openbox/actions/decorations.c
+++ b/openbox/actions/decorations.c
@@ -5,7 +5,7 @@ static gboolean run_func_on(ObActionsData *data, gpointer options);
static gboolean run_func_off(ObActionsData *data, gpointer options);
static gboolean run_func_toggle(ObActionsData *data, gpointer options);
-void action_decorations_startup()
+void action_decorations_startup(void)
{
actions_register("Decorate", NULL, NULL, run_func_on, NULL, NULL);
actions_register("Undecorate", NULL, NULL, run_func_off, NULL, NULL);
diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 75949be2..69275252 100644
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -32,7 +32,7 @@ static gpointer setup_send_func(ObParseInst *i, xmlDocPtr doc,
xmlNodePtr node);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_desktop_startup()
+void action_desktop_startup(void)
{
actions_register("GoToDesktop", setup_go_func, g_free, run_func,
NULL, NULL);
diff --git a/openbox/actions/directionalwindows.c b/openbox/actions/directionalwindows.c
index 884ebcb6..707659eb 100644
--- a/openbox/actions/directionalwindows.c
+++ b/openbox/actions/directionalwindows.c
@@ -31,7 +31,7 @@ static void i_cancel_func(gpointer options);
static void end_cycle(gboolean cancel, guint state, Options *o);
-void action_directionalwindows_startup()
+void action_directionalwindows_startup(void)
{
actions_register("DirectionalCycleWindows", setup_cycle_func, free_func,
run_func, i_input_func, i_cancel_func);
diff --git a/openbox/actions/dockautohide.c b/openbox/actions/dockautohide.c
index 9e035b81..5e5382d4 100644
--- a/openbox/actions/dockautohide.c
+++ b/openbox/actions/dockautohide.c
@@ -4,7 +4,7 @@
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_dockautohide_startup()
+void action_dockautohide_startup(void)
{
actions_register("ToggleDockAutoHide",
NULL, NULL,
diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
index caf1347b..02de0154 100644
--- a/openbox/actions/execute.c
+++ b/openbox/actions/execute.c
@@ -23,7 +23,7 @@ static gboolean i_input_func(guint initial_state,
static void i_cancel_func(gpointer options);
*/
-void action_execute_startup()
+void action_execute_startup(void)
{
actions_register("Execute",
setup_func,
diff --git a/openbox/actions/exit.c b/openbox/actions/exit.c
index 68b5cef4..662c984a 100644
--- a/openbox/actions/exit.c
+++ b/openbox/actions/exit.c
@@ -3,7 +3,7 @@
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_exit_startup()
+void action_exit_startup(void)
{
actions_register("Exit",
NULL, NULL,
diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c
index ea7a6a2c..67c1479f 100644
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@ -11,7 +11,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_focus_startup()
+void action_focus_startup(void)
{
actions_register("Focus",
setup_func,
diff --git a/openbox/actions/focustobottom.c b/openbox/actions/focustobottom.c
index 74d48e33..49c945b9 100644
--- a/openbox/actions/focustobottom.c
+++ b/openbox/actions/focustobottom.c
@@ -3,7 +3,7 @@
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_focustobottom_startup()
+void action_focustobottom_startup(void)
{
actions_register("FocusToBottom", NULL, NULL, run_func, NULL, NULL);
}
diff --git a/openbox/actions/fullscreen.c b/openbox/actions/fullscreen.c
index 647a78bc..7579b95d 100644
--- a/openbox/actions/fullscreen.c
+++ b/openbox/actions/fullscreen.c
@@ -3,7 +3,7 @@
static gboolean run_func_toggle(ObActionsData *data, gpointer options);
-void action_fullscreen_startup()
+void action_fullscreen_startup(void)
{
actions_register("ToggleFullscreen", NULL, NULL, run_func_toggle,
NULL, NULL);
diff --git a/openbox/actions/growtoedge.c b/openbox/actions/growtoedge.c
index 44e52872..630ead10 100644
--- a/openbox/actions/growtoedge.c
+++ b/openbox/actions/growtoedge.c
@@ -15,7 +15,7 @@ static gpointer setup_shrink_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_growtoedge_startup()
+void action_growtoedge_startup(void)
{
actions_register("GrowToEdge",
setup_func,
diff --git a/openbox/actions/iconify.c b/openbox/actions/iconify.c
index b82684ea..6f14a2e0 100644
--- a/openbox/actions/iconify.c
+++ b/openbox/actions/iconify.c
@@ -3,7 +3,7 @@
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_iconify_startup()
+void action_iconify_startup(void)
{
actions_register("Iconify",
NULL, NULL,
diff --git a/openbox/actions/if.c b/openbox/actions/if.c
index 25d899c1..a35c61fc 100644
--- a/openbox/actions/if.c
+++ b/openbox/actions/if.c
@@ -27,7 +27,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_if_startup()
+void action_if_startup(void)
{
actions_register("If",
setup_func,
diff --git a/openbox/actions/kill.c b/openbox/actions/kill.c
index 5e14cb7c..68244407 100644
--- a/openbox/actions/kill.c
+++ b/openbox/actions/kill.c
@@ -3,7 +3,7 @@
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_kill_startup()
+void action_kill_startup(void)
{
actions_register("Kill",
NULL, NULL,
diff --git a/openbox/actions/layer.c b/openbox/actions/layer.c
index 5f0d6ce6..92fa4806 100644
--- a/openbox/actions/layer.c
+++ b/openbox/actions/layer.c
@@ -13,7 +13,7 @@ static gpointer setup_func_send(ObParseInst *i, xmlDocPtr doc,
xmlNodePtr node);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_layer_startup()
+void action_layer_startup(void)
{
actions_register("ToggleAlwaysOnTop", setup_func_top, g_free,
run_func, NULL, NULL);
diff --git a/openbox/actions/lower.c b/openbox/actions/lower.c
index 1abf5903..3a214ea7 100644
--- a/openbox/actions/lower.c
+++ b/openbox/actions/lower.c
@@ -3,7 +3,7 @@
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_lower_startup()
+void action_lower_startup(void)
{
actions_register("Lower",
NULL, NULL,
diff --git a/openbox/actions/maximize.c b/openbox/actions/maximize.c
index 8bb0cc95..bb6f470a 100644
--- a/openbox/actions/maximize.c
+++ b/openbox/actions/maximize.c
@@ -17,7 +17,7 @@ static gboolean run_func_on(ObActionsData *data, gpointer options);
static gboolean run_func_off(ObActionsData *data, gpointer options);
static gboolean run_func_toggle(ObActionsData *data, gpointer options);
-void action_maximize_startup()
+void action_maximize_startup(void)
{
actions_register("Maximize", setup_func, g_free, run_func_on,
NULL, NULL);
diff --git a/openbox/actions/move.c b/openbox/actions/move.c
index bf140c31..1a8ea204 100644
--- a/openbox/actions/move.c
+++ b/openbox/actions/move.c
@@ -4,7 +4,7 @@
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_move_startup()
+void action_move_startup(void)
{
actions_register("Move",
NULL, NULL,
diff --git a/openbox/actions/moverelative.c b/openbox/actions/moverelative.c
index deb1eae7..1d1189cd 100644
--- a/openbox/actions/moverelative.c
+++ b/openbox/actions/moverelative.c
@@ -13,7 +13,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_moverelative_startup()
+void action_moverelative_startup(void)
{
actions_register("MoveRelative",
setup_func,
diff --git a/openbox/actions/moveresizeto.c b/openbox/actions/moveresizeto.c
index 0e1f8268..860bf73a 100644
--- a/openbox/actions/moveresizeto.c
+++ b/openbox/actions/moveresizeto.c
@@ -25,7 +25,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_moveresizeto_startup()
+void action_moveresizeto_startup(void)
{
actions_register("MoveResizeTo",
setup_func,
diff --git a/openbox/actions/movetoedge.c b/openbox/actions/movetoedge.c
index 768783f2..5941bde9 100644
--- a/openbox/actions/movetoedge.c
+++ b/openbox/actions/movetoedge.c
@@ -13,7 +13,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_movetoedge_startup()
+void action_movetoedge_startup(void)
{
actions_register("MoveToEdge",
setup_func,
diff --git a/openbox/actions/omnipresent.c b/openbox/actions/omnipresent.c
index b6ba1622..030a0159 100644
--- a/openbox/actions/omnipresent.c
+++ b/openbox/actions/omnipresent.c
@@ -4,7 +4,7 @@
static gboolean run_func_toggle(ObActionsData *data, gpointer options);
-void action_omnipresent_startup()
+void action_omnipresent_startup(void)
{
actions_register("ToggleOmnipresent", NULL, NULL, run_func_toggle,
NULL, NULL);
diff --git a/openbox/actions/raise.c b/openbox/actions/raise.c
index 916c27b5..5dfe281a 100644
--- a/openbox/actions/raise.c
+++ b/openbox/actions/raise.c
@@ -3,7 +3,7 @@
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_raise_startup()
+void action_raise_startup(void)
{
actions_register("Raise",
NULL, NULL,
diff --git a/openbox/actions/raiselower.c b/openbox/actions/raiselower.c
index f75410ac..80fc917f 100644
--- a/openbox/actions/raiselower.c
+++ b/openbox/actions/raiselower.c
@@ -3,7 +3,7 @@
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_raiselower_startup()
+void action_raiselower_startup(void)
{
actions_register("RaiseLower",
NULL, NULL,
diff --git a/openbox/actions/reconfigure.c b/openbox/actions/reconfigure.c
index 8802a37b..cef81414 100644
--- a/openbox/actions/reconfigure.c
+++ b/openbox/actions/reconfigure.c
@@ -3,7 +3,7 @@
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_reconfigure_startup()
+void action_reconfigure_startup(void)
{
actions_register("Reconfigure",
NULL, NULL,
diff --git a/openbox/actions/resize.c b/openbox/actions/resize.c
index 26951370..81901bdd 100644
--- a/openbox/actions/resize.c
+++ b/openbox/actions/resize.c
@@ -15,7 +15,7 @@ static gboolean run_func(ObActionsData *data, gpointer options);
static guint32 pick_corner(gint x, gint y, gint cx, gint cy, gint cw, gint ch,
gboolean shaded);
-void action_resize_startup()
+void action_resize_startup(void)
{
actions_register("Resize",
setup_func,
diff --git a/openbox/actions/resizerelative.c b/openbox/actions/resizerelative.c
index 668a063f..f705c292 100644
--- a/openbox/actions/resizerelative.c
+++ b/openbox/actions/resizerelative.c
@@ -15,7 +15,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_resizerelative_startup()
+void action_resizerelative_startup(void)
{
actions_register("ResizeRelative",
setup_func,
diff --git a/openbox/actions/restart.c b/openbox/actions/restart.c
index fff0a87f..4b52f9d3 100644
--- a/openbox/actions/restart.c
+++ b/openbox/actions/restart.c
@@ -9,7 +9,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_restart_startup()
+void action_restart_startup(void)
{
actions_register("Restart",
setup_func,
diff --git a/openbox/actions/shade.c b/openbox/actions/shade.c
index a8db0989..2342067f 100644
--- a/openbox/actions/shade.c
+++ b/openbox/actions/shade.c
@@ -5,7 +5,7 @@ static gboolean run_func_on(ObActionsData *data, gpointer options);
static gboolean run_func_off(ObActionsData *data, gpointer options);
static gboolean run_func_toggle(ObActionsData *data, gpointer options);
-void action_shade_startup()
+void action_shade_startup(void)
{
actions_register("Shade", NULL, NULL, run_func_on, NULL, NULL);
actions_register("Unshade", NULL, NULL, run_func_off, NULL, NULL);
diff --git a/openbox/actions/showdesktop.c b/openbox/actions/showdesktop.c
index 03528362..c9ba86c4 100644
--- a/openbox/actions/showdesktop.c
+++ b/openbox/actions/showdesktop.c
@@ -3,7 +3,7 @@
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_showdesktop_startup()
+void action_showdesktop_startup(void)
{
actions_register("ToggleShowDesktop",
NULL, NULL,
diff --git a/openbox/actions/showmenu.c b/openbox/actions/showmenu.c
index a36648a2..c1d53e41 100644
--- a/openbox/actions/showmenu.c
+++ b/openbox/actions/showmenu.c
@@ -10,7 +10,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_showmenu_startup()
+void action_showmenu_startup(void)
{
actions_register("ShowMenu", setup_func, free_func, run_func,
NULL, NULL);
diff --git a/openbox/actions/unfocus.c b/openbox/actions/unfocus.c
index 0527d2a0..22a9378c 100644
--- a/openbox/actions/unfocus.c
+++ b/openbox/actions/unfocus.c
@@ -3,7 +3,7 @@
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_unfocus_startup()
+void action_unfocus_startup(void)
{
actions_register("Unfocus", NULL, NULL, run_func, NULL, NULL);
}
diff --git a/openbox/client.c b/openbox/client.c
index f97bd430..d0fed545 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -140,7 +140,7 @@ void client_remove_destroy_notify(ObClientCallback func)
}
}
-void client_set_list()
+void client_set_list(void)
{
Window *windows, *win_it;
GList *it;
@@ -164,7 +164,7 @@ void client_set_list()
stacking_set_list();
}
-void client_manage_all()
+void client_manage_all(void)
{
guint i, j, nchild;
Window w, *children;
@@ -637,7 +637,7 @@ ObClient *client_fake_manage(Window window)
return self;
}
-void client_unmanage_all()
+void client_unmanage_all(void)
{
while (client_list != NULL)
client_unmanage(client_list->data);
@@ -3969,6 +3969,8 @@ void client_find_edge_directional(ObClient *self, ObDirection dir,
dock_get_area(&dock_area);
detect_edge(dock_area, dir, my_head, my_size, my_edge_start,
my_edge_size, dest, near_edge);
+ g_free(a);
+ g_free(mon);
}
void client_find_move_directional(ObClient *self, ObDirection dir,
@@ -4119,7 +4121,7 @@ void client_find_resize_directional(ObClient *self, ObDirection side,
*h -= self->frame->size.top + self->frame->size.bottom;
}
-ObClient* client_under_pointer()
+ObClient* client_under_pointer(void)
{
gint x, y;
GList *it;
diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index bb492190..194c927e 100644
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -82,8 +82,6 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
}
if (empty || onlyiconic) {
- ObMenuEntry *e;
-
/* no entries or only iconified windows, so add a
* way to go to this desktop without uniconifying a window */
if (!empty)
diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 5f6a832d..33f4b6f5 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -137,10 +137,10 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
for (i = 0; i < screen_num_desktops; ++i) {
ObMenu *submenu;
gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i);
- DesktopData *data = g_new(DesktopData, 1);
+ DesktopData *ddata = g_new(DesktopData, 1);
- data->desktop = i;
- submenu = menu_new(name, screen_desktop_names[i], FALSE, data);
+ ddata->desktop = i;
+ submenu = menu_new(name, screen_desktop_names[i], FALSE, ddata);
menu_set_update_func(submenu, desk_menu_update);
menu_set_execute_func(submenu, desk_menu_execute);
menu_set_destroy_func(submenu, desk_menu_destroy);
diff --git a/openbox/client_menu.c b/openbox/client_menu.c
index 203d93ac..cf556744 100644
--- a/openbox/client_menu.c
+++ b/openbox/client_menu.c
@@ -352,7 +352,7 @@ static void client_menu_place(ObMenuFrame *frame, gint *x, gint *y,
}
}
-void client_menu_startup()
+void client_menu_startup(void)
{
ObMenu *menu;
ObMenuEntry *e;
diff --git a/openbox/config.c b/openbox/config.c
index 2bdd1966..ff4c542b 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -96,7 +96,7 @@ gint config_resist_edge;
GSList *config_per_app_settings;
-ObAppSettings* config_create_app_settings()
+ObAppSettings* config_create_app_settings(void)
{
ObAppSettings *settings = g_new0(ObAppSettings, 1);
settings->decor = -1;
@@ -174,8 +174,8 @@ void config_app_settings_copy_non_defaults(const ObAppSettings *src,
the monitor, so center2
will center the window on the second monitor.
*/
-static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc,
- xmlNodePtr node, gpointer d)
+static void parse_per_app_settings(ObParseInst *inst, xmlDocPtr doc,
+ xmlNodePtr node, gpointer data)
{
xmlNodePtr app = parse_find_node("application", node->children);
gchar *name = NULL, *class = NULL, *role = NULL;
@@ -320,14 +320,14 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc,
config_per_app_settings = g_slist_append(config_per_app_settings,
(gpointer) settings);
+ g_free(name);
+ g_free(class);
+ g_free(role);
+ name = class = role = NULL;
}
app = parse_find_node("application", app->next);
}
-
- g_free(name);
- g_free(class);
- g_free(role);
}
/*
@@ -379,7 +379,7 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
gchar *key;
@@ -411,7 +411,7 @@ static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
*/
static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n, nbut, nact;
gchar *buttonstr;
@@ -468,7 +468,7 @@ static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
@@ -489,7 +489,7 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
@@ -503,7 +503,7 @@ static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_margins(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
@@ -520,7 +520,7 @@ static void parse_margins(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
@@ -603,7 +603,7 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
@@ -640,7 +640,7 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
@@ -667,7 +667,7 @@ static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
@@ -744,7 +744,7 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
for (node = node->children; node; node = node->next) {
@@ -768,7 +768,7 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
@@ -785,7 +785,7 @@ typedef struct
const gchar *actname;
} ObDefKeyBind;
-static void bind_default_keyboard()
+static void bind_default_keyboard(void)
{
ObDefKeyBind *it;
ObDefKeyBind binds[] = {
@@ -808,7 +808,7 @@ typedef struct
const gchar *actname;
} ObDefMouseBind;
-static void bind_default_mouse()
+static void bind_default_mouse(void)
{
ObDefMouseBind *it;
ObDefMouseBind binds[] = {
@@ -962,7 +962,7 @@ void config_startup(ObParseInst *i)
parse_register(i, "applications", parse_per_app_settings, NULL);
}
-void config_shutdown()
+void config_shutdown(void)
{
GSList *it;
diff --git a/openbox/dock.c b/openbox/dock.c
index 3b32758a..9d4b56c4 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -189,7 +189,7 @@ void dock_add(Window win, XWMHints *wmhints)
ob_debug("Managed Dock App: 0x%lx (%s)\n", app->icon_win, app->class);
}
-void dock_remove_all()
+void dock_remove_all(void)
{
while (dock->dock_apps)
dock_remove(dock->dock_apps->data, TRUE);
@@ -219,7 +219,7 @@ void dock_remove(ObDockApp *app, gboolean reparent)
g_free(app);
}
-void dock_configure()
+void dock_configure(void)
{
GList *it;
gint hspot, vspot;
diff --git a/openbox/event.c b/openbox/event.c
index 9c47c04a..5e44bc9f 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -718,6 +718,8 @@ static void event_handle_root(XEvent *e)
ob_reconfigure();
else if (e->xclient.data.l[0] == 2)
ob_restart();
+ else if (e->xclient.data.l[0] == 3)
+ ob_exit(0);
}
break;
case PropertyNotify:
@@ -1579,7 +1581,7 @@ static void event_handle_dockapp(ObDockApp *app, XEvent *e)
}
}
-static ObMenuFrame* find_active_menu()
+static ObMenuFrame* find_active_menu(void)
{
GList *it;
ObMenuFrame *ret = NULL;
@@ -1593,7 +1595,7 @@ static ObMenuFrame* find_active_menu()
return ret;
}
-static ObMenuFrame* find_active_or_last_menu()
+static ObMenuFrame* find_active_or_last_menu(void)
{
ObMenuFrame *ret = NULL;
@@ -1857,12 +1859,14 @@ static void focus_delay_client_dest(ObClient *client, gpointer data)
client, FALSE);
}
-void event_halt_focus_delay()
+void event_halt_focus_delay(void)
{
+ /* ignore all enter events up till now */
+ event_end_ignore_all_enters(1);
ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func);
}
-gulong event_start_ignore_all_enters()
+gulong event_start_ignore_all_enters(void)
{
XSync(ob_display, FALSE);
return LastKnownRequestProcessed(ob_display);
@@ -1909,7 +1913,7 @@ static gboolean is_enter_focus_event_ignored(XEvent *e)
return FALSE;
}
-void event_cancel_all_key_grabs()
+void event_cancel_all_key_grabs(void)
{
if (actions_interactive_act_running()) {
actions_interactive_cancel_act();
@@ -1956,7 +1960,7 @@ gboolean event_time_after(Time t1, Time t2)
return t1 >= t2 && t1 < (t2 + TIME_HALF);
}
-Time event_get_server_time()
+Time event_get_server_time(void)
{
/* Generate a timestamp */
XEvent event;
diff --git a/openbox/extensions.c b/openbox/extensions.c
index 89a96576..ee73e9ec 100644
--- a/openbox/extensions.c
+++ b/openbox/extensions.c
@@ -34,7 +34,7 @@ gint extensions_randr_event_basep;
gboolean extensions_sync = FALSE;
gint extensions_sync_event_basep;
-void extensions_query_all()
+void extensions_query_all(void)
{
gint junk;
(void)junk;
diff --git a/openbox/focus.c b/openbox/focus.c
index b056db7e..df02cb76 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -178,7 +178,7 @@ ObClient* focus_fallback(gboolean allow_refocus, gboolean allow_pointer,
return new;
}
-void focus_nothing()
+void focus_nothing(void)
{
/* Install our own colormap */
if (focus_client != NULL) {
diff --git a/openbox/focus_cycle_indicator.h b/openbox/focus_cycle_indicator.h
index 8c84f71a..28175c75 100644
--- a/openbox/focus_cycle_indicator.h
+++ b/openbox/focus_cycle_indicator.h
@@ -27,6 +27,4 @@ void focus_cycle_indicator_shutdown(gboolean reconfig);
void focus_cycle_draw_indicator(struct _ObClient *c);
-void focus_cycle_stop();
-
#endif
diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index e0a8080f..488ecce1 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -96,7 +96,7 @@ void focus_cycle_popup_startup(gboolean reconfig)
{
XSetWindowAttributes attrib;
- single_popup = icon_popup_new(TRUE);
+ single_popup = icon_popup_new();
popup.obwin.type = Window_Internal;
popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
@@ -456,10 +456,11 @@ void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows,
XMapWindow(ob_display, popup.bg);
XFlush(ob_display);
popup.mapped = TRUE;
+ screen_hide_desktop_popup();
}
}
-void focus_cycle_popup_hide()
+void focus_cycle_popup_hide(void)
{
gulong ignore_start;
@@ -519,9 +520,10 @@ void focus_cycle_popup_single_show(struct _ObClient *c,
text = popup_get_name(c);
icon_popup_show(single_popup, text, client_icon(c, ICON_SIZE, ICON_SIZE));
g_free(text);
+ screen_hide_desktop_popup();
}
-void focus_cycle_popup_single_hide()
+void focus_cycle_popup_single_hide(void)
{
icon_popup_hide(single_popup);
}
diff --git a/openbox/grab.c b/openbox/grab.c
index 3fa45b7c..43e9a815 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -41,7 +41,7 @@ static guint pgrabs = 0;
static Time grab_time = CurrentTime;
static gint passive_count = 0;
-static Time ungrab_time()
+static Time ungrab_time(void)
{
Time t = event_curtime;
if (grab_time == CurrentTime ||
@@ -58,12 +58,12 @@ static Time ungrab_time()
return t;
}
-gboolean grab_on_keyboard()
+gboolean grab_on_keyboard(void)
{
return kgrabs > 0;
}
-gboolean grab_on_pointer()
+gboolean grab_on_pointer(void)
{
return pgrabs > 0;
}
@@ -218,7 +218,7 @@ void grab_key_passive_count(int change)
if (passive_count < 0) passive_count = 0;
}
-void ungrab_passive_key()
+void ungrab_passive_key(void)
{
/*ob_debug("ungrabbing %d passive grabs\n", passive_count);*/
if (passive_count) {
diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 6e45e5c4..0aade9ab 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -115,7 +115,7 @@ void keyboard_reset_chains(gint break_chroots)
set_curpos(p);
}
-void keyboard_unbind_all()
+void keyboard_unbind_all(void)
{
tree_destroy(keyboard_firstnode);
keyboard_firstnode = NULL;
@@ -267,7 +267,7 @@ void keyboard_event(ObClient *client, const XEvent *e)
void keyboard_startup(gboolean reconfig)
{
grab_keys(TRUE);
- popup = popup_new(FALSE);
+ popup = popup_new();
popup_set_text_align(popup, RR_JUSTIFY_CENTER);
}
diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 591a7159..7c6a9566 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -216,8 +216,6 @@ void ob_main_loop_destroy(ObMainLoop *loop)
/* only do this if we're the last loop destroyed */
if (!all_loops) {
- guint i;
-
/* grab all the signals that cause core dumps */
for (i = 0; i < NUM_CORE_SIGNALS; ++i) {
if (all_signals[core_signals[i]].installed) {
diff --git a/openbox/menu.c b/openbox/menu.c
index b69b7a3b..d9426e90 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -147,7 +147,7 @@ static void clear_cache(gpointer key, gpointer val, gpointer data)
menu_clear_entries(menu);
}
-void menu_clear_pipe_caches()
+void menu_clear_pipe_caches(void)
{
/* delete any pipe menus' submenus */
g_hash_table_foreach_remove(menu_hash, menu_pipe_submenu, NULL);
@@ -370,13 +370,6 @@ ObMenu* menu_new(const gchar *name, const gchar *title,
self->more_menu->data = data;
self->more_menu->shortcut = g_unichar_tolower(g_utf8_get_char("M"));
- self->more_menu->show_func = self->show_func;
- self->more_menu->hide_func = self->hide_func;
- self->more_menu->update_func = self->update_func;
- self->more_menu->execute_func = self->execute_func;
- self->more_menu->destroy_func = self->destroy_func;
- self->more_menu->place_func = self->place_func;
-
return self;
}
@@ -472,7 +465,7 @@ void menu_show(gchar *name, gint x, gint y, gboolean mouse, ObClient *client)
}
}
-gboolean menu_hide_delay_reached()
+gboolean menu_hide_delay_reached(void)
{
return menu_can_hide;
}
@@ -523,6 +516,7 @@ void menu_entry_unref(ObMenuEntry *self)
g_free(self->data.submenu.name);
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR:
+ g_free(self->data.separator.label);
break;
}
@@ -612,19 +606,16 @@ ObMenuEntry* menu_add_separator(ObMenu *self, gint id, const gchar *label)
void menu_set_show_func(ObMenu *self, ObMenuShowFunc func)
{
self->show_func = func;
- self->more_menu->show_func = func; /* keep it in sync */
}
void menu_set_hide_func(ObMenu *self, ObMenuHideFunc func)
{
self->hide_func = func;
- self->more_menu->hide_func = func; /* keep it in sync */
}
void menu_set_update_func(ObMenu *self, ObMenuUpdateFunc func)
{
self->update_func = func;
- self->more_menu->update_func = func; /* keep it in sync */
}
void menu_set_execute_func(ObMenu *self, ObMenuExecuteFunc func)
@@ -636,13 +627,11 @@ void menu_set_execute_func(ObMenu *self, ObMenuExecuteFunc func)
void menu_set_destroy_func(ObMenu *self, ObMenuDestroyFunc func)
{
self->destroy_func = func;
- self->more_menu->destroy_func = func; /* keep it in sync */
}
void menu_set_place_func(ObMenu *self, ObMenuPlaceFunc func)
{
self->place_func = func;
- self->more_menu->place_func = func; /* keep it in sync */
}
ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id)
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 2c666e3f..979e834f 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -637,9 +637,9 @@ void menu_frame_render(ObMenuFrame *self)
STRUT_SET(self->item_margin, 0, 0, 0, 0);
if (self->entries) {
- ObMenuEntryFrame *e = self->entries->data;
gint l, t, r, b;
+ e = self->entries->data;
e->a_text_normal->texture[0].data.text.string = "";
tw = RrMinWidth(e->a_text_normal);
tw += 2*PADDING;
@@ -1057,7 +1057,7 @@ static void menu_frame_hide(ObMenuFrame *self)
menu_frame_free(self);
}
-void menu_frame_hide_all()
+void menu_frame_hide_all(void)
{
GList *it;
diff --git a/openbox/mouse.c b/openbox/mouse.c
index 97616096..66615585 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -142,7 +142,7 @@ static void grab_all_clients(gboolean grab)
mouse_grab_for_client(it->data, grab);
}
-void mouse_unbind_all()
+void mouse_unbind_all(void)
{
gint i;
GSList *it;
@@ -153,10 +153,10 @@ void mouse_unbind_all()
gint j;
for (j = 0; j < OB_NUM_MOUSE_ACTIONS; ++j) {
- GSList *it;
+ GSList *jt;
- for (it = b->actions[j]; it; it = g_slist_next(it))
- actions_act_unref(it->data);
+ for (jt = b->actions[j]; jt; jt = g_slist_next(jt))
+ actions_act_unref(jt->data);
g_slist_free(b->actions[j]);
}
g_free(b);
diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 1a8550a9..bb17d4a0 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -77,7 +77,7 @@ static void client_dest(ObClient *client, gpointer data)
void moveresize_startup(gboolean reconfig)
{
- popup = popup_new(FALSE);
+ popup = popup_new();
popup_set_text_align(popup, RR_JUSTIFY_CENTER);
if (!reconfig)
@@ -299,7 +299,7 @@ static void do_move(gboolean keyboard, gint keydist)
}
-static void do_resize()
+static void do_resize(void)
{
gint x, y, w, h, lw, lh;
@@ -538,7 +538,7 @@ static void do_edge_warp(gint x, gint y)
}
}
-static void cancel_edge_warp()
+static void cancel_edge_warp(void)
{
ob_main_loop_timeout_remove(ob_main_loop, edge_warp_delay_func);
}
diff --git a/openbox/openbox.c b/openbox/openbox.c
index 06afffc8..6f47fbd0 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -489,6 +489,7 @@ static void print_help()
g_print(_("\nPassing messages to a running Openbox instance:\n"));
g_print(_(" --reconfigure Reload Openbox's configuration\n"));
g_print(_(" --restart Restart Openbox\n"));
+ g_print(_(" --exit Exit Openbox\n"));
g_print(_("\nDebugging options:\n"));
g_print(_(" --sync Run in synchronous mode\n"));
g_print(_(" --debug Display debugging output\n"));
@@ -511,7 +512,7 @@ static void remove_args(gint *argc, gchar **argv, gint index, gint num)
static void parse_env()
{
/* unset this so we don't pass it on unknowingly */
- unsetenv("DESKTOP_STARTUP_ID");
+ putenv("DESKTOP_STARTUP_ID");
}
static void parse_args(gint *argc, gchar **argv)
@@ -554,9 +555,13 @@ static void parse_args(gint *argc, gchar **argv)
}
else if (!strcmp(argv[i], "--reconfigure")) {
remote_control = 1;
- } else if (!strcmp(argv[i], "--restart")) {
+ }
+ else if (!strcmp(argv[i], "--restart")) {
remote_control = 2;
}
+ else if (!strcmp(argv[i], "--exit")) {
+ remote_control = 3;
+ }
else if (!strcmp(argv[i], "--sm-save-file")) {
if (i == *argc - 1) /* no args left */
/* not translated cuz it's sekret */
diff --git a/openbox/place.c b/openbox/place.c
index 7c20c79f..aa572db2 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -134,6 +134,8 @@ static Rect **pick_head(ObClient *c)
for (i = 0; i < screen_num_monitors; ++i)
area[i] = screen_area(c->desktop, choice[i], NULL);
+ g_free(choice);
+
return area;
}
@@ -180,7 +182,7 @@ static GSList* area_remove(GSList *list, Rect *a)
if (!RECT_INTERSECTS_RECT(*r, *a)) {
result = g_slist_prepend(result, r);
- r = NULL; /* dont free it */
+ /* dont free r, it's moved to the result list */
} else {
Rect isect, extra;
@@ -215,9 +217,10 @@ static GSList* area_remove(GSList *list, Rect *a)
r->width, RECT_BOTTOM(*r) - RECT_BOTTOM(isect));
result = area_add(result, &extra);
}
- }
- g_free(r);
+ /* 'r' is not being added to the result list, so free it */
+ g_free(r);
+ }
}
g_slist_free(list);
return result;
@@ -251,8 +254,6 @@ static gboolean place_nooverlap(ObClient *c, gint *x, gint *y)
/* try ignoring different things to find empty space */
for (ignore = 0; ignore < IGNORE_END && !ret; ignore++) {
- guint i;
-
/* try all monitors in order of preference */
for (i = 0; i < screen_num_monitors && !ret; ++i) {
GList *it;
diff --git a/openbox/popup.c b/openbox/popup.c
index d49148ff..071f5b62 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -29,7 +29,7 @@
#include "render/render.h"
#include "render/theme.h"
-ObPopup *popup_new()
+ObPopup *popup_new(void)
{
XSetWindowAttributes attrib;
ObPopup *self = g_new0(ObPopup, 1);
@@ -151,14 +151,12 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
{
gint l, t, r, b;
gint x, y, w, h;
+ guint m;
gint emptyx, emptyy; /* empty space between elements */
gint textx, texty, textw, texth;
gint iconx, icony, iconw, iconh;
Rect *area, mon;
- RECT_SET(mon, self->x, self->y, 1, 1);
- area = screen_physical_area_monitor(screen_find_monitor(&mon));
-
/* when there is no icon and the text is not parent relative, then
fill the whole dialog with the text appearance, don't use the bg at all
*/
@@ -246,8 +244,27 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
break;
}
- x=MAX(MIN(x, area->width-w),0);
- y=MAX(MIN(y, area->height-h),0);
+ /* Find the monitor which contains the biggest part of the popup.
+ * If the popup is completely off screen, limit it to the intersection
+ * of all monitors and then try again. If it's still off screen, put it
+ * on monitor 0. */
+ RECT_SET(mon, x, y, w, h);
+ m = screen_find_monitor(&mon);
+ area = screen_physical_area_monitor(m);
+
+ x=MAX(MIN(x, area->x+area->width-w),area->x);
+ y=MAX(MIN(y, area->y+area->height-h),area->y);
+
+ if (m == screen_num_monitors) {
+ RECT_SET(mon, x, y, w, h);
+ m = screen_find_monitor(&mon);
+ if (m == screen_num_monitors)
+ m = 0;
+ area = screen_physical_area_monitor(m);
+
+ x=MAX(MIN(x, area->x+area->width-w),area->x);
+ y=MAX(MIN(y, area->y+area->height-h),area->y);
+ }
/* set the windows/appearances up */
XMoveResizeWindow(ob_display, self->bg, x, y, w, h);
@@ -315,12 +332,12 @@ static void icon_popup_draw_icon(gint x, gint y, gint w, gint h, gpointer data)
RrPaint(self->a_icon, self->icon, w, h);
}
-ObIconPopup *icon_popup_new()
+ObIconPopup *icon_popup_new(void)
{
ObIconPopup *self;
self = g_new0(ObIconPopup, 1);
- self->popup = popup_new(TRUE);
+ self->popup = popup_new();
self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
self->icon = XCreateWindow(ob_display, self->popup->bg,
0, 0, 1, 1, 0,
@@ -473,12 +490,12 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
}
}
-ObPagerPopup *pager_popup_new()
+ObPagerPopup *pager_popup_new(void)
{
ObPagerPopup *self;
self = g_new(ObPagerPopup, 1);
- self->popup = popup_new(TRUE);
+ self->popup = popup_new();
self->desks = 0;
self->wins = g_new(Window, self->desks);
diff --git a/openbox/prop.c b/openbox/prop.c
index 40ae6ef2..44abdfe6 100644
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -27,7 +27,7 @@ Atoms prop_atoms;
#define CREATE(var, name) (prop_atoms.var = \
XInternAtom(ob_display, name, FALSE))
-void prop_startup()
+void prop_startup(void)
{
CREATE(cardinal, "CARDINAL");
CREATE(window, "WINDOW");
diff --git a/openbox/screen.c b/openbox/screen.c
index 93ec57f5..a8da15c0 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -52,9 +52,9 @@
ButtonPressMask | ButtonReleaseMask)
static gboolean screen_validate_layout(ObDesktopLayout *l);
-static gboolean replace_wm();
-static void screen_tell_ksplash();
-static void screen_fallback_focus();
+static gboolean replace_wm(void);
+static void screen_tell_ksplash(void);
+static void screen_fallback_focus(void);
guint screen_num_desktops;
guint screen_num_monitors;
@@ -77,7 +77,7 @@ static GSList *struts_bottom = NULL;
static ObPagerPopup *desktop_popup;
-static gboolean replace_wm()
+static gboolean replace_wm(void)
{
gchar *wm_sn;
Atom wm_sn_atom;
@@ -149,7 +149,7 @@ static gboolean replace_wm()
return TRUE;
}
-gboolean screen_annex()
+gboolean screen_annex(void)
{
XSetWindowAttributes attrib;
pid_t pid;
@@ -304,7 +304,7 @@ gboolean screen_annex()
return TRUE;
}
-static void screen_tell_ksplash()
+static void screen_tell_ksplash(void)
{
XEvent e;
char **argv;
@@ -344,7 +344,7 @@ void screen_startup(gboolean reconfig)
guint32 d;
gboolean namesexist = FALSE;
- desktop_popup = pager_popup_new(FALSE);
+ desktop_popup = pager_popup_new();
pager_popup_height(desktop_popup, POPUP_HEIGHT);
if (reconfig) {
@@ -453,7 +453,7 @@ void screen_shutdown(gboolean reconfig)
screen_desktop_names = NULL;
}
-void screen_resize()
+void screen_resize(void)
{
static gint oldw = 0, oldh = 0;
gint w, h;
@@ -536,7 +536,7 @@ void screen_set_num_desktops(guint num)
screen_set_desktop(num - 1, TRUE);
}
-static void screen_fallback_focus()
+static void screen_fallback_focus(void)
{
ObClient *c;
gboolean allow_omni;
@@ -855,6 +855,13 @@ void screen_show_desktop_popup(guint d)
ob_main_loop_timeout_remove(ob_main_loop, hide_desktop_popup_func);
ob_main_loop_timeout_add(ob_main_loop, config_desktop_popup_time * 1000,
hide_desktop_popup_func, NULL, NULL, NULL);
+ g_free(a);
+}
+
+void screen_hide_desktop_popup(void)
+{
+ ob_main_loop_timeout_remove(ob_main_loop, hide_desktop_popup_func);
+ pager_popup_hide(desktop_popup);
}
guint screen_find_desktop(guint from, ObDirection dir,
@@ -1000,7 +1007,7 @@ static gboolean screen_validate_layout(ObDesktopLayout *l)
return TRUE;
}
-void screen_update_layout()
+void screen_update_layout(void)
{
ObDesktopLayout l;
@@ -1049,7 +1056,7 @@ void screen_update_layout()
}
}
-void screen_update_desktop_names()
+void screen_update_desktop_names(void)
{
guint i;
@@ -1211,7 +1218,7 @@ typedef struct {
} \
}
-void screen_update_areas()
+void screen_update_areas(void)
{
guint i, j;
gulong *dims;
@@ -1503,7 +1510,7 @@ Rect* screen_area(guint desktop, guint head, Rect *search)
guint screen_find_monitor(Rect *search)
{
guint i;
- guint most = 0;
+ guint most = screen_num_monitors;
guint mostv = 0;
for (i = 0; i < screen_num_monitors; ++i) {
@@ -1525,7 +1532,7 @@ guint screen_find_monitor(Rect *search)
return most;
}
-Rect* screen_physical_area_all_monitors()
+Rect* screen_physical_area_all_monitors(void)
{
return screen_physical_area_monitor(screen_num_monitors);
}
@@ -1547,7 +1554,7 @@ gboolean screen_physical_area_monitor_contains(guint head, Rect *search)
return RECT_INTERSECTS_RECT(monitor_area[head], *search);
}
-Rect* screen_physical_area_active()
+Rect* screen_physical_area_active(void)
{
Rect *a;
gint x, y;
@@ -1567,7 +1574,7 @@ Rect* screen_physical_area_active()
return a;
}
-void screen_set_root_cursor()
+void screen_set_root_cursor(void)
{
if (sn_app_starting())
XDefineCursor(ob_display, RootWindow(ob_display, ob_screen),
diff --git a/openbox/screen.h b/openbox/screen.h
index 68a13251..39871e33 100644
--- a/openbox/screen.h
+++ b/openbox/screen.h
@@ -77,6 +77,8 @@ guint screen_find_desktop(guint from, ObDirection dir,
/*! Show the desktop popup/notification */
void screen_show_desktop_popup(guint d);
+/*! Hide it */
+void screen_hide_desktop_popup();
/*! Shows and focuses the desktop and hides all the client windows, or
returns to the normal state, showing client windows.
diff --git a/openbox/stacking.c b/openbox/stacking.c
index 2280b877..b23e6eac 100644
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -29,7 +29,7 @@
GList *stacking_list = NULL;
-void stacking_set_list()
+void stacking_set_list(void)
{
Window *windows = NULL;
GList *it;
@@ -411,6 +411,7 @@ void stacking_add_nonintrusive(ObWindow *win)
ObClient *client;
GList *it_below = NULL; /* this client will be below us */
GList *it_above;
+ GList *wins;
if (!WINDOW_IS_CLIENT(win)) {
stacking_add(win); /* no special rules for others */
@@ -468,7 +469,7 @@ void stacking_add_nonintrusive(ObWindow *win)
break;
}
- GList *wins = g_list_append(NULL, win);
+ wins = g_list_append(NULL, win);
do_restack(wins, it_below);
g_list_free(wins);
}
diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index 1cf8da6f..4c929e7e 100644
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -61,7 +61,7 @@ void sn_startup(gboolean reconfig)
if (reconfig) return;
/* unset this so we don't pass it on unknowingly */
- unsetenv("DESKTOP_STARTUP_ID");
+ putenv("DESKTOP_STARTUP_ID");
sn_display = sn_display_new(ob_display, NULL, NULL);
sn_context = sn_monitor_context_new(sn_display, ob_screen,
@@ -106,7 +106,7 @@ static SnStartupSequence* sequence_find(const gchar *id)
return ret;
}
-gboolean sn_app_starting()
+gboolean sn_app_starting(void)
{
return sn_waits != NULL;
}
@@ -259,12 +259,12 @@ void sn_setup_spawn_environment(gchar *program, gchar *name,
g_direct_equal,
(GDestroyNotify)sn_launcher_context_unref);
- setenv("DESKTOP_STARTUP_ID", id, TRUE);
+ putenv(g_strdup_printf("DESKTOP_STARTUP_ID=%s", id));
g_free(desc);
}
-void sn_spawn_cancel()
+void sn_spawn_cancel(void)
{
sn_launcher_context_complete(sn_launcher);
}
diff --git a/openbox/translate.c b/openbox/translate.c
index 5b2b4ebe..21015578 100644
--- a/openbox/translate.c
+++ b/openbox/translate.c
@@ -156,7 +156,7 @@ translation_fail:
return ret;
}
-const gchar *translate_keycode(guint keycode)
+gchar *translate_keycode(guint keycode)
{
KeySym sym;
const gchar *ret = NULL;
@@ -170,7 +170,7 @@ gunichar translate_unichar(guint keycode)
{
gunichar unikey = 0;
- const char *key;
+ char *key;
if ((key = translate_keycode(keycode)) != NULL &&
/* don't accept keys that aren't a single letter, like "space" */
key[1] == '\0')
@@ -179,5 +179,6 @@ gunichar translate_unichar(guint keycode)
if (unikey == (gunichar)-1 || unikey == (gunichar)-2 || unikey == 0)
unikey = 0;
}
+ g_free(key);
return unikey;
}
diff --git a/openbox/translate.h b/openbox/translate.h
index 21cd6498..6d9e23bc 100644
--- a/openbox/translate.h
+++ b/openbox/translate.h
@@ -25,7 +25,7 @@ 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);
+gchar *translate_keycode(guint keycode);
/*! Translate a keycode to the unicode character it represents */
gunichar translate_unichar(guint keycode);
diff --git a/parser/parse.c b/parser/parse.c
index 8c2d012e..6daa8517 100644
--- a/parser/parse.c
+++ b/parser/parse.c
@@ -46,7 +46,7 @@ static void destfunc(struct Callback *c)
g_free(c);
}
-ObParseInst* parse_startup()
+ObParseInst* parse_startup(void)
{
ObParseInst *i = g_new(ObParseInst, 1);
i->callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
@@ -374,7 +374,7 @@ static GSList* split_paths(const gchar *paths)
return list;
}
-void parse_paths_startup()
+void parse_paths_startup(void)
{
const gchar *path;
@@ -436,7 +436,7 @@ void parse_paths_startup()
(GSListFunc) g_slist_prepend);
}
-void parse_paths_shutdown()
+void parse_paths_shutdown(void)
{
GSList *it;
@@ -512,22 +512,22 @@ gboolean parse_mkdir_path(const gchar *path, gint mode)
return ret;
}
-const gchar* parse_xdg_config_home_path()
+const gchar* parse_xdg_config_home_path(void)
{
return xdg_config_home_path;
}
-const gchar* parse_xdg_data_home_path()
+const gchar* parse_xdg_data_home_path(void)
{
return xdg_data_home_path;
}
-GSList* parse_xdg_config_dir_paths()
+GSList* parse_xdg_config_dir_paths(void)
{
return xdg_config_dir_paths;
}
-GSList* parse_xdg_data_dir_paths()
+GSList* parse_xdg_data_dir_paths(void)
{
return xdg_data_dir_paths;
}
diff --git a/po/ar.po b/po/ar.po
index 26b93c6c..c65acd86 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-07-21 14:43+0300\n"
"Last-Translator: Khaled Hosny \n"
"Language-Team: Arabic \n"
@@ -28,27 +28,27 @@ msgstr "فشلت في تحويل المسار '%s' من utf8"
msgid "Failed to execute '%s': %s"
msgstr "فشلت في تنفيذ '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "اذهب هناك..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "أدِر أسطح المكتب"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "أضِف سطح مكتب جديد (_A)"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "احذف آخر سطح مكتب (_R)"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "نوافذ"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "أسطح مكتب"
@@ -80,39 +80,39 @@ msgstr "أرسِل إلى سطح المكتب (_S)"
msgid "Client menu"
msgstr "قائمة العميل"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "استعِد (_E)"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "انقل (_M)"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "حجِّم (_Z)"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "صغّر (_N)"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "كبّر (_X)"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "لُف لأعلى/لأسفل (_R)"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "ضع/أزل الحواف (_D)"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "أغلق (_C)"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "زر غير صحيح '%s' محدد في ملف الإعدادات"
@@ -155,49 +155,49 @@ msgstr "زر غير صحيح '%s' في ارتباط الفأرة"
msgid "Invalid context '%s' in mouse binding"
msgstr "سياق غير صحيح '%s' في ارتباط الفأرة"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "لم أستطع تغيير المجلد المنزلي '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "تعذّر فتح العرض من متغير البيئة DISPLAY."
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "تعذّر بدأ مكتبة obrender."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "خادم إكس لا يدعم المحليّة."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "لم أستطِع ضبط مُغيِّرات المحليّة لخادم إكس."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr "لم أعثر على ملف إعدادات سليم، سأستخدم بعض الإفتراضيات البسيطة"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "لم أستطِع تحميل سِمة."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "فشلت إعادة التشغيل في تنفيذ مُنفّذ جديد '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "حقوق النسخ"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "الصيغة: openbox [options]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -205,23 +205,23 @@ msgstr ""
"\n"
"الخيارات:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help اعرض هذه المساعدة ثم اخرج\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version اعرض النسخة ثم اخرج\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace استبدل مدير النوافذ الذي يعمل حاليا\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable عطِّل الإتصال بمدير الجلسة\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -229,15 +229,20 @@ msgstr ""
"\n"
"تمرير رسائل لمرّة تعمل من أوبنبوكس:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure أعِد تحميل إعدادات أوبنبوكس\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart أعِد تشغيل أوبنبوكس\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -245,23 +250,23 @@ msgstr ""
"\n"
"خيارات التنقيح:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync شغّل في النمط المزامن\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug اعرض خرْج التنقيح\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr " --debug-focus اعرض خرج التنقيح للتعامل مع البؤرة\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama شق العرض إلى شاشات xinerama زائفة\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -270,27 +275,27 @@ msgstr ""
"\n"
"من فضلك أبلغ عن العلل إلى %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "معامل سطر أوامر غير سليم '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "يعمل مدير نوافذ بالفعل على الشاشة %Id"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "تعذّر الحصول على انتقاء مدير النوافذ على الشاشة %Id"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "مدير النوافذ على الشاشة %Id لا وجود له"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "سطح المكتب %Ii"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 4be3561d..d55d4681 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-06-01 19:02+0530\n"
"Last-Translator: Runa Bhattacharjee \n"
"Language-Team: Bengali (India) \n"
@@ -27,27 +27,27 @@ msgstr "'%s' পাথটি utf8 থেকে রূপান্তর কর
msgid "Failed to execute '%s': %s"
msgstr "'%s' সঞ্চালন করতে ব্যর্থ: %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "চিহ্নিত স্থানে চলুন..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr ""
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr ""
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr ""
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "উইন্ডো"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "ডেস্কটপ"
@@ -79,39 +79,39 @@ msgstr "ডেস্কটপে পাঠানো হবে (_S)"
msgid "Client menu"
msgstr "ক্লায়েন্ট মেনু"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "পুনরুদ্ধার (_e)"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "স্থানান্তরণ (_M)"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "মাপ পরিবর্তন (_z)"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "আইকন রূপে প্রদর্শন (_n)"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "বড় করুন (_x)"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "উপরে/নীচে গুটিয়ে নিন (_R)"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "বিন্যাস পরিবর্তন (_D)"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "বন্ধ করুন (_C)"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "কনফিগ ফাইলে অবৈধ বাটন '%s' উল্লিখিত হয়েছে"
@@ -154,49 +154,49 @@ msgstr "মাউস বাইন্ডিং সংক্রান্ত অব
msgid "Invalid context '%s' in mouse binding"
msgstr "মাউস বাইন্ডিং সংক্রান্ত অবৈধ কনটেক্সট '%s'"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "ব্যক্তিগত ডিরেক্টরি '%s'-তে পরিবর্তন করতে ব্যর্থ: %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "DISPLAY এনভাশরনমেন্ট ভেরিয়েবলের মান প্রয়োগ করে প্রদর্শন আরম্ভ করতে ব্যর্থ।"
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "obrender লাইব্রেরি আরম্ভ করতে ব্যর্থ।"
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "X সার্ভার দ্বারা লোকেইল সমর্থিতত হয় না।"
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "X সার্ভারের জন্য লোকেইল মডিফায়ার নির্ধারণ করতে ব্যর্থ।"
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr "বৈধ কনফিগ ফাইল সনাক্ত করতে ব্যর্থ, কয়েকটি সাধারণ ডিফল্ট মান প্রয়োগ করা হবে।"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "থিম লোড করতে ব্যর্থ।"
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "পুনরাম্ভের পরে নতুন এক্সেকিউটেবল '%s' সঞ্চালন করতে ব্যর্থ: %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "স্বত্বাধিকার (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "ব্যবহারপ্রণালী: openbox [বিকল্প]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -204,25 +204,25 @@ msgstr ""
"\n"
"বিবিধ বিকল্প:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help সহায়তা বার্তা প্রদর্শন করে প্রস্থান\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version সংস্করণ প্রদর্শন করে প্রস্থান\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr ""
" --replace বর্তমানে চলমান উইন্ডো পরিচালন ব্যবস্থা পরিবর্তন করা হবে\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr ""
" --sm-disable সেশান পরিচালন ব্যবস্থার সাথে সংযোগ নিষ্ক্রিয় করা হবে\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -230,15 +230,20 @@ msgstr ""
"\n"
"চলমান Openbox ইনস্ট্যান্সে বার্তা প্রেরণ:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Openbox-র কনফিগারেশন পুনরায় লোড করে\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Openbox পুনরারম্ভ\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -246,24 +251,24 @@ msgstr ""
"\n"
"ডিবাগ করার বিভিন্ন বিকল্প:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync সিঙ্ক্রোনাস মোডে সঞ্চালিত হবে\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug ডিবাগ-এর ফলাফল প্রদর্শন করে\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
" --debug-focus ফোকাস হ্যান্ডলিং সংক্রান্ত ডিবাগের ফলাফল প্রদর্শন করে\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama প্রদর্শন ক্ষেত্রটি নকল xinerama পর্দায় ভাগ করা হবে\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -272,27 +277,27 @@ msgstr ""
"\n"
"অনুগ্রহ করে %s-এ বাগ সংক্রান্ত সূচনা দায়ের করুন\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "অবৈধ কমান্ড-লাইন আর্গুমেন্ট '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "একটি উইন্ডো পরিচালন ব্যবস্থা বর্তমানে %d-এ চলছে"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "পর্দা %d-এ উইন্ডো পরিচালন ব্যবস্থার নির্বাচিত অংশ প্রাপ্ত করতে ব্যর্থ"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "পর্দা %d-র উপর চলমান উইন্ডো পরিচালন ব্যবস্থাটি বন্ধ করতে ব্যর্থ"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "desktop %i"
diff --git a/po/ca.po b/po/ca.po
index 6c19ceb6..afc6bbb2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-05-28 15:54+0200\n"
"Last-Translator: David Majà Martínez \n"
"Language-Team: catalan\n"
@@ -25,27 +25,27 @@ msgstr "No s'ha pogut convertir el camí '%s' des de utf8"
msgid "Failed to execute '%s': %s"
msgstr "No s'ha pogut executar '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Vés aquí..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr ""
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr ""
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr ""
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Finestres"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Escriptoris"
@@ -77,39 +77,39 @@ msgstr "A l'_escriptori"
msgid "Client menu"
msgstr "Menú del client"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "Restaur_a"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "_Mou"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "Redimen_siona"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Mi_nimitza"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Ma_ximitza"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "En/Desen_rotlla"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "Sense/Amb _decoració"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "_Tanca"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "El botó especificat al fitxer de configuració '%s' no és vàlid."
@@ -153,53 +153,53 @@ msgstr "El botó '%s' no és vàlid en la vinculació del ratolí"
msgid "Invalid context '%s' in mouse binding"
msgstr "El context '%s' no és vàlid en la vinculació del ratolí"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "No s'ha pogut canviar al directori de l'usuari '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "No s'ha pogut obrir la pantalla des de la variable d'entorn DISPLAY"
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "S'ha produït un error en inicialitza la llibreria obrender."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "El servidor X no te suport per a idiomes"
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "No s'ha pogut assignar els modificadors del locale per al servidor X."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
"No s'ha pogut trobat un fitxer de configuració vàlid, s'utilitzaran alguns "
"valors predeterminats"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "No s'ha pogut carregar el tema."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr ""
"S'ha produït un error en tornar a iniciar i executar el nou executable '%s': "
"%s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Copyright (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Sintaxis: openbox [opcions]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -207,25 +207,25 @@ msgstr ""
"\n"
"Opcions:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Visualitza aquesta ajuda i surt\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Visualitza la versió i surt\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr ""
" --replace Reemplaça el gestor de finestres que s'està executant "
"actualment\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Inhabilita la connexió amb gestor de sessió\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -234,15 +234,20 @@ msgstr ""
"S'està transferint missatges a la instància del Openbox que s'està "
"executant:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Torna a carregar la configuració de Openbox\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Torna a iniciar Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -250,27 +255,27 @@ msgstr ""
"\n"
"Opcions de depuració:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Executa en mode sincronitzat\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Mostra la sortida de depuració\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
" --debug-focus Mostra la sortida de depuració per a la gestió del "
"focus\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr ""
" --debug-xinerama Divideix la visualització en pantalles xinerama "
"falses\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -279,28 +284,28 @@ msgstr ""
"\n"
"Informeu dels errors a %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Opció '%s' no vàlida a la línia d'ordres\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "Encara s'està executant un gestor de finestres a la pantalla %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr ""
"No s'ha pogut adquirir la selecció del gestor de finestres en la pantalla %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "El gestor de finestres de la pantalla %d no està sortint"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "escriptori %i"
diff --git a/po/cs.po b/po/cs.po
index c2b1f334..d5f6eed8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-07-21 00:15+0200\n"
"Last-Translator: tezlo \n"
"Language-Team: Czech \n"
@@ -25,27 +25,27 @@ msgstr "Nepodařilo se převést cestu '%s' z utf8"
msgid "Failed to execute '%s': %s"
msgstr "Nepodařilo se spustit '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Jdi tam..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "Spravovat plochy"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "_Přidat novou plochu"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "_Odstranit poslední plochu"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Okna"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Plochy"
@@ -77,39 +77,39 @@ msgstr "_Poslat na plochu"
msgid "Client menu"
msgstr "Menu klienta"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "_Obnovit"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "Přes_unout"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "Veli_kost"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Mi_nimalizovat"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Ma_ximalizovat"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "S_rolovat/Vyrolovat"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "Oz_dobit/Odzdobit"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "_Zavřít"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Neplatné tlačítko '%s' v konfiguračním souboru"
@@ -152,51 +152,51 @@ msgstr "Neplatné tlačítko '%s' v nastavení myši"
msgid "Invalid context '%s' in mouse binding"
msgstr "Neplatný kontext '%s' v nastavení myši"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Nepodařilo se přejít do domácího adresáře '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "Nepodařilo se otevřít displej z proměnné prostředí DISPLAY."
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Nepodařilo se inicializovat knihovnu obrender."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "X server nepodporuje lokalizaci."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "Nelze nastavit modifikátory lokalizace pro X server."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
"Nepodařilo se najít platný konfigurační soubor, pokračuji s výchozím "
"nastavením"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Nepodařilo se načíst motiv."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "Při restartu se nepodařilo spustit nový program '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Copyright (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Syntaxe: openbox [přepínače]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -204,23 +204,23 @@ msgstr ""
"\n"
"Přepínače:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Zobrazit tuto nápovědu a skončit\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Zobrazit verzi a skončit\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace Nahradit běžící window manager\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Nepřipojovat se k session manageru\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -228,15 +228,20 @@ msgstr ""
"\n"
"Zasílání zpráv běžící instanci Openbox:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Znovu načíst konfiguraci Openbox\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Restartovat Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -244,23 +249,23 @@ msgstr ""
"\n"
"Ladící přepínače:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Spustit v synchronním módu\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Zobrazit ladící výstup\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr " --debug-focus Zobrazit ladící výstup pro správu oken\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama Rozdělit displej na falešné obrazovky xinerama\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -269,27 +274,27 @@ msgstr ""
"\n"
"Prosím hlašte chyby na %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Neplatný argument příkazové řádky '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "Na obrazovce %d již nějaký window manager běží"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "Nepodařilo se získat výseč pro window manager na obrazovce %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "Window manager na obrazovce %d ne a ne skončit"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "plochu %i"
diff --git a/po/de.po b/po/de.po
index 9e1321ad..f35437f1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the openbox package.
# Sebastian Vahl , 2006.
# Simon A. Wilper , Apr 2007
+# Peter Schwindt
+#
msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
-"PO-Revision-Date: 2007-07-20 16:44+0200\n"
-"Last-Translator: Sebastian Sareyko \n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"PO-Revision-Date: 2007-08-23 15:00+0200\n"
+"Last-Translator: Peter Schwindt \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -25,27 +27,27 @@ msgstr "Konnte Pfad '%s' nicht von utf8 konvertieren"
msgid "Failed to execute '%s': %s"
msgstr "Konnte '%s' nicht ausfhren: %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Gehe zu..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "Desktops verwalten"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
-msgstr "_Neuen desktop hinzufgen"
+msgstr "_Neuen Desktop hinzufgen"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
-msgstr "_Letzten desktop entfernen"
+msgstr "_Letzten Desktop entfernen"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Fenster"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Desktops"
@@ -77,39 +79,39 @@ msgstr "_An Desktop senden"
msgid "Client menu"
msgstr "Client menu"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "Wi_ederherstellen"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "Vers_chieben"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "_Gre ndern"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Mi_nimieren"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Ma_ximieren"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "Auf/Ab_rollen"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "Dekoration entfernen/_Dekorieren"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "_Schlieen"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Unzulssiger Knopf '%s' in der Konfigurationsdatei angegeben"
@@ -152,52 +154,52 @@ msgstr "Maus-Binding enth
msgid "Invalid context '%s' in mouse binding"
msgstr "Maus-Binding enthlt ungltigen Kontext '%s'"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Konnte nicht in das Heimatverzeichnis '%s' wechseln: %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
-msgstr "Konnte das display aus der Umgebungsvariable DISPLAY nicht ffnen."
+msgstr "Konnte das Display aus der Umgebungsvariable DISPLAY nicht ffnen."
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Konnte die obrender Bibliothek nicht initialisieren."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "Die gewhlte Lokalisierung wird vom X-Server nicht untersttzt."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr ""
"Die Lokalisierungsmodifizierer fr den X-Server konnten nicht gesetzt werden."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
"Es wurde keine gltige Konfigurationsdatei gefunden, benutze einfache "
"Standardwerte."
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Konnte kein Thema laden."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "Neustart fehlgeschlagen, um die ausfhrbare Datei '%s' zu starten: %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Copyright (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Syntax: openbox [Optionen]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -205,23 +207,23 @@ msgstr ""
"\n"
"Optionen:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Diese Hilfe anzeigen und beenden\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Version anzeigen und beenden\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace Den aktuell laufenden Fenstermanager ersetzen\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Keine Verbindung zum Sitzungsmanager aufbauen\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -229,15 +231,20 @@ msgstr ""
"\n"
"Nachrichten an eine laufende Openbox-Instanz weiterleiten:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Openbox's Konfiguration neu laden\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Openbox neu starten\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -245,25 +252,25 @@ msgstr ""
"\n"
"Debugging Optionen:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync im Synchronisierungsmodus starten\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Debugging-Informationen anzeigen\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
-" --debug-focus Debugging-Informationen frs Fokus-Handling anzeigen\n"
+" --debug-focus Debugging-Informationen fr's Fokus-Handling anzeigen\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr ""
-" --debug-xinerama Anzeige in knstliche Xinerama Bildschirme aufteilen\n"
+" --debug-xinerama Anzeige in knstliche Xinerama-Bildschirme aufteilen\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -272,27 +279,27 @@ msgstr ""
"\n"
"Bitte melden Sie Bugreports an: %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Ungltiges Kommandozeilen Argument '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "Ein Fenstermanager luft bereits auf Bildschirm %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
-msgstr "Konnte die Fenstermanager auswahl auf Bildschirm %d nicht reservieren"
+msgstr "Konnte die Fenstermanagerauswahl auf Bildschirm %d nicht reservieren"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "Der Fenstermanager auf Bildschirm %d beendet sich nicht"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "desktop %i"
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index 88d175d7..1bf3d1ea 100644
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -32,8 +32,8 @@ msgid ""
msgstr ""
"Project-Id-Version: openbox 3.999.0\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
-"PO-Revision-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"PO-Revision-Date: 2007-11-12 19:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -51,27 +51,27 @@ msgstr "Failed to convert the path ‘[1m%s[0m’ from utf8"
msgid "Failed to execute '%s': %s"
msgstr "Failed to execute '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Go there..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "Manage desktops"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "_Add new desktop"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "_Remove last desktop"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Windows"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Desktops"
@@ -103,39 +103,39 @@ msgstr "_Send to desktop"
msgid "Client menu"
msgstr "Client menu"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "R_estore"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "_Move"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "Resi_ze"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Ico_nify"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Ma_ximize"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "_Roll up/down"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "Un/_Decorate"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "_Close"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Invalid button ‘[1m%s[0m’ specified in config file"
@@ -178,49 +178,49 @@ msgstr "Invalid button ‘[1m%s[0m’ in mouse binding"
msgid "Invalid context '%s' in mouse binding"
msgstr "Invalid context ‘[1m%s[0m’ in mouse binding"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Unable to change to home directory '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "Failed to open the display from the DISPLAY environment variable."
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Failed to initialize the obrender library."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "X server does not support locale."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "Cannot set locale modifiers for the X server."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr "Unable to find a valid config file, using some simple defaults"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Unable to load a theme."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "Restart failed to execute new executable '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Copyright (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Syntax: openbox [options]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -228,23 +228,23 @@ msgstr ""
"\n"
"Options:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Display this help and exit\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Display the version and exit\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace Replace the currently running window manager\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Disable connection to the session manager\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -252,15 +252,19 @@ msgstr ""
"\n"
"Passing messages to a running Openbox instance:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Reload Openbox's configuration\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Restart Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+msgid " --exit Exit Openbox\n"
+msgstr " --exit Exit Openbox\n"
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -268,23 +272,23 @@ msgstr ""
"\n"
"Debugging options:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Run in synchronous mode\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Display debugging output\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr " --debug-focus Display debugging output for focus handling\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama Split the display into fake xinerama screens\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -293,27 +297,27 @@ msgstr ""
"\n"
"Please report bugs at %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Invalid command line argument ‘[1m%s[0m’\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "A window manager is already running on screen %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "Could not acquire window manager selection on screen %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "The WM on screen %d is not exiting"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "desktop %i"
diff --git a/po/en@quot.po b/po/en@quot.po
index 6496f912..acc49c07 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -29,8 +29,8 @@ msgid ""
msgstr ""
"Project-Id-Version: openbox 3.999.0\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
-"PO-Revision-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"PO-Revision-Date: 2007-11-12 19:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -48,27 +48,27 @@ msgstr "Failed to convert the path ‘%s’ from utf8"
msgid "Failed to execute '%s': %s"
msgstr "Failed to execute '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Go there..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "Manage desktops"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "_Add new desktop"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "_Remove last desktop"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Windows"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Desktops"
@@ -100,39 +100,39 @@ msgstr "_Send to desktop"
msgid "Client menu"
msgstr "Client menu"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "R_estore"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "_Move"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "Resi_ze"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Ico_nify"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Ma_ximize"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "_Roll up/down"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "Un/_Decorate"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "_Close"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Invalid button ‘%s’ specified in config file"
@@ -175,49 +175,49 @@ msgstr "Invalid button ‘%s’ in mouse binding"
msgid "Invalid context '%s' in mouse binding"
msgstr "Invalid context ‘%s’ in mouse binding"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Unable to change to home directory '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "Failed to open the display from the DISPLAY environment variable."
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Failed to initialize the obrender library."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "X server does not support locale."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "Cannot set locale modifiers for the X server."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr "Unable to find a valid config file, using some simple defaults"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Unable to load a theme."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "Restart failed to execute new executable '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Copyright (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Syntax: openbox [options]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -225,23 +225,23 @@ msgstr ""
"\n"
"Options:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Display this help and exit\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Display the version and exit\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace Replace the currently running window manager\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Disable connection to the session manager\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -249,15 +249,19 @@ msgstr ""
"\n"
"Passing messages to a running Openbox instance:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Reload Openbox's configuration\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Restart Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+msgid " --exit Exit Openbox\n"
+msgstr " --exit Exit Openbox\n"
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -265,23 +269,23 @@ msgstr ""
"\n"
"Debugging options:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Run in synchronous mode\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Display debugging output\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr " --debug-focus Display debugging output for focus handling\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama Split the display into fake xinerama screens\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -290,27 +294,27 @@ msgstr ""
"\n"
"Please report bugs at %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Invalid command line argument ‘%s’\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "A window manager is already running on screen %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "Could not acquire window manager selection on screen %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "The WM on screen %d is not exiting"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "desktop %i"
diff --git a/po/es.po b/po/es.po
index 28b23469..bd6817b0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-07-21 21:26+0200\n"
"Last-Translator: David Merino \n"
"Language-Team: None\n"
@@ -27,27 +27,27 @@ msgstr "Falló al convertir el path '%s' desde utf8"
msgid "Failed to execute '%s': %s"
msgstr "Falló al ejecutar '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Ir ahí..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "Administrar escritorios"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "_Añadir un nuevo escritorio"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "_Remover el último escritorio"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Ventanas"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Escritorios"
@@ -79,39 +79,39 @@ msgstr "_Enviar a escritorio"
msgid "Client menu"
msgstr "Menú del cliente"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "Rest_aurar"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "_Mover"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "Redimen_sionar"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Mi_nimizar"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Ma_ximizar"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "En/Desen_rollar"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "_Decorar"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "_Cerrar"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Botón invalido '%s' especificado en el archivo de configuración"
@@ -154,51 +154,51 @@ msgstr "Botón inválido '%s' en mouse binding"
msgid "Invalid context '%s' in mouse binding"
msgstr "Contexto inválido '%s' en mouse binding"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "No es posible cambiar al directorio home '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "Falló abrir la pantalla desde la variable de entorno DISPLAY"
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Falló la inicialización de la librería obrender"
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "El servidor X no soporta locale."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "No se puede establecer los modificadores locale para el servidor X."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
"No es posible encontrar un archivo de configuración valido, usando algunos "
"por defecto"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "No es posible cargar el tema."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "Reiniciada falló en ejecutar nuevo ejecutable '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Copyright (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Sintaxis: openbox [opciones]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -206,26 +206,26 @@ msgstr ""
"\n"
"Opciones\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Muestra esta ayuda y sale\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Muestra la versión y sale\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr ""
" --replace Remplaza el gestor de ventanas que esta corriendo "
"actualmente\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr ""
" --sm-disable Deshabilita la conexión con el gestor de sesión\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -233,15 +233,20 @@ msgstr ""
"\n"
"Pasando mensajes a la instancia que esta corriendo de Openbox:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Recarga la configuración de Openbox\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Reinicia Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -249,25 +254,25 @@ msgstr ""
"\n"
"Opciones de depuración:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Correr en modo sincrónico\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Mostrar salida del depurador\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
" --debug-focus Mostrar salida del depurador para focus handling\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr ""
" --debug-xinerama Separar la pantalla en pantallas de xinerama falsas\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -276,28 +281,28 @@ msgstr ""
"\n"
"Por favor reportar errores a %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Argumento de linea de comando inválido '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "Un gestor de ventanas ya esta corriendo en la pantalla %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr ""
"No se pudo obtener el gestor de ventanas para la selección de pantalla %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "El WM en la pantalla %d no esta saliendo"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "Escritorio %i"
diff --git a/po/et.po b/po/et.po
index 3a697f3c..983eead1 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-07-20 16:54+0200\n"
"Last-Translator: Andres Järv \n"
"Language-Team: Estonian \n"
@@ -26,27 +26,27 @@ msgstr "Raja '%s' ümberkodeerimine UTF8-st ebaõnnestus"
msgid "Failed to execute '%s': %s"
msgstr "'%s' käivitamine ebaõnnestus: %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Mine sinna..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "Halda töölaudu"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "_Lisa uus töölaud"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "_Eemalda viimane töölaud"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Aknad"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Töölauad"
@@ -78,39 +78,39 @@ msgstr "_Saada töölauale"
msgid "Client menu"
msgstr "Kliendi menüü"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "_Taasta"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "_Liiguta"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "Muuda _suurust"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Muuda _ikooniks"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Ma_ksimeeri"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "_Rulli üles/alla"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "Äär_ed sisse/välja"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "S_ulge"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Vigane nupp '%s' määratletud konfiguratsioonifailis"
@@ -153,51 +153,51 @@ msgstr "Vigane nupp '%s' hiire kiirklahvides"
msgid "Invalid context '%s' in mouse binding"
msgstr "Vigane kontekst '%s' hiire kiirklahvides"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Ei suudetud siseneda kodukataloogi '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "DISPLAY keskkonnamuutujas oleva ekraani avamine ebaõnnestus."
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Obrender-damisteegi käivitamine ebaõnnestus."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "X server ei toeta lokaati."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "Ei suudetud sättida lokaadimuutujaid X serveri jaoks."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
"Ei suudetud leida kehtivat konfiguratsioonifaili, kasutatakse lihtsaid "
"vaikimisi seadeid"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Ei suudetud laadida teemat."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "Taaskäivitusel ebaõnnestus uue käivitusfaili '%s' käivitamine: %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Autoriõigused (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Süntaks: openbox [seaded]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -205,23 +205,23 @@ msgstr ""
"\n"
"Seaded:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Selle abi kuvamine ja väljumine\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Versiooni kuvamine ja väljumine\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace Hetkel töötava aknahalduri asendamine\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Seansihalduriga ühenduse keelamine\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -229,15 +229,20 @@ msgstr ""
"\n"
"Jooksvale Openboxi seansile sõnumite edastamine:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Openboxi konfiguratsioon uuesti laadimine\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Openboxi taaskäivitamine\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -245,23 +250,23 @@ msgstr ""
"\n"
"Silumise seaded:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Sünkroonselt jooksutamine\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Silumisväljundi kuvamine\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr " --debug-focus Fookusekäsitluse siluriväljundi kuvamine\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama Ekraani võlts-Xinerama ekraanideks jagamine\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -270,27 +275,27 @@ msgstr ""
"\n"
"Palun teata vigadest siia %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Vigane käsurea argument '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "Ekraanil %d juba jookseb aknahaldur"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "Ei suuda hankida aknahaldurite loetelu ekraanil %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "Aknahaldur ekraanil %d ei sulgu"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "töölaud %i"
diff --git a/po/fi.po b/po/fi.po
index a3c9126e..d2d5e240 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the openbox package.
# Pauli Virtanen , 2005.
# Lauri Hakko, 2007.
+# Elias Julkunen , 2007.
#
msgid ""
msgstr ""
"Project-Id-Version: openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
-"PO-Revision-Date: 2007-07-20 17:38+0200\n"
-"Last-Translator: Lauri Hakko\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"PO-Revision-Date: 2007-10-22 15:58+0200\n"
+"Last-Translator: Elias Julkunen \n"
"Language-Team: None\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,27 +27,27 @@ msgstr "Polun muuntaminen utf8:sta epäonnistui: '%s'"
msgid "Failed to execute '%s': %s"
msgstr "Ohjelman suorittaminen epäonnistui '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Näytä tämä..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "Työtilojen hallinta"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "_Lisää työtila"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "_Poista viimeisin työtila"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Ikkunat"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Työtilat"
@@ -60,7 +61,7 @@ msgstr "_Kerros"
#: openbox/client_menu.c:365
msgid "Always on _top"
-msgstr "Aina _päällimmäinen"
+msgstr "Aina _päällimmäisenä"
#: openbox/client_menu.c:366
msgid "_Normal"
@@ -68,7 +69,7 @@ msgstr "_Tavallinen"
#: openbox/client_menu.c:367
msgid "Always on _bottom"
-msgstr "Aina _alimmainen"
+msgstr "Aina _alimmaisena"
#: openbox/client_menu.c:370
msgid "_Send to desktop"
@@ -78,66 +79,66 @@ msgstr "_Lähetä työtilaan"
msgid "Client menu"
msgstr "Ikkunan valikko"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "_Palauta"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "S_iirrä"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "_Muuta kokoa"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Pie_nennä"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Suurenn_a"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
-msgstr "Rullaa ylös/alas"
+msgstr "Rullaa _ylös/alas"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
-msgstr "(Epä)reunusta"
+msgstr "(Epä)_reunusta"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "_Sulje"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
-msgstr "Virheellinen painike '%s' määritelty konfiguraatio tiedostossa"
+msgstr "Virheellinen painike '%s' määritetty asetustiedostossa"
#: openbox/keyboard.c:156
msgid "Conflict with key binding in config file"
-msgstr "Päällekäisiä key bindejä konfiguraatio tiedostossa"
+msgstr "Päällekäisiä näppäinsidontoja asetustiedostossa"
#: openbox/menu.c:103 openbox/menu.c:111
#, c-format
msgid "Unable to find a valid menu file '%s'"
-msgstr "Toimivaa menu tiedostoa ei löytynyt '%s'"
+msgstr "Toimivaa valikkotiedostoa ei löytynyt '%s'"
#: openbox/menu.c:171
#, c-format
msgid "Failed to execute command for pipe-menu '%s': %s"
-msgstr "Putki-menun komennon suorittaminen epäonnistui '%s': %s"
+msgstr "Putkivalikon komennon suorittaminen epäonnistui '%s': %s"
#: openbox/menu.c:185
#, c-format
msgid "Invalid output from pipe-menu '%s'"
-msgstr "Virheellinen tulos putki-menusta '%s'"
+msgstr "Virheellinen tulos putkivalikosta '%s'"
#: openbox/menu.c:198
#, c-format
msgid "Attempted to access menu '%s' but it does not exist"
-msgstr "Menun '%s' lukemista yritettiin mutta sitä ei ole olemassa"
+msgstr "Valikon '%s' lukemista yritettiin, mutta sitä ei ole olemassa"
#: openbox/menu.c:368 openbox/menu.c:369
msgid "More..."
@@ -146,120 +147,127 @@ msgstr "Lisää..."
#: openbox/mouse.c:349
#, c-format
msgid "Invalid button '%s' in mouse binding"
-msgstr "Virheellinen nappi '%s' hiiribindeissä"
+msgstr "Virheellinen nappi '%s' hiirisidonnoissa"
#: openbox/mouse.c:355
#, c-format
msgid "Invalid context '%s' in mouse binding"
-msgstr "Virheellinen asiayhteys '%s' hiiribindeissä"
+msgstr "Virheellinen asiayhteys '%s' hiirisidonnoissa"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
-msgstr "Kotihakemistoon vaihtaminen epäonnistui '%s': '%s'"
+msgstr "Kotihakemistoon '%s' vaihtaminen epäonnistui: '%s'"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
-msgstr ""
+msgstr "Näytön avaaminen DISPLAY-muuttujasta epäonnistui."
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
-msgstr "Obrender kirjaston käynnistäminen epäonnistui"
+msgstr "Obrender kirjaston käynnistäminen epäonnistui."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
-msgstr "X serveri ei tue localea"
+msgstr "X-palvelin ei tue kieliasetusta"
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
-msgstr ""
+msgstr "Lokaalimuttujia ei voitu tehdä X-palvelimelle."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
-"Oikeanlaista konfiguraation tiedostoa ei löytynyt, käytetään joitain "
-"yksinkertaisia oletusarvoja"
+"Validia asetustiedostoa ei löytynyt, käytetään joitain yksinkertaisia "
+"oletusarvoja"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Teeman lataaminen epäonnistui"
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "Uudelleenkäynnistyi epäonnistui käynnistämään uutta ohjelmaa '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Tekijänoikeudet (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
-msgstr "Syntaksi: openbox [ominaisuudet]\n"
+msgstr "Syntaksi: openbox [valitsin]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
msgstr ""
"\n"
-"Ominaisuudet:\n"
+"Käyttö:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
-msgstr " --help Näytä tämä apu ja sulje\n"
+msgstr " --help Näytä tämä ohje ja sulje\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Näytä versio ja sulje\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
-msgstr " --replace Korvaa päällä oleva window manager\n"
+msgstr " --replace Korvaa käynnissä oleva ikkunakäsittelijä\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
-msgstr " --sm-disable Estä yhteys session manageriin\n"
+msgstr " --sm-disable Estä yhteys istuntojen hallintaan\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
msgstr ""
"\n"
-"Lähetetään viestejä päällä olevaan Openboxiin\n"
+"Anna viestejä käynnissä olevalle Openboxille:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
-msgstr " --reconfigure Lataa Openboxin konfiguraation uudelleen\n"
+msgstr " --reconfigure Lataa Openboxin asetustiedosto uudelleen\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Käynnistä Openbox uudelleen\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
msgstr ""
+"\n"
+"Virheenjäljitysasetukset:\n"
+
+#: openbox/openbox.c:494
+msgid " --sync Run in synchronous mode\n"
+msgstr " --sync Aja synkronisointi-tilassa\n"
+
+#: openbox/openbox.c:495
+msgid " --debug Display debugging output\n"
+msgstr " --debug Näytä vianjäljitystuloste\n"
#: openbox/openbox.c:496
-msgid " --sync Run in synchronous mode\n"
-msgstr " --sync aja synkroni tilassa\n"
-
-#: openbox/openbox.c:497
-msgid " --debug Display debugging output\n"
-msgstr ""
-
-#: openbox/openbox.c:498
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr ""
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -268,27 +276,27 @@ msgstr ""
"\n"
"Ilmoita virheistä: %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
-msgstr "Virheellinen komentorivi käsky '%s'\n"
+msgstr "Virheellinen valitsin '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
-msgstr ""
+msgstr "Ikkunakäsittelijä on jo käynnissä näytöllä %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr ""
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr ""
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "työtila %i"
@@ -296,22 +304,22 @@ msgstr "työtila %i"
#: openbox/session.c:103
#, c-format
msgid "Unable to make directory '%s': %s"
-msgstr "Hakemiston \"%s\" luonti epäonnistui: %s"
+msgstr "Hakemiston '%s' luonti epäonnistui: %s"
#: openbox/session.c:451
#, c-format
msgid "Unable to save the session to '%s': %s"
-msgstr ""
+msgstr "Istuntoa ei voitu tallentaa hakemistoo '%s': %s"
#: openbox/session.c:583
#, c-format
msgid "Error while saving the session to '%s': %s"
-msgstr ""
+msgstr "Virhe tallennettaessa istuntoa hakemistoon '%s': %s"
#: openbox/startupnotify.c:237
#, c-format
msgid "Running %s\n"
-msgstr ""
+msgstr "Suoritetaan %s\n"
#: openbox/translate.c:58
#, c-format
@@ -326,7 +334,7 @@ msgstr ""
#: openbox/translate.c:142
#, c-format
msgid "Invalid key name '%s' in key binding"
-msgstr ""
+msgstr "Virheellinen näppäin '%s' pikanäppäimissä"
#: openbox/translate.c:148
#, c-format
@@ -336,10 +344,4 @@ msgstr ""
#: openbox/xerror.c:39
#, c-format
msgid "X Error: %s"
-msgstr "X virhe: %s"
-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Virheellinen toiminto '%s'. Toimintoa ei ole olemassa"
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Toiminnon virheellinen käyttö '%s'. Toiminto ohitetaan"
+msgstr "X-virhe: %s"
diff --git a/po/fr.po b/po/fr.po
old mode 100755
new mode 100644
index da6cde77..13a77f79
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,52 +1,54 @@
# French translation of Openbox.
# Copyright (C) 2004 Mikael Magnusson
# This file is distributed under the same license as the Openbox package.
+#
# tioui , 2004.
# Cyrille Bagard , 2007.
-#
+# Jacques BON , 2007.
+#
msgid ""
msgstr ""
-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 00:03-0400\n"
-"PO-Revision-Date: 2007-05-21 00:53+0200\n"
-"Last-Translator: Cyrille Bagard \n"
-"Language-Team: French \n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"PO-Revision-Date: 2007-08-17 22:25+0200\n"
+"Last-Translator: Jacques BON \n"
+"Language-Team: franais \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
#: openbox/actions/execute.c:88
#, c-format
msgid "Failed to convert the path '%s' from utf8"
-msgstr "Echec de la conversion du chemin '%s' depuis l'UTF-8"
+msgstr "chec de la conversion du chemin '%s' depuis l'UTF-8"
#: openbox/actions/execute.c:97 openbox/actions/execute.c:115
#, c-format
msgid "Failed to execute '%s': %s"
-msgstr "Echec de l'excution de '%s': %s"
+msgstr "chec de l'excution de '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Aller ..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
-msgstr "Gestion des bureaux"
+msgstr "Grer les bureaux"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
-msgstr "_Ajouter un nouveau bureau"
+msgstr "_Ajouter un bureau"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
-msgstr "Supp_rimer le dernier bureau"
+msgstr "_Supprimer le dernier bureau"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Fentres"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Bureaux"
@@ -56,11 +58,11 @@ msgstr "Tous les bureaux"
#: openbox/client_menu.c:360
msgid "_Layer"
-msgstr "Disp_osition"
+msgstr "_Disposition"
#: openbox/client_menu.c:365
msgid "Always on _top"
-msgstr "Toujours au _premier plan"
+msgstr "_Toujours au premier plan"
#: openbox/client_menu.c:366
msgid "_Normal"
@@ -72,45 +74,45 @@ msgstr "Toujours en _arri
#: openbox/client_menu.c:370
msgid "_Send to desktop"
-msgstr "Envoyer vers le _bureau"
+msgstr "En_voyer vers le bureau"
#: openbox/client_menu.c:374
msgid "Client menu"
msgstr "Menu de la fentre"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "R_estaurer"
-#: openbox/client_menu.c:388
-msgid "_Move"
-msgstr "_Dplacer"
-
-#: openbox/client_menu.c:390
-msgid "Resi_ze"
-msgstr "Redimen_sionner"
-
#: openbox/client_menu.c:392
+msgid "_Move"
+msgstr "D_placer"
+
+#: openbox/client_menu.c:394
+msgid "Resi_ze"
+msgstr "Red_imensionner"
+
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Ico_nifier"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Ma_ximiser"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "En/D_rouler"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "Ne pas/D_corer"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "_Fermer"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Bouton indiqu dans le fichier de configuration '%s' invalide"
@@ -141,7 +143,7 @@ msgstr "Tentative d'acc
#: openbox/menu.c:368 openbox/menu.c:369
msgid "More..."
-msgstr "D'avantage..."
+msgstr "Davantage..."
#: openbox/mouse.c:349
#, c-format
@@ -153,54 +155,54 @@ msgstr "Bouton '%s' invalide dans le param
msgid "Invalid context '%s' in mouse binding"
msgstr "Contexte '%s' invalide dans le paramtrage de la souris"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Impossible de changer vers le rpertoire de l'utilisateur '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr ""
-"Echec de l'ouverture de l'affichage depuis la variable d'environnement "
+"chec de l'ouverture de l'affichage depuis la variable d'environnement "
"DISPLAY."
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
-msgstr "Echec de l'initialisation de la bibliothque obrender."
+msgstr "chec de l'initialisation de la bibliothque obrender."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "Le serveur X ne supporte pas la localisation."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr ""
"Impossible d'appliquer les modifications de localisation pour le serveur X."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
"Impossible de trouver un fichier de configuration valide ; utilisation de "
"dfauts simples"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Impossible de charger un thme."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "Le redmarrage n'a pas russi excuter le nouvel excutable '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Copyright (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Syntaxe: openbox [options]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -208,26 +210,26 @@ msgstr ""
"\n"
"Options:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Affiche cette aide et quitte\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Affiche la version et quitte\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr ""
" --replace Remplace le gestionnaire de fentres actuellement en "
"usage\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr ""
" --sm-disable Dsactive la connexion au gestionnaire de sessions\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -235,15 +237,20 @@ msgstr ""
"\n"
"Passage de messages l'instance d'Openbox en marche:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Recharge la configuration d'Openbox\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Redmarre Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -251,26 +258,26 @@ msgstr ""
"\n"
"Options de dboguage:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Excute en mode synchrone\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Affiche la sortie de dboguage\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
" --debug-focus Affiche la sortie de dboguage pour la gestion du "
"focus\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr ""
" --debug-xinerama Dcoupe l'affichage en crans xinerama factices\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -279,30 +286,30 @@ msgstr ""
"\n"
"Veuillez soumettre les rapports de bogues %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Argument de la ligne de commande invalide '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "Un gestionnaire de fentres est dj lanc sur l'cran %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr ""
"Impossible d'acqurir la slection du gestionnaire de fentres pour l'cran %"
"d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr ""
"Le gestionnaire de fentres sur l'cran %d n'est pas en train de quitter"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "bureau %i"
@@ -325,7 +332,7 @@ msgstr "Erreur lors de la sauvegarde de la session de '%s': %s"
#: openbox/startupnotify.c:237
#, c-format
msgid "Running %s\n"
-msgstr "Exccution de %s\n"
+msgstr "Excution de %s\n"
#: openbox/translate.c:58
#, c-format
@@ -353,9 +360,3 @@ msgstr "La touche demand
#, c-format
msgid "X Error: %s"
msgstr "Erreur X: %s"
-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Action demande '%s' invalide. Aucune action de ce type n'existe."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Utilisation invalide de l'action '%s'. L'action sera ignore."
diff --git a/po/it.po b/po/it.po
index 1a1124b5..2a57e9d8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,13 +2,13 @@
# Copyright (C) 2007 Davide Truffa
# This file is distributed under the same license as the openbox package.
# Davide Truffa , 2007.
-#
-#
+#
+#
msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-07-20 15:18+0200\n"
"Last-Translator: Davide Truffa \n"
"Language-Team: Italian \n"
@@ -26,27 +26,27 @@ msgstr "Impossibile convertire il percorso utf8 '%s'"
msgid "Failed to execute '%s': %s"
msgstr "Impossibile eseguire il comando '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Vai a..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "Gestisci i desktop"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "_Aggiungi un nuovo desktop"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "_Rimuovi l'ultimo desktop"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Finestre"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Desktop"
@@ -78,39 +78,39 @@ msgstr "Invia al _desktop"
msgid "Client menu"
msgstr "Menù della finestra"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "_Ripristina"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "_Muovi"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "R_idimensiona"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Mi_nimizza"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Ma_ssimizza"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "A_rrotola"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "Si/No _Decorazioni"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "_Chiudi"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Il pulsante '%s' specificato nel file di configurazione non è valido"
@@ -155,53 +155,53 @@ msgstr "Il pulsante '%s' specificato nelle associazioni mouse non è valido"
msgid "Invalid context '%s' in mouse binding"
msgstr "Il contesto '%s' specificato nelle associazioni mouse non è valido"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Impossibile accedere alla directory home '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "Impossibile accedere al display specificato nella variabile DISPLAY."
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Impossibile inizializzare la libreria obrender."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "Il server X non ha il supporto per la localizzazione."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr ""
"Impossibile impostare la localizzazione dei tasti modificatori per il server "
"X."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
"Impossibile trovare un file di configurazione valido, verranno utilizzate le "
"impostazioni predefinite"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Impossibile caricare un tema."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "Non è stato possibile riavviare il nuovo eseguibile '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr ""
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Sintassi: openbox [opzioni]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -209,23 +209,23 @@ msgstr ""
"\n"
"Opzioni:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Mostra questo messaggio di aiuto ed esce\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Mostra il numero di versione ed esce\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace Sostituisce l'attuale window manager attivo\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Disabilita la connessione al session manager\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -233,15 +233,20 @@ msgstr ""
"\n"
"Inviare messaggi ad un'istanza di Openbox attiva:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Ricarica la configurazione di Openbox\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Riavvia Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -249,25 +254,25 @@ msgstr ""
"\n"
"Opzioni di debug:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Esegue in modalità sincrona\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Mostra le informazioni di debug\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
" --debug-focus Mostra le informazioni di debug sulla gestione del "
"focus\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama Divide lo schermo per simulare xinerama\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -276,27 +281,27 @@ msgstr ""
"\n"
"Segnalate eventuali bug a %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Argomento da linea di comando non valido '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "Un window manager è già attivo sullo schermo %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "Impossibile acquisire la selezione del window manager sullo schermo %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "Il WM sullo schermo %d non è terminato"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "desktop %i"
diff --git a/po/ja.po b/po/ja.po
index a213846a..01ae8714 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-06-07 14:49+0200\n"
"Last-Translator: Ryoichiro Suzuki \n"
"Language-Team: Japanese \n"
@@ -27,27 +27,27 @@ msgstr "パス'%s'を utf8 から変換するのに失敗しました。"
msgid "Failed to execute '%s': %s"
msgstr "'%s'の実行に失敗しました: %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "移動する..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "デスクトップを管理"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "新しくデスクトップを追加(_A)"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "最後のデスクトップを削除(_R)"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "ウィンドウ"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "デスクトップ"
@@ -79,40 +79,40 @@ msgstr "デスクトップに送る(_S)"
msgid "Client menu"
msgstr "クライアントメニュー"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "復元(_E)"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "移動(_M)"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "サイズの変更(_Z)"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "アイコン化(_N)"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "最大化(_X)"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "巻き上げ/展開(_R)"
# not sure about this one
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "非/装飾(_D)"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "閉じる(_C)"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "不正なボタン'%s'が設定ファイルで指定されています。"
@@ -155,134 +155,138 @@ msgstr "マウス割り当てに於いて不正なボタン '%s'"
msgid "Invalid context '%s' in mouse binding"
msgstr "マウス割り当てに於いて不正なコンテクスト '%s'"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "ホームディレクトリ'%s'に移動できません: %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "環境変数 DISPLAY からディスプレイを開くのに失敗しました。"
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "obrender ライブラリの初期化に失敗しました。"
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "Xサーバはロケールをサポートしていません。"
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "Xサーバの為のロケール修飾子を設定できません。"
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr "正当な設定ファイルを見つけられません。単純な初期設定を使います。"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "テーマを読み込めません。"
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "再起動の際新しい実行ファイル'%s'の実行に失敗しました: %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr ""
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr ""
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
msgstr ""
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr ""
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr ""
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr ""
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr ""
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
msgstr ""
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr ""
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr ""
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
msgstr ""
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr ""
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr ""
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr ""
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
"Please report bugs at %s\n"
msgstr ""
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "不正なコマンドライン引数 '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "スクリーン%dでウィンドウマネージャが既に起動しています。"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "スクリーン%dでウィンドウマネージャの選択を取得できませんでした。"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "スクリーン%dのWMが終了しません。"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "デスクトップ%i"
diff --git a/po/nl.po b/po/nl.po
index 8513cc0e..45405883 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,12 +3,12 @@
# This file is distributed under the same license as the openbox package.
# Mark Pustjens , 2007.
# Jochem Kossen , 2007.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-07-12 13:01+0200\n"
"Last-Translator: Jochem Kossen \n"
"Language-Team: Dutch \n"
@@ -26,27 +26,27 @@ msgstr "Converteren van het pad '%s' vanuit utf8 mislukt"
msgid "Failed to execute '%s': %s"
msgstr "Uitvoeren van '%s' mislukt: %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Ga hierheen..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "Beheer bureaubladen"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "_Voeg nieuw bureaublad toe"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "V_erwijder laatste bureaublad"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Vensters"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Bureaubladen"
@@ -78,39 +78,39 @@ msgstr "Verplaats _naar bureaublad"
msgid "Client menu"
msgstr "Venster menu"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "_Herstellen"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "_Verplaatsen"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "_Grootte aanpassen"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "_Iconificeren"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "_Maximaliseren"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "_Op/neerklappen"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "_Vensterrand weghalen/toevoegen"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "_Sluiten"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Ongeldige knop '%s' gespecificeerd in het configuratiebestand"
@@ -153,51 +153,51 @@ msgstr "Ongeldige knop '%s' in muis binding"
msgid "Invalid context '%s' in mouse binding"
msgstr "Ongeldige context '%s' in muis binding"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Pad instellen mislukt naar de thuismap '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "Scherm van de DISPLAY omgevingsvariabele te openen mislukt."
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Initialiseren van de obrender bibliotheek mislukt."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "X server ondersteunt locale niet"
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "Kan de locale bepaling van de X server niet instellen"
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
"Kon geen geldig configuratiebestand vinden, simpele standaardinstellingen "
"worden gebruikt"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Thema laden mislukt."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "Uitvoeren van nieuw programma '%s' tijdens herstart miskukt: %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Copyright (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Syntax: openbox [opties]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -205,23 +205,23 @@ msgstr ""
"\n"
"Opties:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Toon deze helptekst en sluit af\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Toon versie en sluit af\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace Vervang de huidig draaiende window manager\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Verbinding met de sessiebeheerder uitschakelen\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -229,15 +229,20 @@ msgstr ""
"\n"
"Berichten worden naar een draaiende Openbox instantie gestuurd:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Openbox configuratie opnieuw laden\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Herstart Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -245,23 +250,23 @@ msgstr ""
"\n"
"Debugging opties:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Start in synchrone modus\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Debuguitvoer weergeven\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr " --debug-focus Debug uitvoer voor focusafhandeling weergeven\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama Splits het scherm in nep xinerama schermen\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -270,27 +275,27 @@ msgstr ""
"\n"
"Gelieve bugs te melden bij %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Onbekende optie '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "Er draait al een window manager op scherm %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "Kon window manager selectie op scherm %d niet verkrijgen"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "De window manager op scherm %d sluit zichzelf niet af"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "bureaublad %i"
diff --git a/po/no.po b/po/no.po
index 7bdd1848..4f801943 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-05-20 18:41+0200\n"
"Last-Translator: Michael Kjelbergvik Thung \n"
"Language-Team: None\n"
@@ -25,27 +25,27 @@ msgstr "Feil ved konvertering av '%s' fra utf8 "
msgid "Failed to execute '%s': %s"
msgstr "Kunne ikke kjøre '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Gå dit..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "Behandle skrivebord"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "_Nytt skrivebord"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "_Fjern siste skrivebord"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Vinduer"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Skrivebord"
@@ -77,39 +77,39 @@ msgstr "_Send til"
msgid "Client menu"
msgstr "Klient-meny"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "Tilbak_estill"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "_Flytt"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "Endre s_tørrelse"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "_Minimer"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Ma_ximer"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "_Rull opp/ned"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "Fjern/Legg til _dekorasjon"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "_Lukk"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Ugyldig tast '%s' spesifisert i konfigurasjonsfilen"
@@ -152,49 +152,49 @@ msgstr "Ugyldig knapp '%s' i binding for mus"
msgid "Invalid context '%s' in mouse binding"
msgstr "Ugyldig innhold '%s' i binding for mus"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Kan ikke endre til hjemmekatalogen '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "Kunne ikke åpne displayet fra DISPLAY-miljøvariabelen"
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Kunne ikke starte obrender-biblioteket."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "X-serveren støtter ikke lokalisering."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "Kan ikke stille inn lokaliseringsmodifikatorene for X-serveren."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr "Kunne ikke finne en gyldig konfigurasjonsfil, bruker standardverdier"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Kan ikke laste et tema."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "Restart kunne ikke starte nytt program '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr ""
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Syntax: openbox [alternativer\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -202,23 +202,23 @@ msgstr ""
"\n"
"Alternativ:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Vise denne hjelpeteksten og avslutt\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Vis versjonsnummeret og avslutt\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace Erstatt den kjørende vindusbehandleren\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Deaktiver tilkobling til sesjonsbehandleren\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -226,15 +226,20 @@ msgstr ""
"\n"
"Sender beskjeder til en kjørende Openbox-instans:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Oppdater Openbox' konfigurasjon\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Start Openbox på nytt\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -242,23 +247,23 @@ msgstr ""
"\n"
"Debug-alternativ:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Kjør i synkron-modus\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Vis debuggingsinformasjon\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr " --debug-focus Vis debuggingsinformasjon for fokus-håndtering\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " -debug-xinerama Splitt displayet for falske xinerama-skjermer\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -267,27 +272,27 @@ msgstr ""
"\n"
"Vennligst rapporter bugs til %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Ugyldig kommandolinje-argument '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "En vindusbehandler kjører allerede på skjerm %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "Kunne ikke hendte vindusbehandlerens markering på skjerm %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "Vindusbehandleren på skjerm %d vil ikke avslutte"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "skrivebord %i"
diff --git a/po/openbox.pot b/po/openbox.pot
index d306f86d..3031b4f8 100644
--- a/po/openbox.pot
+++ b/po/openbox.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -26,27 +26,27 @@ msgstr ""
msgid "Failed to execute '%s': %s"
msgstr ""
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr ""
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr ""
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr ""
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr ""
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr ""
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr ""
@@ -78,39 +78,39 @@ msgstr ""
msgid "Client menu"
msgstr ""
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr ""
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr ""
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr ""
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr ""
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr ""
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr ""
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr ""
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr ""
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr ""
@@ -153,134 +153,138 @@ msgstr ""
msgid "Invalid context '%s' in mouse binding"
msgstr ""
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr ""
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr ""
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr ""
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr ""
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr ""
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr ""
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr ""
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr ""
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr ""
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
msgstr ""
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr ""
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr ""
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr ""
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr ""
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
msgstr ""
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr ""
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr ""
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
msgstr ""
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr ""
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr ""
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr ""
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
"Please report bugs at %s\n"
msgstr ""
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr ""
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr ""
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr ""
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr ""
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 7bf9bb7c..7a1514b8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-07-14 00:43+0200\n"
"Last-Translator: Piotr Drąg \n"
"Language-Team: Polish \n"
@@ -27,27 +27,27 @@ msgstr "Nie można przekonwertować ścieżki '%s' z UTF-8"
msgid "Failed to execute '%s': %s"
msgstr "Wykonanie '%s' nie powiodło się: %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Przejdź..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "Zarządzaj pulpitami"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "Dod_aj nowy pulpit"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "_Usuń ostatni pulpit"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Okna"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Pulpity"
@@ -79,39 +79,39 @@ msgstr "Wyślij na p_ulpit"
msgid "Client menu"
msgstr "Menu klienta"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "P_rzywróć"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "_Przesuń"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "Zmień _rozmiar"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Zmi_nimalizuj"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Zma_ksymalizuj"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "_Zwiń/Rozwiń"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "Wyświetl/ukryj _dekoracje"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "Z_amknij"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Nieprawidłowy klawisz '%s' określony w pliku konfiguracyjnym"
@@ -154,53 +154,53 @@ msgstr "Nieprawidłowy klawisz '%s' w skrócie myszy"
msgid "Invalid context '%s' in mouse binding"
msgstr "Nieprawidłowy kontekst '%s' w skrócie myszy"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Nie można przejść do katalogu domowego '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "Otwarcie ekranu ze zmiennej środowiskowej DISPLAY nie powiodło się."
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Zainicjowanie biblioteki obrender nie powiodło się."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "Serwer X nie obsługuje ustawień lokalnych."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "Nie można ustawić modyfikatorów lokalnych dla serwera X."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
"Nie można znaleźć prawidłowego pliku konfiguracyjnego, używanie "
"domyślnychwartości"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Nie można wczytać motywu."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr ""
"Wykonanie nowego pliku wykonywalnego '%s' podczas ponownego uruchomienianie "
"powiodło się: %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Copyright (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Składnia: openbox [opcje]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -208,23 +208,23 @@ msgstr ""
"\n"
"Opcje:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Wyświetla tę pomoc i kończy\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Wyświetla wersję i kończy\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace Zastępuje aktualnie działający menedżer okien\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Nie tworzy połączenia z menedżerem sesji\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -232,15 +232,20 @@ msgstr ""
"\n"
"Przekazywanie komunikatów do działającej instancji Openboksa:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Ponownie wczytuje pliki konfiguracyjne\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Ponownie uruchamia Openboksa\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -248,24 +253,24 @@ msgstr ""
"\n"
"Opcje debugowania:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Uruchamia w trybie synchronicznym\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Wyświetla informacje o debugowaniu\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
" --debug-focus Wyświetla wyjście debugowania obsługi aktywacji\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama Dzieli ekran na sztuczne ekrany xineramy\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -274,27 +279,27 @@ msgstr ""
"\n"
"Proszę zgłaszać błędy (w języku angielskim) pod adresem %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Nieprawidłowy argument wiersza poleceń '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "Menedżer okien jest już uruchomiony na ekranie %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "Nie można uzyskać wyboru menedżera okien na ekranie %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "Menedżer okien na ekranie %d nie kończy działania"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "pulpit %i"
diff --git a/po/pt.po b/po/pt.po
index 9efac022..445c3d2b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-07-21 18:03+0200\n"
"Last-Translator: Althaser \n"
"Language-Team: None\n"
@@ -26,27 +26,27 @@ msgstr "Falha a converter o caminho '%s' do utf8"
msgid "Failed to execute '%s': %s"
msgstr "Falha a executar '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Ir para..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "Gerir reas de trabalho"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "_Adicionar nova rea de trabalho"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "_Remover a ltima rea de trabalho"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Janelas"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "reas de trabalho"
@@ -78,39 +78,39 @@ msgstr "Enviar para
msgid "Client menu"
msgstr "Menu de clientes"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "R_estaurar"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "_Mover"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "Redimen_sionar"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Mi_nimizar"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Ma_ximizar"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "En/Desen_rolar"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "Des/_Decorar"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "_Fechar"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Boto invlido '%s' especificado no ficheiro de configurao"
@@ -153,51 +153,51 @@ msgstr "Bot
msgid "Invalid context '%s' in mouse binding"
msgstr "Contexto invlido '%s' no atalho do rato"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Incapaz de mudar para o directrio home '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "Falha a abrir o ecr pela varivel de ambiente DISPLAY."
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Falha a inicializar a biblioteca obrender"
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "O servidor X no suporta o locale."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "No pode definir locales modificados para o servidor X."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
"Incapaz de encontrar um ficheiro de configurao vlido, usando algumas "
"configuraes simples de omisso"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Incapaz de carregar o tema."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "Falha a reiniciar a execuo de um novo executvel '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Direitos de autor (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Sintaxe: openbox [opes]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -205,23 +205,23 @@ msgstr ""
"\n"
"Opes:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Mostra este help e sai\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Mostra a verso e sai\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace Substitui o corrente gestor de janelas\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Desactiva a ligao com o gestor de sesses\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -229,15 +229,20 @@ msgstr ""
"\n"
"Passando mensagens para a solicitao do Openbox em execuo\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Recarrega a configurao do Openbox\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Reinicia o Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -245,25 +250,25 @@ msgstr ""
"\n"
"Opes de depurao\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Executa em modo sincronizado\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Mostra o resultado da depurao\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
" --debug-focus Mostra o resultado da depurao para manipulao em "
"foco\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama Divide o ecr em falsos ecrs xinerama\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -272,27 +277,27 @@ msgstr ""
"\n"
"Por favor reporte erros em %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Argumento invlido na linha de comandos '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "O gestor de janelas j est em execuo no ecr %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "No consegui adequirir o gestor de janelas selecionado no ecr %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "O gestor de janelas no ecr %d no est fechando"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "rea de trabalho %i"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bb3207b3..88f51968 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-07-20 16:43+0200\n"
"Last-Translator: Og Maciel \n"
"Language-Team: Brazilian Portuguese \n"
@@ -27,27 +27,27 @@ msgstr "Falha ao converter o caminho '%s' do utf8"
msgid "Failed to execute '%s': %s"
msgstr "Falha ao executar '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Ir lá..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "Gerenciar áreas de trabalho"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "_Adicionar nova área de trabalho"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "_Remover última área de trabalho"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Janelas"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Áreas de trabalho"
@@ -79,39 +79,39 @@ msgstr "Enviar para área de _trabalho"
msgid "Client menu"
msgstr "Menu do cliente"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "R_estaurar"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "_Mover"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "Redimen_sionar"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Mi_nimizar"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Ma_ximizar"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "(Des)en_rolar"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "(Não) _Decorar"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "_Fechar"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Botão inválido '%s' especificado no arquivo de configuração"
@@ -154,52 +154,52 @@ msgstr "Botão inválido '%s' na associação do mouse"
msgid "Invalid context '%s' in mouse binding"
msgstr "Contexto '%s' inválido na associação do mouse"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Não foi possível mudar para o diretório pessoal '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "Falha ao abrir a tela da variavel de ambiente DISPLAY"
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Falha ao iniciar a biblioteca obrender."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "Servidor X não suporta localização."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr ""
"Não foi possível configurar modificadores de localização para o servidor X."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
"Não foi possível encontrar um arquivo de configuração válido, usando alguns "
"valores padrão simples."
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Não foi possível carregar um tema."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "O comando de reiniciar falhou ao executar novo executável '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Copyright (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Sintaxe: openbox [opções]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -207,24 +207,24 @@ msgstr ""
"\n"
"Opções:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Mostra esta ajuda e sai\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Mostra a versão e sai\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace Substitui o gerenciador de janelas ativo\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr ""
" --sm-disable Desabilita conexão com o gerenciador de sessões\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -232,15 +232,20 @@ msgstr ""
"\n"
"Passando mensagens para uma instância do Openbox em execução:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Recarrega a configuração do Openbox\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Reinicia o Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -248,26 +253,26 @@ msgstr ""
"\n"
"Opções de depuração:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Executa em modo sincronizado\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Mostra saida de depuração\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
" --debug-focus Mostra saída de depuração para manipulação de foco\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr ""
" --debug-xinerama Divide a exibição de telas em telas de xinerama "
"falsas\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -276,28 +281,28 @@ msgstr ""
"\n"
"Por favor reporte erros em %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Argumento de linha de comando inválido '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "Um gerenciador de janelas já está em execução na tela %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr ""
"Não foi possível adquirir a seleção do gerenciador de janelas na tela %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "O gerenciador de janelas na tela %d não está saindo"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "área de trabalho %i"
diff --git a/po/ru.po b/po/ru.po
index f2386ca6..1eef8267 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,17 +2,18 @@
# Copyright (C) 2007 Mikael Magnusson
# This file is distributed under the same license as the openbox package.
# Alexey Remizov , 2004.
+# Nikita Bukhvostov , 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
-"PO-Revision-Date: 2007-05-24 19:41+0100\n"
-"Last-Translator: Pavel Shevchuk \n"
-"Language-Team: Russian \n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"PO-Revision-Date: 2007-08-17 22:36+0200\n"
+"Last-Translator: Nikita Bukhvostov \n"
+"Language-Team: Russian \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: openbox/actions/execute.c:88
@@ -25,27 +26,27 @@ msgstr "Не удалось сконвертировать путь '%s' из ut
msgid "Failed to execute '%s': %s"
msgstr "Не удалось запустить '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Перейти..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
-msgstr ""
+msgstr "Управление рабочими столами"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
-msgstr ""
+msgstr "_Добавить новый рабочий стол"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
-msgstr ""
+msgstr "_Удалить последний рабочий стол"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Окна"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Рабочие столы"
@@ -77,39 +78,39 @@ msgstr "Отправить на рабочий стол(_S)"
msgid "Client menu"
msgstr "Меню клиентов"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "Восстановить(_E)"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "Переместить(_M)"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "Изменить размер(_Z)"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Свернуть(_N)"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Развернуть(_X)"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "Скрутить/Раскрутить(_R)"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "(От)декорировать(_D)"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "Закрыть(_C)"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Некорректная клавиша '%s' упомянута в конфигурационном файле"
@@ -152,51 +153,51 @@ msgstr "Некорректная кнопка '%s' в привязке мыши"
msgid "Invalid context '%s' in mouse binding"
msgstr "Некорректный контекст '%s' в привязке мыши"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Не могу перейти в домашнюю директорию '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "Не могу открыть экран из переменной окружения DISPLAY."
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Не могу инициализировать библиотеку obrender."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "X-сервер не поддерживает локали."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "Не могу установить модификаторы локали X-сервера."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
"Не могу найти корректный конфигурационный файл, использую значения по-"
"умолчанию"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Не могу загрузить тему."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "При перезапуске не удалось запустить исполняемый файл '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Copyright (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Синтаксис: openbox [параметры]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -204,23 +205,23 @@ msgstr ""
"\n"
"Параметры:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Показать эту справку и выйти\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Показать версию и выйти\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace Заменить текущий менеджер окон\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Не соединяться с менеджером сессий\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -228,15 +229,20 @@ msgstr ""
"\n"
"Передаю сообщения запущенной инстанции Openbox:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Перезагрузить конфигурацию Openbox\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Перезапустить Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -244,25 +250,25 @@ msgstr ""
"\n"
"Отладочные параметры:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Запустить в синхронном режиме\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Отображать отладочную информацию\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
" --debug-focus Отображать отладочную информацию об управлении "
"фокусом\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama Разбить экран на фальшивые экраны xinerama\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -271,27 +277,27 @@ msgstr ""
"\n"
"Пожалуйста, сообщайте об ошибках на %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Некорректный командный параметр '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "На экране %d уже запущен менеджер окон"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "Не могу получить выбор менеджера окон на экране %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "Менеджер окон на экране %d не завершается"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "рабочий стол %i"
@@ -340,10 +346,3 @@ msgstr "Запрошенная клавиша '%s' не существует н
#, c-format
msgid "X Error: %s"
msgstr "Ошибка X-сервера: %s"
-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Запрошено некорректное действие '%s'. Нет такого действия."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr ""
-#~ "Некорректное использование действия '%s'. Действие будет проигнорировано."
diff --git a/po/sk.po b/po/sk.po
index 434f809a..d4ba56f0 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,12 +5,12 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Openbox-3.4.2\n"
+"Project-Id-Version: Openbox-3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
-"PO-Revision-Date: 2007-05-27 13:43Central Europe Daylight Time\n"
+"POT-Creation-Date: 2007-08-04 17:42-0400\n"
+"PO-Revision-Date: 2007-12-7 13:43Central Europe Daylight Time\n"
"Last-Translator: Jozef Riha \n"
+"Language-Team: Slovak \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -31,21 +31,21 @@ msgstr "Prejsť na..."
#: openbox/client_list_combined_menu.c:98
msgid "Manage desktops"
-msgstr ""
+msgstr "Správa plôch"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:156
msgid "_Add new desktop"
-msgstr ""
+msgstr "_Pridať novú plochu"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
-msgstr ""
+msgstr "_Odstrániť poslednú plochu"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:152
msgid "Windows"
msgstr "Okná"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Plochy"
@@ -77,39 +77,39 @@ msgstr "_Poslať na plochu"
msgid "Client menu"
msgstr "Menu klienta"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "_Obnoviť"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "Pre_sunúť"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "Z_mena veľkosti"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Do iko_ny"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Ma_ximalizovať"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "Ro/_Zvinúť"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "(Ne)_Dekorovať"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "Z_avrieť"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Neplatné tlačidlo '%s' špecifikované v konfiguračnom súbore"
@@ -152,51 +152,51 @@ msgstr "Neplatné tlačidlo '%s' v priradení myši"
msgid "Invalid context '%s' in mouse binding"
msgstr "Neplatný kontext '%s' v priradení myši"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Nepodarilo sa prejsť do domovského adresára '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "Nepodarilo sa otvoriť displej z premennej prostredia DISPLAY"
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Nepodarilo sa inicializovať knižnicu obrender."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "X server nepodporuje locale."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "Nemôžem nastaviť locale pre X server."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
"Nepodarilo sa nájsť platný konfiguračný súbor, použijem jednoduché "
"implicitné nastavenia"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Nepodarilo sa nahrať tému."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "Reštart zlyhal pri spúšťaní novej binárky '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Copyright (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Syntax: openbox [volby]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -204,24 +204,24 @@ msgstr ""
"\n"
"Volby:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Zobrazi tuto napovedu a skonci\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Zobrazi cislo verzie a skonci\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr ""
" --replace Nahradi momentalne beziace sedenie window manazera\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Vypne spojenie k manazerovi sedenia\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -229,15 +229,15 @@ msgstr ""
"\n"
"Predavanie sprav beziacej instancii Openboxu:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Opatovne nacita konfiguraciu Openboxu\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Restartuje Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
msgid ""
"\n"
"Debugging options:\n"
@@ -245,24 +245,24 @@ msgstr ""
"\n"
"Volby ladenia:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:493
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Spustit v synchronnom mode\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:494
msgid " --debug Display debugging output\n"
msgstr " --debug Zobrazit ladiaci vystup\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:495
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
" --debug-focus Zobrazit ladiaci vystup pre manipulaciu s fokusom\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:496
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama Rozdelit displej na neprave obrazovky xineramy\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:497
#, c-format
msgid ""
"\n"
@@ -271,27 +271,27 @@ msgstr ""
"\n"
"Prosim hlaste chyby na %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:594
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Neplatny parameter prikazoveho riadku '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "Okenny manazer uz bezi na obrazovke %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "Nepodarilo sa získať výber okenného manažéra na obrazovke %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "Okenný manažér na obrazovke %d sa neukončuje"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1080
#, c-format
msgid "desktop %i"
msgstr "plocha %i"
diff --git a/po/sv.po b/po/sv.po
index 7745b7ff..b024d8ed 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-05-22 00:29+0200\n"
"Last-Translator: Mikael Magnusson \n"
"Language-Team: None\n"
@@ -25,27 +25,27 @@ msgstr "Lyckades inte konvertera s
msgid "Failed to execute '%s': %s"
msgstr "Kunde inte exekvera '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "G dit..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "Hantera skrivbord"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "_Lgg till nytt skrivbord"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "_Ta bort sista skrivbordet"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Fnster"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Skrivbord"
@@ -77,39 +77,39 @@ msgstr "_Skicka till skrivbord"
msgid "Client menu"
msgstr "Klientmeny"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "t_erstll"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "_Flytta"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "ndra s_torlek"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Mi_nimera"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Ma_ximera"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "_Rulla upp/ner"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "_Dekorationer"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "Stn_g"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Ogiltig knapp '%s' angiven i konfigurationsfilen"
@@ -152,50 +152,50 @@ msgstr "Ogiltig knapp '%s' i musbindning"
msgid "Invalid context '%s' in mouse binding"
msgstr "Ogiltig kontext '%s' i musbindning"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Kunde inte g till hemkatalogen '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "Kunde inte ppna en display frn miljvariabeln DISPLAY."
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Kunde inte initialisera obrender-biblioteket."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "X-servern stdjer inte lokalisering."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "Kan inte stta lokaliseringsmodifierare fr X-servern."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
"Kunde inte hitta en giltig konfigurationsfil, anvnder enkla standardvrden"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Kunde inte ladda ett tema."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "Restart misslyckades att starta nytt program '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Copyright (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Syntax: openbox [alternativ]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -203,23 +203,23 @@ msgstr ""
"\n"
"Alternativ:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Visa den hr hjlpen och avsluta\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Visa versionen och avsluta\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace Erstt den befintliga fnsterhanteraren\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Avaktivera anslutning till sessionshanteraren\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -227,15 +227,19 @@ msgstr ""
"\n"
"Skicka meddelanden till en exekverande instans av Openbox:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Ladda om Openbox konfiguration\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Starta om Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+msgid " --exit Exit Openbox\n"
+msgstr " --exit Avsluta Openbox\n"
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -243,23 +247,23 @@ msgstr ""
"\n"
"Debug-alternativ:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Kr i synkroniserat lge\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Visa debuginformation\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr " --debug-focus Visa debuginformation fr fokushantering\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama Dela skrmen i simulerade xinerama-skrmar\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -268,27 +272,27 @@ msgstr ""
"\n"
"Rapportera buggar till %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Ogiltigt kommandoradsargument '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "En fnsterhanterare krs redan p skrm %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "Kunde inte erhlla fnsterhanterarmarkeringen p skrm %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "Fnsterhanteraren p skrm %d avslutar inte"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "skrivbord %i"
diff --git a/po/ua.po b/po/ua.po
index 9b2cae57..d4c73a4a 100644
--- a/po/ua.po
+++ b/po/ua.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: openbox 3.4.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-06-16 13:02+0200\n"
"Last-Translator: Dmitriy Moroz \n"
"Language-Team: Ukrainian \n"
@@ -25,27 +25,27 @@ msgstr "Не вдалося сконвертувати шлях '%s' з utf8"
msgid "Failed to execute '%s': %s"
msgstr "Невдалося виконати '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Перейти...."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr ""
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr ""
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr ""
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Вікна"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Стільниці"
@@ -77,39 +77,39 @@ msgstr "Відправити на стільницю(_S)"
msgid "Client menu"
msgstr "Меню клієнтів"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "Відновити(_E)"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "Перемістити(_M)"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "Змінити розмір(_Z)"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Згорнути(_N)"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Розгорнути(_X)"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "Скрутити/Розкрутити(_R)"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "(Від)декорувати(_D)"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "Закрити(_C)"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Некоректна клавіша '%s' вказана у файлі конфігурації"
@@ -152,52 +152,52 @@ msgstr "Некоректна клавіша '%s' в прив'язці клаві
msgid "Invalid context '%s' in mouse binding"
msgstr "Некоректний контекст '%s' в прив'зці клавіш мишки"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Не вдалося перейти в домашню директорію '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "Не вдалося відкрити дисплей зі змінної середовища DISPLAY"
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Не вдалося ініцаілізувати бібліотеку obrender"
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "X-сервер не підтримує локалі"
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "Не можу встановити модифікатори локалі для X-сервера"
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr ""
"Не вдалося знайти коректний файл конфігурації, використовую стандартні "
"налаштування"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Не вдалося загрузити стиль"
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr ""
"При перезавантаженні не вдалося виконати новий виконуваний файл '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Авторські права (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Синтакс: openbox [параметри]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -205,23 +205,23 @@ msgstr ""
"\n"
"Параметри:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Показати цю справку і вийти\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --vesrion Показати версію і вийти\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace Замінити поточний менеджер вікон\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Не з'єднуватися з сесійним менеджером\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -229,15 +229,20 @@ msgstr ""
"\n"
"Передаю повідомлення процесу Openbox що виконується\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Перезавантажити конфігурацію Openbox'у\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Перезапустити Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -245,24 +250,24 @@ msgstr ""
"\n"
"Налагоджувальні параметри\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Запустити в синхронному режимі\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Показувати інформацію налагоджування\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
" --debug-focus Показувати інформацію налагоджування для уравління\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama Розбити екран на фальшиві екрани xinerama\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -271,27 +276,27 @@ msgstr ""
"\n"
"Будь-ласка, повідомляйте про помилки на %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Некоректний командний аргумент '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "На дисплеї %d вже запущений менеджер вікон"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "Не можу отримати вибір менеджера вікон на дисплеї %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "Менеджео вікон на дисплеї %d не завершується"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "стільниця %i"
diff --git a/po/vi.po b/po/vi.po
index d2db5904..13528b59 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-07-20 16:48+0200\n"
"Last-Translator: Quan Tran \n"
"Language-Team: None\n"
@@ -25,27 +25,27 @@ msgstr "Không thể chuyển chỗ '%s' từ utf8"
msgid "Failed to execute '%s': %s"
msgstr "Làm không được '%s': %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "Đi đến chỗ đó"
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "Quản lý chỗ làm việc"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "_Cộng thêm chỗ làm việc"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "_Bỏ lát chỗ làm việc"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "Cửa sổ"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "Chỗ làm việc"
@@ -77,39 +77,39 @@ msgstr "Gửi đến chỗ làm _việc"
msgid "Client menu"
msgstr "Khách thực đơn"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "_Hoàn lại"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "Chu_yển đi"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "Làm _nhỏ hơn/lớn hơn"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "Biến _xuống"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "Biến _lớn nhất"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "_Cuốn lên/xuống"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "_Trang/Không Trang trí"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "Đón_g"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "Sai nút '%s' ở trong hình thể"
@@ -152,49 +152,49 @@ msgstr "Vô hiệu nút '%s' ở trong máy chuột đặt"
msgid "Invalid context '%s' in mouse binding"
msgstr "Vô hiệu văn cảnh '%s' ở trong chuột đặt"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "Không thể đổi đến chỗ nhà '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "Không mở hình từ DISPLAY được."
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "Không mở được thư viện obrender."
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "Chương trình X không có locale cho tiếng nay."
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "Không thể dùng locale cho chương trình X."
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr "Không thể tìm ra hình thể, sẽ dùng bắt đầu hình thể"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "Không thể đọc theme."
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "Bắt đầu lại hỏng mở được executable mới '%s': %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "Bản quyền (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "Cách dùng: openbox [chọn lựa]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -202,24 +202,24 @@ msgstr ""
"\n"
"Chọn lựa:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help Trưng bày giúp đỡ này và đi ra\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version Trưng bày số của chương trình và đi ra\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr ""
" --replace Thay thế chương trình quản lý cửa sổ cho đến openbox\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable Tắt liên lạc đến session quản lý\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -227,15 +227,20 @@ msgstr ""
"\n"
"Đưa thông báo cho chương trình Openbox:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure Bắt đầu lại Openbox's hình thể\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart Bắt đầu lại Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -243,24 +248,24 @@ msgstr ""
"\n"
"Debugging chọn lựa:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync Chạy trong cách thức synchronous\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug Trưng bày debugging đoàn chữ\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr ""
" --debug-focus Trưng bày debugging đoàn chữ cho điều khiển tập trung\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama Tách trưng bày vào giả xinerama màn\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -269,27 +274,27 @@ msgstr ""
"\n"
"Làm ơn báo cáo bugs ở chỗ %s\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "Mệnh lệnh viết sai '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "Chương trình quản lý cửa sổ khác đang chạy trên màn hình %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "Không thể lấy được chương trình quản lý cửa sổ ở trên màn hình %d"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "Chương trình quản lý cửa sổ trên màn hình %d không đi ra"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "chỗ làm việc %i"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 47beefe1..df225bc1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Openbox 3.4.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-05-28 13:00+0800\n"
"Last-Translator: Xiaoyu PENG \n"
"Language-Team: None\n"
@@ -25,27 +25,27 @@ msgstr "从 utf8 转换路径 '%s' 时失败"
msgid "Failed to execute '%s': %s"
msgstr "执行 '%s' 时失败: %s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "跳转到..."
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr ""
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr ""
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr ""
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "窗口"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "桌面"
@@ -77,39 +77,39 @@ msgstr "发送到桌面(_S)"
msgid "Client menu"
msgstr "客户端菜单"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "还原(_E)"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "移动(_M)"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "调整大小(_Z)"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "最小化(_N)"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "最大化(_X)"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "卷起/放下(_R)"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "去除装饰(_D)"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "关闭(_C)"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "配置文件中指定的按钮 '%s' 无效"
@@ -152,49 +152,49 @@ msgstr "鼠标绑定中的无效按键 '%s'"
msgid "Invalid context '%s' in mouse binding"
msgstr "鼠标绑定中无效的上下文 '%s'"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "无法切换到主目录 '%s': %s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "在打开DISPLAY环境变量所指定的X显示时失败"
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "初始化obrender库时失败"
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "X服务器不支持该Locale"
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "无法设置X服务器的locale修饰项"
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr "无法找到有效的配置文件,使用一些简单的默认值"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "无法读入主题"
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "重新启动以执行新的可执行文件 '%s' 时失败: %s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "版权 (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "用法: openbox [选项]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -202,23 +202,23 @@ msgstr ""
"\n"
"选项: \n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help 显示帮助选项后退出\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version 显示版本号后退出\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace 替换当前运行的窗口管理器\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable 禁止与会话管理器的连接\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -226,15 +226,20 @@ msgstr ""
"\n"
"传递信息给运行中的Openbox实例:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure 重新读入Openbox的配置\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart 重新启动Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -242,23 +247,23 @@ msgstr ""
"\n"
"调试选项:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync 在同步模式中运行\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug 显示调试输出\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr " --debug-focus 显示焦点处理的调试输出\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama 分割显示到伪造的 xinerama 屏幕中\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -267,27 +272,27 @@ msgstr ""
"\n"
"请向 %s 报告错误\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "无效的命令行参数 '%s'\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "已经有窗口管理器运行在屏幕 %d"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "在屏幕 %d 无法被选为窗口管理器"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "屏幕 %d 的窗口管理器没有退出"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "桌面 %i"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 48af0304..fd495212 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: openbox 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-07-22 08:25-0400\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
"PO-Revision-Date: 2007-07-23 23:22+0200\n"
"Last-Translator: Wei-Lun Chao \n"
"Language-Team: Chinese (traditional) \n"
@@ -26,27 +26,27 @@ msgstr "轉換路徑「%s」自 utf8 時失敗"
msgid "Failed to execute '%s': %s"
msgstr "執行「%s」時失敗:%s"
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
msgid "Go there..."
msgstr "到那裏去…"
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
msgid "Manage desktops"
msgstr "管理桌面"
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
msgid "_Add new desktop"
msgstr "加入新桌面(_A)"
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
msgid "_Remove last desktop"
msgstr "移除尾端桌面(_R)"
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150
msgid "Windows"
msgstr "視窗"
-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:203
msgid "Desktops"
msgstr "桌面"
@@ -78,39 +78,39 @@ msgstr "傳送到桌面(_S)"
msgid "Client menu"
msgstr "客戶端選單"
-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:384
msgid "R_estore"
msgstr "還原(_E)"
-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:392
msgid "_Move"
msgstr "移動(_M)"
-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:394
msgid "Resi_ze"
msgstr "調整大小(_Z)"
-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:396
msgid "Ico_nify"
msgstr "最小化(_N)"
-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:404
msgid "Ma_ximize"
msgstr "最大化(_X)"
-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:412
msgid "_Roll up/down"
msgstr "向上/向下捲動(_R)"
-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:414
msgid "Un/_Decorate"
msgstr "去除/裝飾(_D)"
-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:418
msgid "_Close"
msgstr "關閉(_C)"
-#: openbox/config.c:737
+#: openbox/config.c:740
#, c-format
msgid "Invalid button '%s' specified in config file"
msgstr "在配置檔中指定的按鈕「%s」無效"
@@ -153,49 +153,49 @@ msgstr "與滑鼠組合的按鈕「%s」無效"
msgid "Invalid context '%s' in mouse binding"
msgstr "與滑鼠組合的上下文「%s」無效"
-#: openbox/openbox.c:130
+#: openbox/openbox.c:129
#, c-format
msgid "Unable to change to home directory '%s': %s"
msgstr "無法變更到主目錄「%s」:%s"
-#: openbox/openbox.c:150
+#: openbox/openbox.c:149
msgid "Failed to open the display from the DISPLAY environment variable."
msgstr "開啟依 DISPLAY 環境變數所指的顯示時失敗。"
-#: openbox/openbox.c:181
+#: openbox/openbox.c:180
msgid "Failed to initialize the obrender library."
msgstr "初始化 obrender 函式庫時失敗。"
-#: openbox/openbox.c:187
+#: openbox/openbox.c:186
msgid "X server does not support locale."
msgstr "X 伺服器不支援語區。"
-#: openbox/openbox.c:189
+#: openbox/openbox.c:188
msgid "Cannot set locale modifiers for the X server."
msgstr "無法設定用於 X 伺服器的語區修飾項。"
-#: openbox/openbox.c:252
+#: openbox/openbox.c:251
msgid "Unable to find a valid config file, using some simple defaults"
msgstr "無法找到有效的配置檔案,而使用某些簡單的預設值"
-#: openbox/openbox.c:278
+#: openbox/openbox.c:277
msgid "Unable to load a theme."
msgstr "無法載入佈景主題。"
-#: openbox/openbox.c:405
+#: openbox/openbox.c:402
#, c-format
msgid "Restart failed to execute new executable '%s': %s"
msgstr "重新啟動以執行新的可執行檔「%s」時失敗:%s"
-#: openbox/openbox.c:475 openbox/openbox.c:477
+#: openbox/openbox.c:472 openbox/openbox.c:474
msgid "Copyright (c)"
msgstr "著作權 (c)"
-#: openbox/openbox.c:486
+#: openbox/openbox.c:483
msgid "Syntax: openbox [options]\n"
msgstr "語法:openbox [選項]\n"
-#: openbox/openbox.c:487
+#: openbox/openbox.c:484
msgid ""
"\n"
"Options:\n"
@@ -203,23 +203,23 @@ msgstr ""
"\n"
"選項:\n"
-#: openbox/openbox.c:488
+#: openbox/openbox.c:485
msgid " --help Display this help and exit\n"
msgstr " --help 顯示此說明然後離開\n"
-#: openbox/openbox.c:489
+#: openbox/openbox.c:486
msgid " --version Display the version and exit\n"
msgstr " --version 顯示版本然後離開\n"
-#: openbox/openbox.c:490
+#: openbox/openbox.c:487
msgid " --replace Replace the currently running window manager\n"
msgstr " --replace 替換目前執行的視窗管理員\n"
-#: openbox/openbox.c:491
+#: openbox/openbox.c:488
msgid " --sm-disable Disable connection to the session manager\n"
msgstr " --sm-disable 停用與執行階段管理程式的連結\n"
-#: openbox/openbox.c:492
+#: openbox/openbox.c:489
msgid ""
"\n"
"Passing messages to a running Openbox instance:\n"
@@ -227,15 +227,20 @@ msgstr ""
"\n"
"傳遞訊息到執行中的 Openbox 實體:\n"
-#: openbox/openbox.c:493
+#: openbox/openbox.c:490
msgid " --reconfigure Reload Openbox's configuration\n"
msgstr " --reconfigure 重新載入 Openbox 配置\n"
-#: openbox/openbox.c:494
+#: openbox/openbox.c:491
msgid " --restart Restart Openbox\n"
msgstr " --restart 重新啟動 Openbox\n"
-#: openbox/openbox.c:495
+#: openbox/openbox.c:492
+#, fuzzy
+msgid " --exit Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:493
msgid ""
"\n"
"Debugging options:\n"
@@ -243,23 +248,23 @@ msgstr ""
"\n"
"偵錯選項:\n"
-#: openbox/openbox.c:496
+#: openbox/openbox.c:494
msgid " --sync Run in synchronous mode\n"
msgstr " --sync 在同步模式中運行\n"
-#: openbox/openbox.c:497
+#: openbox/openbox.c:495
msgid " --debug Display debugging output\n"
msgstr " --debug 顯示偵錯輸出\n"
-#: openbox/openbox.c:498
+#: openbox/openbox.c:496
msgid " --debug-focus Display debugging output for focus handling\n"
msgstr " --debug-focus 顯示焦點處理的偵錯輸出\n"
-#: openbox/openbox.c:499
+#: openbox/openbox.c:497
msgid " --debug-xinerama Split the display into fake xinerama screens\n"
msgstr " --debug-xinerama 分割顯示以進入假造的 xinerama 螢幕\n"
-#: openbox/openbox.c:500
+#: openbox/openbox.c:498
#, c-format
msgid ""
"\n"
@@ -268,27 +273,27 @@ msgstr ""
"\n"
"請向 %s 報告錯誤\n"
-#: openbox/openbox.c:597
+#: openbox/openbox.c:599
#, c-format
msgid "Invalid command line argument '%s'\n"
msgstr "無效的命令列引數「%s」\n"
-#: openbox/screen.c:94 openbox/screen.c:195
+#: openbox/screen.c:96 openbox/screen.c:184
#, c-format
msgid "A window manager is already running on screen %d"
msgstr "螢幕 %d 中已經有視窗管理員在運行"
-#: openbox/screen.c:131
+#: openbox/screen.c:118
#, c-format
msgid "Could not acquire window manager selection on screen %d"
msgstr "無法於螢幕 %d 獲選為視窗管理員"
-#: openbox/screen.c:152
+#: openbox/screen.c:139
#, c-format
msgid "The WM on screen %d is not exiting"
msgstr "螢幕 %d 中的視窗管理員並未離開"
-#: openbox/screen.c:1083
+#: openbox/screen.c:1087
#, c-format
msgid "desktop %i"
msgstr "桌面 %i"
diff --git a/render/font.c b/render/font.c
index 8d389d8b..356b9c6e 100644
--- a/render/font.c
+++ b/render/font.c
@@ -278,11 +278,11 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
c.pixel = t->color->pixel;
if (t->shortcut) {
- const gchar *c = t->string + t->shortcut_pos;
+ const gchar *s = t->string + t->shortcut_pos;
t->font->shortcut_underline->start_index = t->shortcut_pos;
t->font->shortcut_underline->end_index = t->shortcut_pos +
- (g_utf8_next_char(c) - c);
+ (g_utf8_next_char(s) - s);
/* the attributes are owned by the layout.
re-add the attributes to the layout after changing the
diff --git a/render/mask.c b/render/mask.c
index 10ce8d0f..b6e3c443 100644
--- a/render/mask.c
+++ b/render/mask.c
@@ -47,7 +47,7 @@ void RrPixmapMaskFree(RrPixmapMask *m)
void RrPixmapMaskDraw(Pixmap p, const RrTextureMask *m, const RrRect *area)
{
gint x, y;
- if (m->mask == None) return; /* no mask given */
+ if (m->mask == NULL) return; /* no mask given */
/* set the clip region */
x = area->x + (area->width - m->mask->width) / 2;
diff --git a/render/theme.c b/render/theme.c
index 0de3dc74..3d357e38 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -115,7 +115,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
theme->a_menu_normal = RrAppearanceNew(inst, 0);
theme->a_menu_selected = RrAppearanceNew(inst, 0);
theme->a_menu_disabled = RrAppearanceNew(inst, 0);
- theme->a_menu_disabled_selected = RrAppearanceNew(inst, 0);
+ /* a_menu_disabled_selected is copied from a_menu_selected */
theme->a_menu_text_normal = RrAppearanceNew(inst, 1);
theme->a_menu_text_selected = RrAppearanceNew(inst, 1);
theme->a_menu_text_disabled = RrAppearanceNew(inst, 1);
@@ -543,21 +543,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
OB_DEFAULT_ICON_HEIGHT,
OB_DEFAULT_ICON_pixel_data);
- /* the toggled hover mask = the toggled unpressed mask (i.e. no change) */
- theme->max_toggled_hover_mask =
- RrPixmapMaskCopy(theme->max_toggled_mask);
- theme->desk_toggled_hover_mask =
- RrPixmapMaskCopy(theme->desk_toggled_mask);
- theme->shade_toggled_hover_mask =
- RrPixmapMaskCopy(theme->shade_toggled_mask);
- /* the toggled pressed mask = the toggled unpressed mask (i.e. no change)*/
- theme->max_toggled_pressed_mask =
- RrPixmapMaskCopy(theme->max_toggled_mask);
- theme->desk_toggled_pressed_mask =
- RrPixmapMaskCopy(theme->desk_toggled_mask);
- theme->shade_toggled_pressed_mask =
- RrPixmapMaskCopy(theme->shade_toggled_mask);
-
/* read the decoration textures */
if (!read_appearance(db, inst,
"window.active.title.bg", theme->a_focused_title,