diff options
Diffstat (limited to 'openbox')
57 files changed, 148 insertions, 125 deletions
diff --git a/openbox/action.c b/openbox/action.c index db49f56c..1ba798fe 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -2,7 +2,7 @@ action.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -34,6 +34,7 @@ #include "config.h" #include "mainloop.h" #include "startupnotify.h" +#include "gettext.h" #include <glib.h> @@ -912,10 +913,11 @@ ObAction *action_from_string(const gchar *name, ObUserAction uact) break; } if (!exist) - g_warning("Invalid action '%s' requested. No such action exists.", + g_message(_("Invalid action '%s' requested. No such action exists."), name); if (!a) - g_warning("Invalid use of action '%s'. Action will be ignored.", name); + g_message(_("Invalid use of action '%s'. Action will be ignored."), + name); return a; } @@ -1104,7 +1106,7 @@ void action_execute(union ActionData *data) cmd = g_filename_from_utf8(data->execute.path, -1, NULL, NULL, NULL); if (cmd) { if (!g_shell_parse_argv (cmd, NULL, &argv, &e)) { - g_warning("failed to execute '%s': %s", + g_message(_("Failed to execute '%s': %s"), cmd, e->message); g_error_free(e); } else if (data->execute.startupnotify) { @@ -1122,7 +1124,7 @@ void action_execute(union ActionData *data) if (!g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, NULL, &e)) { - g_warning("failed to execute '%s': %s", + g_message(_("Failed to execute '%s': %s"), cmd, e->message); g_error_free(e); sn_spawn_cancel(); @@ -1135,7 +1137,7 @@ void action_execute(union ActionData *data) G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, NULL, &e)) { - g_warning("failed to execute '%s': %s", + g_message(_("Failed to execute '%s': %s"), cmd, e->message); g_error_free(e); } @@ -1143,7 +1145,8 @@ void action_execute(union ActionData *data) } g_free(cmd); } else { - g_warning("failed to convert '%s' from utf8", data->execute.path); + g_message(_("Failed to convert the path '%s' from utf8"), + data->execute.path); } } } diff --git a/openbox/action.h b/openbox/action.h index b1bc081f..cab6506e 100644 --- a/openbox/action.h +++ b/openbox/action.h @@ -2,7 +2,7 @@ action.h for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c index 3ea4669b..adf3ff05 100644 --- a/openbox/client_list_combined_menu.c +++ b/openbox/client_list_combined_menu.c @@ -2,7 +2,7 @@ client_list_menu.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/client_list_combined_menu.h b/openbox/client_list_combined_menu.h index 91ebfc47..420e898e 100644 --- a/openbox/client_list_combined_menu.h +++ b/openbox/client_list_combined_menu.h @@ -2,7 +2,7 @@ client_list_menu.h for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c index 13513399..5fbb3a63 100644 --- a/openbox/client_list_menu.c +++ b/openbox/client_list_menu.c @@ -2,7 +2,7 @@ client_list_menu.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -76,6 +76,7 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data) acts = g_slist_append(acts, act); e = menu_add_normal(menu, i, (c->iconic ? c->icon_title : c->title), acts); + if (config_menu_client_list_icons && (icon = client_icon(c, 32, 32))) { e->data.normal.icon_width = icon->width; diff --git a/openbox/client_list_menu.h b/openbox/client_list_menu.h index 63956cf1..860cd505 100644 --- a/openbox/client_list_menu.h +++ b/openbox/client_list_menu.h @@ -2,7 +2,7 @@ client_list_menu.h for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/client_menu.c b/openbox/client_menu.c index f3e80b99..f67ea906 100644 --- a/openbox/client_menu.c +++ b/openbox/client_menu.c @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- client_menu.c for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/client_menu.h b/openbox/client_menu.h index caf0f054..fe145022 100644 --- a/openbox/client_menu.h +++ b/openbox/client_menu.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- client_menu.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/config.c b/openbox/config.c index d406f8f1..a2b392da 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -2,7 +2,7 @@ config.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ #include "screen.h" #include "parser/parse.h" #include "openbox.h" +#include "gettext.h" gboolean config_focus_new; gboolean config_focus_follow; @@ -625,7 +626,7 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, config_dock_app_move_button = b; config_dock_app_move_modifiers = s; } else { - g_warning("invalid button '%s'", str); + g_message(_("Invalid button '%s' specified in config file"), str); } g_free(str); } diff --git a/openbox/config.h b/openbox/config.h index 851a68ed..5ee071e6 100644 --- a/openbox/config.h +++ b/openbox/config.h @@ -2,7 +2,7 @@ config.h for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/dock.c b/openbox/dock.c index 70e11272..2e191f1c 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -2,7 +2,7 @@ dock.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/dock.h b/openbox/dock.h index b2ded2d2..051747c3 100644 --- a/openbox/dock.h +++ b/openbox/dock.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- dock.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/event.c b/openbox/event.c index 5bb0e2a0..a4105c79 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -2,7 +2,7 @@ event.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/event.h b/openbox/event.h index 4221e54d..4fdf292e 100644 --- a/openbox/event.h +++ b/openbox/event.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- event.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/extensions.c b/openbox/extensions.c index 32ad0012..967424f4 100644 --- a/openbox/extensions.c +++ b/openbox/extensions.c @@ -2,7 +2,7 @@ extensions.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/extensions.h b/openbox/extensions.h index a097957f..c6771067 100644 --- a/openbox/extensions.h +++ b/openbox/extensions.h @@ -2,7 +2,7 @@ extensions.h for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/focus.h b/openbox/focus.h index 5ed9977c..7accf0c6 100644 --- a/openbox/focus.h +++ b/openbox/focus.h @@ -2,7 +2,7 @@ focus.h for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/frame.h b/openbox/frame.h index 0d044366..90902fc6 100644 --- a/openbox/frame.h +++ b/openbox/frame.h @@ -2,7 +2,7 @@ frame.h for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/framerender.c b/openbox/framerender.c index 28597338..99d11284 100644 --- a/openbox/framerender.c +++ b/openbox/framerender.c @@ -2,7 +2,7 @@ framerender.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/framerender.h b/openbox/framerender.h index a039115e..162fa578 100644 --- a/openbox/framerender.h +++ b/openbox/framerender.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- framerender.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/geom.h b/openbox/geom.h index e77228c1..e9ecf9d2 100644 --- a/openbox/geom.h +++ b/openbox/geom.h @@ -2,7 +2,7 @@ geom.h for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/grab.c b/openbox/grab.c index b81254a3..e7bd41d9 100644 --- a/openbox/grab.c +++ b/openbox/grab.c @@ -2,7 +2,7 @@ grab.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,6 +22,7 @@ #include "event.h" #include "xerror.h" #include "screen.h" +#include "debug.h" #include <glib.h> #include <X11/Xlib.h> @@ -162,14 +163,14 @@ void grab_button_full(guint button, guint state, Window win, guint mask, { guint i; - xerror_set_ignore(TRUE); /* can get BadAccess' from these */ + xerror_set_ignore(TRUE); /* can get BadAccess from these */ xerror_occured = FALSE; for (i = 0; i < MASK_LIST_SIZE; ++i) XGrabButton(ob_display, button, state | mask_list[i], win, FALSE, mask, pointer_mode, GrabModeSync, None, ob_cursor(cur)); xerror_set_ignore(FALSE); if (xerror_occured) - g_warning("failed to grab button %d modifiers %d", button, state); + ob_debug("Failed to grab button %d modifiers %d", button, state); } void grab_button(guint button, guint state, Window win, guint mask) @@ -196,7 +197,7 @@ void grab_key(guint keycode, guint state, Window win, gint keyboard_mode) GrabModeAsync, keyboard_mode); xerror_set_ignore(FALSE); if (xerror_occured) - g_warning("failed to grab keycode %d modifiers %d", keycode, state); + ob_debug("Failed to grab keycode %d modifiers %d", keycode, state); } void ungrab_all_keys(Window win) diff --git a/openbox/grab.h b/openbox/grab.h index 088d2d6c..4b5aec3b 100644 --- a/openbox/grab.h +++ b/openbox/grab.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- grab.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/group.c b/openbox/group.c index 937ebfd7..f70b84b7 100644 --- a/openbox/group.c +++ b/openbox/group.c @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- group.c for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/group.h b/openbox/group.h index d9c2604a..844b629b 100644 --- a/openbox/group.h +++ b/openbox/group.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- group.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/keyboard.c b/openbox/keyboard.c index 2d0a5e94..71164ac3 100644 --- a/openbox/keyboard.c +++ b/openbox/keyboard.c @@ -2,7 +2,7 @@ keyboard.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,6 +32,7 @@ #include "keyboard.h" #include "translate.h" #include "moveresize.h" +#include "gettext.h" #include <glib.h> @@ -127,7 +128,7 @@ gboolean keyboard_bind(GList *keylist, ObAction *action) t = tree; if (conflict) { - g_warning("conflict with binding"); + g_message(_("Conflict with key binding in config file")); tree_destroy(tree); return FALSE; } diff --git a/openbox/keyboard.h b/openbox/keyboard.h index 883d04b4..23b93684 100644 --- a/openbox/keyboard.h +++ b/openbox/keyboard.h @@ -2,7 +2,7 @@ keyboard.h for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/keytree.c b/openbox/keytree.c index e033601a..e86fb4c6 100644 --- a/openbox/keytree.c +++ b/openbox/keytree.c @@ -2,7 +2,7 @@ keytree.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/keytree.h b/openbox/keytree.h index f59ef137..c3be0659 100644 --- a/openbox/keytree.h +++ b/openbox/keytree.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- keytree.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/mainloop.c b/openbox/mainloop.c index 62261dde..2af81629 100644 --- a/openbox/mainloop.c +++ b/openbox/mainloop.c @@ -2,7 +2,7 @@ mainloop.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/mainloop.h b/openbox/mainloop.h index 47591850..03f00359 100644 --- a/openbox/mainloop.h +++ b/openbox/mainloop.h @@ -2,7 +2,7 @@ mainloop.h for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/menu.c b/openbox/menu.c index e2436810..311701a7 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -31,6 +31,7 @@ #include "client_menu.h" #include "client_list_menu.h" #include "client_list_combined_menu.h" +#include "gettext.h" #include "parser/parse.h" typedef struct _ObMenuParseState ObMenuParseState; @@ -90,13 +91,17 @@ void menu_startup(gboolean reconfig) loaded = TRUE; parse_tree(menu_parse_inst, doc, node->children); xmlFreeDoc(doc); - } + } else + g_message(_("Unable to find a valid menu file '%s'"), + (const gchar*)it->data); } if (!loaded) { if (parse_load_menu("menu.xml", &doc, &node)) { parse_tree(menu_parse_inst, doc, node->children); xmlFreeDoc(doc); - } + } else + g_message(_("Unable to find a valid menu file '%s'"), + "menu.xml"); } g_assert(menu_parse_state.parent == NULL); @@ -138,7 +143,8 @@ void menu_pipe_execute(ObMenu *self) return; if (!g_spawn_command_line_sync(self->execute, &output, NULL, NULL, &err)) { - g_warning("Failed to execute command for pipe-menu: %s", err->message); + g_message(_("Failed to execute command for pipe-menu '%s': %s"), + self->execute, err->message); g_error_free(err); return; } @@ -154,7 +160,7 @@ void menu_pipe_execute(ObMenu *self) parse_tree(menu_parse_inst, doc, node->children); xmlFreeDoc(doc); } else { - g_warning("Invalid output from pipe-menu: %s", self->execute); + g_message(_("Invalid output from pipe-menu '%s'"), self->execute); } g_free(output); @@ -167,7 +173,7 @@ static ObMenu* menu_from_name(gchar *name) g_assert(name != NULL); if (!(self = g_hash_table_lookup(menu_hash, name))) - g_warning("Attempted to access menu '%s' but it does not exist.", + g_message(_("Attempted to access menu '%s' but it does not exist"), name); return self; } diff --git a/openbox/misc.h b/openbox/misc.h index 9e1fc269..1da94b34 100644 --- a/openbox/misc.h +++ b/openbox/misc.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- misc.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/mouse.c b/openbox/mouse.c index 81eccfb8..27172d52 100644 --- a/openbox/mouse.c +++ b/openbox/mouse.c @@ -2,7 +2,7 @@ mouse.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,6 +28,8 @@ #include "frame.h" #include "translate.h" #include "mouse.h" +#include "gettext.h" + #include <glib.h> typedef struct { @@ -309,13 +311,13 @@ gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr, GSList *it; if (!translate_button(buttonstr, &state, &button)) { - g_warning("invalid button '%s'", buttonstr); + g_message(_("Invalid button '%s' in pointer binding"), buttonstr); return FALSE; } context = frame_context_from_string(contextstr); if (!context) { - g_warning("invalid context '%s'", contextstr); + g_message(_("Invalid context '%s' in pointer binding"), contextstr); return FALSE; } diff --git a/openbox/mouse.h b/openbox/mouse.h index a570a16a..38e01da8 100644 --- a/openbox/mouse.h +++ b/openbox/mouse.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- mouse.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 6cab5226..6d319924 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -2,7 +2,7 @@ moveresize.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/moveresize.h b/openbox/moveresize.h index 67ab08c0..5a099567 100644 --- a/openbox/moveresize.h +++ b/openbox/moveresize.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- moveresize.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/mwm.h b/openbox/mwm.h index b4c8ccbd..e7a9d396 100644 --- a/openbox/mwm.h +++ b/openbox/mwm.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- mwm.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/openbox.c b/openbox/openbox.c index 61c54da0..74842614 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -2,7 +2,7 @@ openbox.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -103,7 +103,7 @@ gint main(gint argc, gchar **argv) /* initialize the locale */ if (!setlocale(LC_ALL, "")) - g_warning("Couldn't set locale from environment."); + g_message(_("Couldn't set locale from environment.")); bindtextdomain(PACKAGE_NAME, LOCALEDIR); bind_textdomain_codeset(PACKAGE_NAME, "UTF-8"); textdomain(PACKAGE_NAME); @@ -111,7 +111,7 @@ gint main(gint argc, gchar **argv) g_set_prgname(argv[0]); if (chdir(g_get_home_dir()) == -1) - g_warning("Unable to change to home directory (%s): %s", + g_message(_("Unable to change to home directory (%s): %s"), g_get_home_dir(), g_strerror(errno)); /* parse out command line args */ @@ -162,9 +162,9 @@ gint main(gint argc, gchar **argv) /* check for locale support */ if (!XSupportsLocale()) - g_warning("X server does not support locale."); + g_message(_("X server does not support locale.")); if (!XSetLocaleModifiers("")) - g_warning("Cannot set locale modifiers for the X server."); + g_message(_("Cannot set locale modifiers for the X server.")); /* set our error handler */ XSetErrorHandler(xerror_handler); @@ -225,8 +225,11 @@ gint main(gint argc, gchar **argv) PROP_SETS(RootWindow(ob_display, ob_screen), openbox_rc, config_file); parse_tree(i, doc, node->xmlChildrenNode); - } else + } else { + g_message(_("Unable to find a valid config file, using " + "some simple defaults")); PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_rc); + } /* we're done with parsing now, kill it */ parse_close(doc); parse_shutdown(i); @@ -343,8 +346,8 @@ gint main(gint argc, gchar **argv) execvp(argvp[0], argvp); g_strfreev(argvp); } else { - g_warning("failed to execute '%s': %s", restart_path, - err->message); + g_message(_("Restart failed to execute new executable " + "'%s': %s"), restart_path, err->message); g_error_free(err); } } @@ -383,8 +386,10 @@ static void signal_handler(gint signal, gpointer data) static void print_version() { g_print("Openbox %s\n", PACKAGE_VERSION); - g_print("Copyright (c) 2007 Mikael Magnusson\n"); - g_print("Copyright (c) 2003-2007 Dana Jansens\n\n"); + g_print(_("Copyright (c)")); + g_print(" 2007 Mikael Magnusson\n"); + g_print(_("Copyright (c)")); + g_print(" 2003-2007 Dana Jansens\n\n"); g_print("This program comes with ABSOLUTELY NO WARRANTY.\n"); g_print("This is free software, and you are welcome to redistribute it\n"); g_print("under certain conditions. See the file COPYING for details.\n\n"); @@ -392,29 +397,31 @@ static void print_version() static void print_help() { - g_print("Syntax: openbox [options]\n\n"); - g_print("Options:\n\n"); - g_print(" --reconfigure Tell the currently running instance of " - "Openbox to\n" - " reconfigure (and then exit immediately)\n"); - g_print(" --config-file FILE Specify the file to load for the config " - "file\n"); + g_print(_("Syntax: openbox [options]\n\n")); + g_print(_("Options:\n\n")); + g_print(_(" --reconfigure Tell the currently running instance of " + "Openbox to\n" + " reconfigure (and then exit " + "immediately)\n")); + g_print(_(" --config-file FILE Specify the file to load for the config " + "file\n")); #ifdef USE_SM - g_print(" --sm-disable Disable connection to session manager\n"); - g_print(" --sm-client-id ID Specify session management ID\n"); - g_print(" --sm-save-file FILE Specify file to load a saved session" - "from\n"); + g_print(_(" --sm-disable Disable connection to session " + "manager\n")); + g_print(_(" --sm-client-id ID Specify session management ID\n")); + g_print(_(" --sm-save-file FILE Specify file to load a saved session" + "from\n")); #endif - g_print(" --replace Replace the currently running window " - "manager\n"); - g_print(" --help Display this help and exit\n"); - g_print(" --version Display the version and exit\n"); - g_print(" --sync Run in synchronous mode (this is slow and " - "meant for\n" - " debugging X routines)\n"); - g_print(" --debug Display debugging output\n"); - g_print(" --debug-focus Display debugging output\n"); - g_print("\nPlease report bugs at %s\n\n", PACKAGE_BUGREPORT); + g_print(_(" --replace Replace the currently running window " + "manager\n")); + g_print(_(" --help Display this help and exit\n")); + g_print(_(" --version Display the version and exit\n")); + g_print(_(" --sync Run in synchronous mode (this is slow and" + " meant for\n" + " debugging X routines)\n")); + g_print(_(" --debug Display debugging output\n")); + g_print(_(" --debug-focus Display debugging output\n")); + g_print(_("\nPlease report bugs at %s\n\n"), PACKAGE_BUGREPORT); } static void parse_args(gint argc, gchar **argv) diff --git a/openbox/openbox.h b/openbox/openbox.h index 4c018666..03dcdab5 100644 --- a/openbox/openbox.h +++ b/openbox/openbox.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- openbox.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/place.h b/openbox/place.h index 2434ccbc..e2f1d4e4 100644 --- a/openbox/place.h +++ b/openbox/place.h @@ -2,7 +2,7 @@ place.h for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/popup.c b/openbox/popup.c index 88619e77..9af23be0 100644 --- a/openbox/popup.c +++ b/openbox/popup.c @@ -2,7 +2,7 @@ popup.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/popup.h b/openbox/popup.h index 847f264f..609c3028 100644 --- a/openbox/popup.h +++ b/openbox/popup.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- popup.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/resist.c b/openbox/resist.c index bda77601..fc293446 100644 --- a/openbox/resist.c +++ b/openbox/resist.c @@ -2,7 +2,7 @@ resist.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/resist.h b/openbox/resist.h index 39108550..b961bbeb 100644 --- a/openbox/resist.h +++ b/openbox/resist.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- resist.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/screen.c b/openbox/screen.c index c0569c29..74b8e71d 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -34,6 +34,7 @@ #include "popup.h" #include "extensions.h" #include "render/render.h" +#include "gettext.h" #include <X11/Xlib.h> #ifdef HAVE_UNISTD_H @@ -79,7 +80,7 @@ static gboolean replace_wm() current_wm_sn_owner = None; if (current_wm_sn_owner) { if (!ob_replace_wm) { - g_warning("A window manager is already running on screen %d", + g_message(_("A window manager is already running on screen %d"), ob_screen); return FALSE; } @@ -116,7 +117,7 @@ static gboolean replace_wm() timestamp); if (XGetSelectionOwner(ob_display, wm_sn_atom) != screen_support_win) { - g_warning("Could not acquire window manager selection on screen %d", + g_message(_("Could not acquire window manager selection on screen %d"), ob_screen); return FALSE; } @@ -137,8 +138,8 @@ static gboolean replace_wm() } if (wait >= timeout) { - g_warning("Timeout expired while waiting for the current WM to die " - "on screen %d", ob_screen); + g_message(_("Timeout expired while waiting for the current WM to die" + " on screen %d"), ob_screen); return FALSE; } } @@ -179,7 +180,7 @@ gboolean screen_annex() ROOT_EVENTMASK); xerror_set_ignore(FALSE); if (xerror_occured) { - g_warning("A window manager is already running on screen %d", + g_message(_("A window manager is already running on screen %d"), ob_screen); XDestroyWindow(ob_display, screen_support_win); diff --git a/openbox/screen.h b/openbox/screen.h index 07a2cae0..970cde34 100644 --- a/openbox/screen.h +++ b/openbox/screen.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- screen.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/session.c b/openbox/session.c index 01bb56e2..1ff41519 100644 --- a/openbox/session.c +++ b/openbox/session.c @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- session.c for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -164,9 +164,10 @@ void session_startup(gint argc, gchar **argv) sm_sessions_path = g_build_filename(parse_xdg_data_home_path(), "openbox", "sessions", NULL); - if (!parse_mkdir_path(sm_sessions_path, 0700)) - g_warning(_("Unable to make directory '%s': %s"), + if (!parse_mkdir_path(sm_sessions_path, 0700)) { + g_message(_("Unable to make directory '%s': %s"), sm_sessions_path, g_strerror(errno)); + } if (save_file) session_load(save_file); @@ -339,7 +340,7 @@ static gboolean session_save() f = fopen(save_file, "w"); if (!f) { success = FALSE; - g_warning("unable to save the session to %s: %s", + g_message(_("Unable to save the session to '%s': %s"), save_file, g_strerror(errno)); } else { guint stack_pos = 0; @@ -429,7 +430,7 @@ static gboolean session_save() if (fflush(f)) { success = FALSE; - g_warning("error while saving the session to %s: %s", + g_message(_("Error while saving the session to '%s': %s"), save_file, g_strerror(errno)); } fclose(f); diff --git a/openbox/session.h b/openbox/session.h index 75198caf..b2c18a1f 100644 --- a/openbox/session.h +++ b/openbox/session.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- session.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/stacking.c b/openbox/stacking.c index d9aee952..32d5a0fc 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -2,7 +2,7 @@ stacking.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/stacking.h b/openbox/stacking.h index a0af4c04..2391f650 100644 --- a/openbox/stacking.h +++ b/openbox/stacking.h @@ -2,7 +2,7 @@ stacking.h for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c index 5b5723e5..03cb752b 100644 --- a/openbox/startupnotify.c +++ b/openbox/startupnotify.c @@ -2,7 +2,7 @@ startupnotify.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/startupnotify.h b/openbox/startupnotify.h index 746b786e..82b87a58 100644 --- a/openbox/startupnotify.h +++ b/openbox/startupnotify.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- startupnotify.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/translate.c b/openbox/translate.c index b1c0edbf..a26017e5 100644 --- a/openbox/translate.c +++ b/openbox/translate.c @@ -2,7 +2,7 @@ translate.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ #include "openbox.h" #include "mouse.h" +#include "gettext.h" #include <glib.h> #include <string.h> #include <stdlib.h> @@ -37,7 +38,7 @@ static guint translate_modifier(gchar *str) !g_ascii_strcasecmp("C", str)) return ControlMask; else if (!g_ascii_strcasecmp("Shift", str) || !g_ascii_strcasecmp("S", str)) return ShiftMask; - g_warning("Invalid modifier '%s' in binding.", str); + g_message(_("Invalid modifier key '%s' in key/pointer binding"), str); return 0; } @@ -73,7 +74,7 @@ gboolean translate_button(const gchar *str, guint *state, guint *button) else if (!g_ascii_strcasecmp("Down", l)) *button = 5; else if (!g_ascii_strncasecmp("Button", l, 6)) *button = atoi(l+6); if (!*button) { - g_warning("Invalid button '%s' in pointer binding.", l); + g_message(_("Invalid button '%s' in pointer binding"), l); goto translation_fail; } @@ -115,20 +116,20 @@ gboolean translate_key(const gchar *str, guint *state, guint *keycode) /* take it directly */ *keycode = strtol(l, &end, 16); if (*l == '\0' || *end != '\0') { - g_warning("Invalid key code '%s' in key binding.", l); + g_message(_("Invalid key code '%s' in key binding"), l); goto translation_fail; } } else { /* figure out the keycode */ sym = XStringToKeysym(l); if (sym == NoSymbol) { - g_warning("Invalid key name '%s' in key binding.", l); + g_message(_("Invalid key name '%s' in key binding"), l); goto translation_fail; } *keycode = XKeysymToKeycode(ob_display, sym); } if (!*keycode) { - g_warning("Key '%s' does not exist on the display.", l); + g_message(_("Requested key '%s' does not exist on the display"), l); goto translation_fail; } diff --git a/openbox/translate.h b/openbox/translate.h index 6b46e98b..8249514e 100644 --- a/openbox/translate.h +++ b/openbox/translate.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- translate.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/openbox/xerror.c b/openbox/xerror.c index b9024150..3de593b8 100644 --- a/openbox/xerror.c +++ b/openbox/xerror.c @@ -2,7 +2,7 @@ xerror.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,6 +18,7 @@ */ #include "openbox.h" +#include "gettext.h" #include <glib.h> #include <X11/Xlib.h> @@ -31,14 +32,11 @@ gint xerror_handler(Display *d, XErrorEvent *e) if (!xerror_ignore) { gchar errtxt[128]; - /*if (e->error_code != BadWindow) */ - { - XGetErrorText(d, e->error_code, errtxt, 127); - if (e->error_code == BadWindow) - /*g_warning("X Error: %s", errtxt)*/; - else - g_error("X Error: %s", errtxt); - } + XGetErrorText(d, e->error_code, errtxt, 127); + if (e->error_code == BadWindow) + /*g_message(_("X Error: %s\n"), errtxt)*/; + else + g_error(_("X Error: %s"), errtxt); } #else (void)d; (void)e; diff --git a/openbox/xerror.h b/openbox/xerror.h index 29573b0a..de1aa5a8 100644 --- a/openbox/xerror.h +++ b/openbox/xerror.h @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- xerror.h for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |