From: Mikael Magnusson Date: Thu, 7 Feb 2008 14:28:18 +0000 (+0100) Subject: Merge branch 'wip/alttab' X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=f6193ad9e048c5824142d3e7feeb109f91054052;hp=de85e4f1d96c911c7c9dc7c2a9b514b13b028aec;p=chaz%2Fopenbox Merge branch 'wip/alttab' --- diff --git a/Makefile.am b/Makefile.am index d99fa30b..fc873bb1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,8 @@ rcdir = $(configdir)/openbox xsessionsdir = $(datadir)/xsessions gnomewmfilesdir = $(datadir)/gnome/wm-properties pkgconfigdir = $(libdir)/pkgconfig -pubincludedir = $(includedir)/openbox/@OBT_VERSION@/openbox +obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt +rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render pixmapdir = $(datadir)/pixmaps xsddir = $(datadir)/openbox @@ -255,6 +256,8 @@ openbox_openbox_SOURCES = \ openbox/ping.h \ openbox/place.c \ openbox/place.h \ + openbox/prompt.c \ + openbox/prompt.h \ openbox/popup.c \ openbox/popup.h \ openbox/resist.c \ @@ -376,7 +379,7 @@ dist_syscrash_theme_DATA= \ ## public headers ## -pubinclude_HEADERS = \ +rrpubinclude_HEADERS = \ render/color.h \ render/font.h \ render/geom.h \ @@ -386,7 +389,9 @@ pubinclude_HEADERS = \ render/mask.h \ render/render.h \ render/theme.h \ - render/version.h \ + render/version.h + +obtpubinclude_HEADERS = \ obt/display.h \ obt/keyboard.h \ obt/mainloop.h \ @@ -397,9 +402,6 @@ pubinclude_HEADERS = \ obt/version.h \ obt/xevent.h -nodist_pubinclude_HEADERS = \ - version.h - nodist_pkgconfig_DATA = \ render/obrender-4.0.pc \ obt/obt-4.0.pc @@ -444,7 +446,6 @@ nodist_xsessions_DATA = \ data/xsession/openbox-kde.desktop dist_noinst_DATA = \ - version.h.in \ data/rc.xsd \ data/menu.xsd \ data/xsession/openbox.desktop.in \ @@ -461,8 +462,10 @@ dist_noinst_DATA = \ doc/openbox-gnome-session.1.in \ doc/openbox-kde-session.1.sgml \ doc/openbox-kde-session.1.in \ + render/version.h.in \ render/obrender-4.0.pc.in \ obt/obt-4.0.pc.in \ + obt/version.h.in \ tools/themeupdate/themeupdate.py \ tests/hideshow.py \ tests/Makefile \ diff --git a/configure.ac b/configure.ac index ee73919c..463e7fb3 100644 --- a/configure.ac +++ b/configure.ac @@ -18,14 +18,14 @@ RR_MINOR_VERSION=0 RR_MICRO_VERSION=17 RR_INTERFACE_AGE=0 RR_BINARY_AGE=0 -RR_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION +RR_VERSION=$RR_MAJOR_VERSION.$RR_MINOR_VERSION OBT_MAJOR_VERSION=4 OBT_MINOR_VERSION=0 OBT_MICRO_VERSION=0 OBT_INTERFACE_AGE=0 OBT_BINARY_AGE=0 -OBT_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION +OBT_VERSION=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION AC_SUBST(RR_MAJOR_VERSION) AC_SUBST(RR_MINOR_VERSION) @@ -180,7 +180,8 @@ AC_CONFIG_FILES([ po/Makefile.in render/obrender-4.0.pc obt/obt-4.0.pc - version.h + render/version.h + obt/version.h ]) AC_CONFIG_COMMANDS([doc], [test -d doc || mkdir doc]) diff --git a/data/rc.xml b/data/rc.xml index 86e0d9d6..ef3d9bdc 100644 --- a/data/rc.xml +++ b/data/rc.xml @@ -632,9 +632,17 @@ menu.xml 200 + no + 100 + yes + + yes + @@ -666,9 +674,12 @@ no # make the window shaded when it appears, or not - + # the position is only used if both an x and y coordinate are provided # (and not set to 'default') + # when force is "yes", then the window will be placed here even if it + # says you want it placed elsewhere. this is to override buggy + # applications who refuse to behave center # a number like 50, or 'center' to center on screen. use a negative number # to start from the right (or bottom for ), ie -50 is 50 pixels from the diff --git a/data/rc.xsd b/data/rc.xsd index bc8a8fe6..47eeed12 100644 --- a/data/rc.xsd +++ b/data/rc.xsd @@ -168,12 +168,14 @@ + + diff --git a/obt/display.c b/obt/display.c index 31d690db..d72f8ad6 100644 --- a/obt/display.c +++ b/obt/display.c @@ -135,7 +135,7 @@ static gint xerror_handler(Display *d, XErrorEvent *e) else g_error("X Error: %s", errtxt); } else - g_message("XError code %d '%s'", e->error_code, errtxt); + g_message("Ignoring XError code %d '%s'", e->error_code, errtxt); #else (void)d; (void)e; #endif diff --git a/obt/parse.h b/obt/parse.h index 37f0439e..8e5acd72 100644 --- a/obt/parse.h +++ b/obt/parse.h @@ -19,8 +19,6 @@ #ifndef __obt_parse_h #define __obt_parse_h -#include "version.h" - #include #include diff --git a/obt/version.h.in b/obt/version.h.in new file mode 100644 index 00000000..8adfcf8d --- /dev/null +++ b/obt/version.h.in @@ -0,0 +1,15 @@ +#ifndef obt__version_h +#define obt__version_h + +#define OBT_MAJOR_VERSION @OBT_MAJOR_VERSION@ +#define OBT_MINOR_VERSION @OBT_MINOR_VERSION@ +#define OBT_MICRO_VERSION @OBT_MICRO_VERSION@ +#define OBT_VERSION OBT_MAJOR_VERSION.OBT_MINOR_VERSION.OBT_MICRO_VERSION + +#define OBT_CHECK_VERSION(major,minor,micro) \ + (OBT_MAJOR_VERSION > (major) || \ + (OBT_MAJOR_VERSION == (major) && OBT_MINOR_VERSION > (minor)) || \ + (OBT_MAJOR_VERSION == (major) && OBT_MINOR_VERSION == (minor) && \ + OBT_MICRO_VERSION >= (micro))) + +#endif diff --git a/openbox/client.c b/openbox/client.c index 6534e1b3..a54feb8b 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -29,6 +29,7 @@ #include "session.h" #include "event.h" #include "grab.h" +#include "prompt.h" #include "focus.h" #include "stacking.h" #include "openbox.h" @@ -103,6 +104,7 @@ static GSList *client_search_all_top_parents_internal(ObClient *self, ObStackingLayer layer); static void client_call_notifies(ObClient *self, GSList *list); static void client_ping_event(ObClient *self, gboolean dead); +static void client_prompt_kill(ObClient *self); void client_startup(gboolean reconfig) @@ -174,7 +176,7 @@ void client_set_list(void) stacking_set_list(); } -void client_manage(Window window) +void client_manage(Window window, ObPrompt *prompt) { ObClient *self; XSetWindowAttributes attrib_set; @@ -188,8 +190,10 @@ void client_manage(Window window) map_time = event_get_server_time(); - /* choose the events we want to receive on the CLIENT window */ - attrib_set.event_mask = CLIENT_EVENTMASK; + /* choose the events we want to receive on the CLIENT window + (ObPrompt windows can request events too) */ + attrib_set.event_mask = CLIENT_EVENTMASK | + (prompt ? prompt->event_mask : 0); attrib_set.do_not_propagate_mask = CLIENT_NOPROPAGATEMASK; XChangeWindowAttributes(obt_display, window, CWEventMask|CWDontPropagate, &attrib_set); @@ -199,6 +203,7 @@ void client_manage(Window window) self = g_new0(ObClient, 1); self->obwin.type = OB_WINDOW_CLASS_CLIENT; self->window = window; + self->prompt = prompt; /* non-zero defaults */ self->wmstate = WithdrawnState; /* make sure it gets updated first time */ @@ -217,8 +222,10 @@ void client_manage(Window window) client_setup_decor_and_functions(self, FALSE); /* specify that if we exit, the window should not be destroyed and - should be reparented back to root automatically */ - XChangeSaveSet(obt_display, window, SetModeInsert); + should be reparented back to root automatically, unless we are managing + an internal ObPrompt window */ + if (!self->prompt) + XChangeSaveSet(obt_display, window, SetModeInsert); /* create the decoration frame for the client window */ self->frame = frame_new(self); @@ -616,8 +623,10 @@ void client_unmanage(ObClient *self) mouse_grab_for_client(self, FALSE); - /* remove the window from our save set */ - XChangeSaveSet(obt_display, self->window, SetModeDelete); + /* remove the window from our save set, unless we are managing an internal + ObPrompt window */ + if (!self->prompt) + XChangeSaveSet(obt_display, self->window, SetModeDelete); /* update the focus lists */ focus_order_remove(self); @@ -626,6 +635,10 @@ void client_unmanage(ObClient *self) focus_client = NULL; } + /* if we're prompting to kill the client, close that */ + prompt_unref(self->kill_prompt); + self->kill_prompt = NULL; + client_list = g_list_remove(client_list, self); stacking_remove(self); window_remove(self->window); @@ -724,6 +737,7 @@ void client_unmanage(ObClient *self) g_free(self->wm_command); g_free(self->title); g_free(self->icon_title); + g_free(self->original_title); g_free(self->name); g_free(self->class); g_free(self->role); @@ -1879,6 +1893,7 @@ void client_update_title(ObClient *self) gchar *visible = NULL; g_free(self->title); + g_free(self->original_title); /* try netwm */ if (!OBT_PROP_GETS(self->window, NET_WM_NAME, utf8, &data)) { @@ -1895,6 +1910,7 @@ void client_update_title(ObClient *self) data = g_strdup("Unnamed Window"); } } + self->original_title = g_strdup(data); if (self->client_machine) { visible = g_strdup_printf("%s (%s)", data, self->client_machine); @@ -1904,7 +1920,7 @@ void client_update_title(ObClient *self) if (self->not_responding) { data = visible; - if (self->close_tried_term) + if (self->kill_level > 0) visible = g_strdup_printf("%s - [%s]", data, _("Killing...")); else visible = g_strdup_printf("%s - [%s]", data, _("Not Responding")); @@ -1936,7 +1952,7 @@ void client_update_title(ObClient *self) if (self->not_responding) { data = visible; - if (self->close_tried_term) + if (self->kill_level > 0) visible = g_strdup_printf("%s - [%s]", data, _("Killing...")); else visible = g_strdup_printf("%s - [%s]", data, _("Not Responding")); @@ -3240,9 +3256,14 @@ static void client_ping_event(ObClient *self, gboolean dead) client_update_title(self); if (!dead) { - /* try kill it nicely the first time again, if it started responding - at some point */ - self->close_tried_term = FALSE; + /* it came back to life ! */ + + if (self->kill_prompt) { + prompt_unref(self->kill_prompt); + self->kill_prompt = NULL; + } + + self->kill_level = 0; } } @@ -3250,30 +3271,84 @@ void client_close(ObClient *self) { if (!(self->functions & OB_CLIENT_FUNC_CLOSE)) return; + if (self->prompt) { + prompt_cancel(self->prompt); + return; + } + /* in the case that the client provides no means to requesting that it close, we just kill it */ if (!self->delete_window) /* don't use client_kill(), we should only kill based on PID in response to a lack of PING replies */ XKillClient(obt_display, self->window); - else if (self->not_responding) - client_kill(self); - else + else { /* request the client to close with WM_DELETE_WINDOW */ OBT_PROP_MSG_TO(self->window, self->window, WM_PROTOCOLS, OBT_PROP_ATOM(WM_DELETE_WINDOW), event_curtime, 0, 0, 0, NoEventMask); + + if (self->not_responding) + client_prompt_kill(self); + } +} + +#define OB_KILL_RESULT_NO 0 +#define OB_KILL_RESULT_YES 1 + +static void client_kill_requested(ObPrompt *p, gint result, gpointer data) +{ + ObClient *self = data; + + if (result == OB_KILL_RESULT_YES) + client_kill(self); + + prompt_unref(self->kill_prompt); + self->kill_prompt = NULL; +} + +static void client_prompt_kill(ObClient *self) +{ + /* check if we're already prompting */ + if (!self->kill_prompt) { + ObPromptAnswer answers[] = { + { _("No"), OB_KILL_RESULT_NO }, + { _("Yes"), OB_KILL_RESULT_YES } + }; + gchar *m; + const gchar *sig; + + if (self->kill_level == 0) + sig = "terminate"; + else + sig = "kill"; + + m = g_strdup_printf + (_("The window \"%s\" does not seem to be responding. Do you want to force it to exit by sending the %s signal?"), self->original_title, sig); + + self->kill_prompt = prompt_new(m, answers, + sizeof(answers)/sizeof(answers[0]), + OB_KILL_RESULT_NO, /* default = no */ + OB_KILL_RESULT_NO, /* cancel = no */ + client_kill_requested, self); + g_free(m); + } + + prompt_show(self->kill_prompt, self); } void client_kill(ObClient *self) { + /* don't kill our own windows */ + if (self->prompt) return; + if (!self->client_machine && self->pid) { /* running on the local host */ - if (!self->close_tried_term) { + if (self->kill_level == 0) { ob_debug("killing window 0x%x with pid %lu, with SIGTERM", self->window, self->pid); kill(self->pid, SIGTERM); - self->close_tried_term = TRUE; + ++self->kill_level; /* show that we're trying to kill it */ client_update_title(self); @@ -3284,8 +3359,10 @@ void client_kill(ObClient *self) kill(self->pid, SIGKILL); /* kill -9 */ } } - else + else { + /* running on a remote host */ XKillClient(obt_display, self->window); + } } void client_hilite(ObClient *self, gboolean hilite) diff --git a/openbox/client.h b/openbox/client.h index a27d37c6..dbe93d28 100644 --- a/openbox/client.h +++ b/openbox/client.h @@ -37,6 +37,7 @@ struct _ObFrame; struct _ObGroup; struct _ObSessionState; +struct _ObPrompt; typedef struct _ObClient ObClient; typedef struct _ObClientIcon ObClientIcon; @@ -82,6 +83,10 @@ struct _ObClient ObWindow obwin; Window window; + /*! If this client is managing an ObPrompt window, then this is set to the + prompt */ + struct _ObPrompt *prompt; + /*! The window's decorations. NULL while the window is being managed! */ struct _ObFrame *frame; @@ -115,6 +120,8 @@ struct _ObClient gchar *title; /*! Window title when iconified */ gchar *icon_title; + /*! The title as requested by the client, without any of our own changes */ + gchar *original_title; /*! Hostname of machine running the client */ gchar *client_machine; /*! The command used to run the program. Pre-XSMP window identification. */ @@ -231,8 +238,11 @@ struct _ObClient /*! Indicates if the client is trying to close but has stopped responding to pings */ gboolean not_responding; + /*! A prompt shown when you are trying to close a client that is not + responding. It asks if you want to kill the client */ + struct _ObPrompt *kill_prompt; /*! We tried to close the window with a SIGTERM */ - gboolean close_tried_term; + gint kill_level; #ifdef SYNC /*! The client wants to sync during resizes */ @@ -322,8 +332,11 @@ typedef void (*ObClientCallback)(ObClient *client, gpointer data); void client_add_destroy_notify(ObClientCallback func, gpointer data); void client_remove_destroy_notify(ObClientCallback func); -/*! Manages a given window */ -void client_manage(Window win); +/*! Manages a given window + @param prompt This specifies an ObPrompt which is being managed. It is + possible to manage Openbox-owned windows through this. +*/ +void client_manage(Window win, struct _ObPrompt *prompt); /*! Unmanages all managed windows */ void client_unmanage_all(); /*! Unmanages a given client */ @@ -688,7 +701,9 @@ ObClient *client_direct_parent(ObClient *self); */ ObClient *client_search_top_direct_parent(ObClient *self); -/*! Is one client a direct child of another (i.e. not through the group.) */ +/*! Is one client a direct child of another (i.e. not through the group.) + This checks more than one level, so there may be another direct child in + between */ gboolean client_is_direct_child(ObClient *parent, ObClient *child); /*! Search for a parent of a client. This only searches up *ONE LEVEL*, and diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c index c1572eaf..76a819fc 100644 --- a/openbox/client_list_combined_menu.c +++ b/openbox/client_list_combined_menu.c @@ -94,10 +94,12 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data) } } - menu_add_separator(menu, SEPARATOR, _("Manage desktops")); - menu_add_normal(menu, ADD_DESKTOP, _("_Add new desktop"), NULL, TRUE); - menu_add_normal(menu, REMOVE_DESKTOP, _("_Remove last desktop"), - NULL, TRUE); + if (config_menu_manage_desktops) { + menu_add_separator(menu, SEPARATOR, _("Manage desktops")); + menu_add_normal(menu, ADD_DESKTOP, _("_Add new desktop"), NULL, TRUE); + menu_add_normal(menu, REMOVE_DESKTOP, _("_Remove last desktop"), + NULL, TRUE); + } return TRUE; /* always show the menu */ } diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c index 0febe2e6..e6521a0a 100644 --- a/openbox/client_list_menu.c +++ b/openbox/client_list_menu.c @@ -153,10 +153,12 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data) desktop_menus = g_slist_append(desktop_menus, submenu); } - menu_add_separator(menu, SEPARATOR, NULL); - menu_add_normal(menu, ADD_DESKTOP, _("_Add new desktop"), NULL, TRUE); - menu_add_normal(menu, REMOVE_DESKTOP, _("_Remove last desktop"), - NULL, TRUE); + if (config_menu_manage_desktops) { + menu_add_separator(menu, SEPARATOR, NULL); + menu_add_normal(menu, ADD_DESKTOP, _("_Add new desktop"), NULL, TRUE); + menu_add_normal(menu, REMOVE_DESKTOP, _("_Remove last desktop"), + NULL, TRUE); + } return TRUE; /* always show */ } diff --git a/openbox/config.c b/openbox/config.c index eaaab536..a268eb5b 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -88,6 +88,7 @@ guint config_menu_hide_delay; gboolean config_menu_middle; guint config_submenu_show_delay; gboolean config_menu_client_list_icons; +gboolean config_menu_manage_desktops; GSList *config_menu_files; @@ -136,6 +137,7 @@ void config_app_settings_copy_non_defaults(const ObAppSettings *src, if (src->pos_given) { dst->pos_given = TRUE; + dst->pos_force = src->pos_force; dst->position = src->position; dst->monitor = src->monitor; } @@ -241,6 +243,8 @@ static void parse_per_app_settings(xmlNodePtr node, gpointer d) settings->monitor = obt_parse_node_int(c) + 1; g_free(s); } + + obt_parse_attr_bool(n, "force", &settings->pos_force); } if ((n = obt_parse_find_node(app->children, "focus"))) @@ -759,6 +763,8 @@ static void parse_menu(xmlNodePtr node, gpointer d) config_submenu_show_delay = obt_parse_node_int(n); if ((n = obt_parse_find_node(node, "applicationIcons"))) config_menu_client_list_icons = obt_parse_node_bool(n); + if ((n = obt_parse_find_node(node, "manageDesktops"))) + config_menu_manage_desktops = obt_parse_node_bool(n); } } @@ -949,6 +955,7 @@ void config_startup(ObtParseInst *i) config_menu_middle = FALSE; config_submenu_show_delay = 0; config_menu_client_list_icons = TRUE; + config_menu_manage_desktops = TRUE; config_menu_files = NULL; obt_parse_register(i, "menu", parse_menu, NULL); diff --git a/openbox/config.h b/openbox/config.h index 1a60ee0f..cf9eb43e 100644 --- a/openbox/config.h +++ b/openbox/config.h @@ -40,6 +40,7 @@ struct _ObAppSettings GravityPoint position; gboolean pos_given; + gboolean pos_force; guint desktop; gint shade; @@ -175,8 +176,10 @@ extern guint config_menu_hide_delay; extern gboolean config_menu_middle; /*! Delay before opening a submenu in milliseconds */ extern guint config_submenu_show_delay; -/*! show icons in client_list_menu */ +/*! Show icons in client_list_menu */ extern gboolean config_menu_client_list_icons; +/*! Show manage desktops in client_list_menu */ +extern gboolean config_menu_manage_desktops; /*! User-specified menu files */ extern GSList *config_menu_files; /*! Per app settings */ diff --git a/openbox/event.c b/openbox/event.c index bce1de12..4fbb97c6 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -29,6 +29,7 @@ #include "frame.h" #include "grab.h" #include "menu.h" +#include "prompt.h" #include "menuframe.h" #include "keyboard.h" #include "mouse.h" @@ -85,11 +86,12 @@ static void event_process(const XEvent *e, gpointer data); static void event_handle_root(XEvent *e); static gboolean event_handle_menu_input(XEvent *e); static void event_handle_menu(ObMenuFrame *frame, XEvent *e); +static gboolean event_handle_prompt(ObPrompt *p, XEvent *e); static void event_handle_dock(ObDock *s, XEvent *e); static void event_handle_dockapp(ObDockApp *app, XEvent *e); static void event_handle_client(ObClient *c, XEvent *e); static void event_handle_user_input(ObClient *client, XEvent *e); -static gboolean is_enter_focus_event_ignored(XEvent *e); +static gboolean is_enter_focus_event_ignored(gulong serial); static void event_ignore_enter_range(gulong start, gulong end); static void focus_delay_dest(gpointer data); @@ -466,6 +468,7 @@ static void event_process(const XEvent *ec, gpointer data) ObDockApp *dockapp = NULL; ObWindow *obwin = NULL; ObMenuFrame *menu = NULL; + ObPrompt *prompt = NULL; /* make a copy we can mangle */ ee = *ec; @@ -481,6 +484,8 @@ static void event_process(const XEvent *ec, gpointer data) break; case OB_WINDOW_CLASS_CLIENT: client = WINDOW_AS_CLIENT(obwin); + /* events on clients can be events on prompt windows too */ + prompt = client->prompt; break; case OB_WINDOW_CLASS_MENUFRAME: menu = WINDOW_AS_MENUFRAME(obwin); @@ -488,6 +493,9 @@ static void event_process(const XEvent *ec, gpointer data) case OB_WINDOW_CLASS_INTERNAL: /* we don't do anything with events directly on these windows */ break; + case OB_WINDOW_CLASS_PROMPT: + prompt = WINDOW_AS_PROMPT(obwin); + break; } } else @@ -704,7 +712,9 @@ static void event_process(const XEvent *ec, gpointer data) } #endif - if (e->type == ButtonPress || e->type == ButtonRelease) { + if (prompt && event_handle_prompt(prompt, e)) + ; + else if (e->type == ButtonPress || e->type == ButtonRelease) { /* If the button press was on some non-root window, or was physically on the root window, then process it */ if (window != obt_root(ob_screen) || @@ -800,6 +810,12 @@ void event_enter_client(ObClient *client) { g_assert(config_focus_follow); + if (is_enter_focus_event_ignored(event_curserial)) { + ob_debug_type(OB_DEBUG_FOCUS, "Ignoring enter event with serial %lu\n" + "on client 0x%x", event_curserial, client->window); + return; + } + if (client_enter_focusable(client) && client_can_focus(client)) { if (config_focus_delay) { ObFocusDelayData *data; @@ -1044,8 +1060,7 @@ static void event_handle_client(ObClient *client, XEvent *e) if (e->xcrossing.mode == NotifyGrab || e->xcrossing.mode == NotifyUngrab || /*ignore enters when we're already in the window */ - e->xcrossing.detail == NotifyInferior || - is_enter_focus_event_ignored(e)) + e->xcrossing.detail == NotifyInferior) { ob_debug_type(OB_DEBUG_FOCUS, "%sNotify mode %d detail %d serial %lu on %lx " @@ -1667,6 +1682,21 @@ static ObMenuFrame* find_active_or_last_menu(void) return ret; } +static gboolean event_handle_prompt(ObPrompt *p, XEvent *e) +{ + switch (e->type) { + case ButtonPress: + case ButtonRelease: + case MotionNotify: + return prompt_mouse_event(p, e); + break; + case KeyPress: + return prompt_key_event(p, e); + break; + } + return FALSE; +} + static gboolean event_handle_menu_input(XEvent *ev) { gboolean ret = FALSE; @@ -1967,26 +1997,21 @@ void event_end_ignore_all_enters(gulong start) event_ignore_enter_range(start, NextRequest(obt_display)-1); } -static gboolean is_enter_focus_event_ignored(XEvent *e) +static gboolean is_enter_focus_event_ignored(gulong serial) { GSList *it, *next; - g_assert(e->type == EnterNotify && - !(e->xcrossing.mode == NotifyGrab || - e->xcrossing.mode == NotifyUngrab || - e->xcrossing.detail == NotifyInferior)); - for (it = ignore_serials; it; it = next) { ObSerialRange *r = it->data; next = g_slist_next(it); - if ((glong)(e->xany.serial - r->end) > 0) { + if ((glong)(serial - r->end) > 0) { /* past the end */ ignore_serials = g_slist_delete_link(ignore_serials, it); g_free(r); } - else if ((glong)(e->xany.serial - r->start) >= 0) + else if ((glong)(serial - r->start) >= 0) return TRUE; } return FALSE; diff --git a/openbox/focus.c b/openbox/focus.c index 68b0b7f9..cff81bfb 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -57,6 +57,14 @@ void focus_shutdown(gboolean reconfig) static void push_to_top(ObClient *client) { + ObClient *p; + + /* if it is modal for a single window, then put that window at the top + of the focus order first, so it will be right after ours. the same is + done with stacking */ + if (client->modal && (p = client_direct_parent(client))) + push_to_top(p); + focus_order = g_list_remove(focus_order, client); focus_order = g_list_prepend(focus_order, client); } diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c index da5efa56..495a7230 100644 --- a/openbox/focus_cycle_indicator.c +++ b/openbox/focus_cycle_indicator.c @@ -59,10 +59,10 @@ void focus_cycle_indicator_startup(gboolean reconfig) if (reconfig) return; - focus_indicator.top.obwin.type = OB_WINDOW_CLASS_INTERNAL; - focus_indicator.left.obwin.type = OB_WINDOW_CLASS_INTERNAL; - focus_indicator.right.obwin.type = OB_WINDOW_CLASS_INTERNAL; - focus_indicator.bottom.obwin.type = OB_WINDOW_CLASS_INTERNAL; + focus_indicator.top.type = OB_WINDOW_CLASS_INTERNAL; + focus_indicator.left.type = OB_WINDOW_CLASS_INTERNAL; + focus_indicator.right.type = OB_WINDOW_CLASS_INTERNAL; + focus_indicator.bottom.type = OB_WINDOW_CLASS_INTERNAL; attr.override_redirect = True; attr.background_pixel = BlackPixel(obt_display, ob_screen); diff --git a/openbox/menuframe.c b/openbox/menuframe.c index b48b9280..598bc005 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -386,8 +386,11 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) text_a->texture[0].data.text.shortcut = FALSE; break; case OB_MENU_ENTRY_TYPE_SEPARATOR: - if (self->entry->data.separator.label != NULL) + if (self->entry->data.separator.label != NULL) { text_a = ob_rr_theme->a_menu_text_title; + text_a->texture[0].data.text.string = + self->entry->data.separator.label; + } else text_a = ob_rr_theme->a_menu_text_normal; break; diff --git a/openbox/misc.h b/openbox/misc.h index 2b5584d7..c73c9265 100644 --- a/openbox/misc.h +++ b/openbox/misc.h @@ -51,6 +51,8 @@ typedef enum OB_KEY_RIGHT, OB_KEY_UP, OB_KEY_DOWN, + OB_KEY_TAB, + OB_KEY_SPACE, OB_NUM_KEYS } ObKey; diff --git a/openbox/openbox.c b/openbox/openbox.c index 80f81594..a6a81cef 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -41,6 +41,7 @@ #include "group.h" #include "config.h" #include "ping.h" +#include "prompt.h" #include "gettext.h" #include "render/render.h" #include "render/theme.h" @@ -209,6 +210,8 @@ gint main(gint argc, gchar **argv) keys[OB_KEY_RIGHT] = obt_keyboard_keysym_to_keycode(XK_Right); keys[OB_KEY_UP] = obt_keyboard_keysym_to_keycode(XK_Up); keys[OB_KEY_DOWN] = obt_keyboard_keysym_to_keycode(XK_Down); + keys[OB_KEY_TAB] = obt_keyboard_keysym_to_keycode(XK_Tab); + keys[OB_KEY_SPACE] = obt_keyboard_keysym_to_keycode(XK_space); { ObtParseInst *i; @@ -293,6 +296,7 @@ gint main(gint argc, gchar **argv) grab_startup(reconfigure); group_startup(reconfigure); ping_startup(reconfigure); + prompt_startup(reconfigure); client_startup(reconfigure); dock_startup(reconfigure); moveresize_startup(reconfigure); @@ -349,6 +353,7 @@ gint main(gint argc, gchar **argv) moveresize_shutdown(reconfigure); dock_shutdown(reconfigure); client_shutdown(reconfigure); + prompt_shutdown(reconfigure); ping_shutdown(reconfigure); group_shutdown(reconfigure); grab_shutdown(reconfigure); @@ -558,7 +563,6 @@ static void parse_args(gint *argc, gchar **argv) } else if (!strcmp(argv[i], "--config-file")) { if (i == *argc - 1) /* no args left */ - /* not translated cuz it's sekret */ g_printerr(_("--config-file requires an argument\n")); else { /* this will be in the current locale encoding, which is diff --git a/openbox/place.c b/openbox/place.c index 9e38bdef..aac40e8a 100644 --- a/openbox/place.c +++ b/openbox/place.c @@ -489,8 +489,9 @@ gboolean place_client(ObClient *client, gint *x, gint *y, gboolean userplaced = FALSE; /* per-app settings override program specified position - * but not user specified */ - if ((client->positioned & USPosition) || + * but not user specified, unless pos_force is enabled */ + if (((client->positioned & USPosition) && + !(settings && settings->pos_given && settings->pos_force)) || ((client->positioned & PPosition) && !(settings && settings->pos_given))) return FALSE; diff --git a/openbox/prompt.c b/openbox/prompt.c new file mode 100644 index 00000000..aa5eb06f --- /dev/null +++ b/openbox/prompt.c @@ -0,0 +1,477 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + prompt.c for the Openbox window manager + Copyright (c) 2008 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + +#include "prompt.h" +#include "openbox.h" +#include "screen.h" +#include "client.h" +#include "event.h" +#include "obt/display.h" +#include "obt/keyboard.h" +#include "obt/prop.h" +#include "gettext.h" + +static GList *prompt_list = NULL; + +/* we construct these */ +static RrAppearance *prompt_a_button; +static RrAppearance *prompt_a_focus; +static RrAppearance *prompt_a_press; +/* we change the max width which would screw with others */ +static RrAppearance *prompt_a_msg; + +static void prompt_layout(ObPrompt *self); +static void render_all(ObPrompt *self); +static void render_button(ObPrompt *self, ObPromptElement *e); + +void prompt_startup(gboolean reconfig) +{ + RrColor *c_button, *c_focus, *c_press; + + prompt_a_button = RrAppearanceCopy(ob_rr_theme->a_focused_unpressed_close); + prompt_a_focus = RrAppearanceCopy(ob_rr_theme->a_hover_focused_close); + prompt_a_press = RrAppearanceCopy(ob_rr_theme->a_focused_pressed_close); + + c_button = prompt_a_button->texture[0].data.mask.color; + c_focus = prompt_a_focus->texture[0].data.mask.color; + c_press = prompt_a_press->texture[0].data.mask.color; + + RrAppearanceRemoveTextures(prompt_a_button); + RrAppearanceRemoveTextures(prompt_a_focus); + RrAppearanceRemoveTextures(prompt_a_press); + + RrAppearanceAddTextures(prompt_a_button, 1); + RrAppearanceAddTextures(prompt_a_focus, 1); + RrAppearanceAddTextures(prompt_a_press, 1); + + /* totally cheating here.. */ + prompt_a_button->texture[0] = ob_rr_theme->osd_hilite_label->texture[0]; + prompt_a_focus->texture[0] = ob_rr_theme->osd_hilite_label->texture[0]; + prompt_a_press->texture[0] = ob_rr_theme->osd_hilite_label->texture[0]; + + prompt_a_button->texture[0].data.text.justify = RR_JUSTIFY_CENTER; + prompt_a_focus->texture[0].data.text.justify = RR_JUSTIFY_CENTER; + prompt_a_press->texture[0].data.text.justify = RR_JUSTIFY_CENTER; + + prompt_a_button->texture[0].data.text.color = c_button; + prompt_a_focus->texture[0].data.text.color = c_focus; + prompt_a_press->texture[0].data.text.color = c_press; + + prompt_a_msg = RrAppearanceCopy(ob_rr_theme->osd_hilite_label); + prompt_a_msg->texture[0].data.text.flow = TRUE; + + if (reconfig) { + GList *it; + for (it = prompt_list; it; it = g_list_next(it)) { + ObPrompt *p = it->data; + prompt_layout(p); + render_all(p); + } + } +} + +void prompt_shutdown(gboolean reconfig) +{ + RrAppearanceFree(prompt_a_button); + RrAppearanceFree(prompt_a_focus); + RrAppearanceFree(prompt_a_press); + RrAppearanceFree(prompt_a_msg); +} + +ObPrompt* prompt_new(const gchar *msg, + const ObPromptAnswer *answers, gint n_answers, + gint default_result, gint cancel_result, + ObPromptCallback func, gpointer data) +{ + ObPrompt *self; + XSetWindowAttributes attrib; + gint i; + + attrib.override_redirect = FALSE; + attrib.border_pixel = RrColorPixel(ob_rr_theme->osd_border_color); + + self = g_new0(ObPrompt, 1); + self->ref = 1; + self->func = func; + self->data = data; + self->default_result = default_result; + self->cancel_result = cancel_result; + self->super.type = OB_WINDOW_CLASS_PROMPT; + self->super.window = XCreateWindow(obt_display, obt_root(ob_screen), + 0, 0, 1, 1, ob_rr_theme->obwidth, + CopyFromParent, InputOutput, + CopyFromParent, + CWOverrideRedirect | CWBorderPixel, + &attrib); + + /* make it a dialog type window */ + OBT_PROP_SET32(self->super.window, NET_WM_WINDOW_TYPE, ATOM, + OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_DIALOG)); + + /* listen for key presses on the window */ + self->event_mask = KeyPressMask; + + /* we make a copy of this appearance for each prompt */ + self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); + + /* set up the text message widow */ + self->msg.text = g_strdup(msg); + self->msg.window = XCreateWindow(obt_display, self->super.window, + 0, 0, 1, 1, 0, + CopyFromParent, InputOutput, + CopyFromParent, 0, NULL); + XMapWindow(obt_display, self->msg.window); + + /* set up the buttons from the answers */ + + self->n_buttons = n_answers; + if (!self->n_buttons) + self->n_buttons = 1; + + self->button = g_new0(ObPromptElement, self->n_buttons); + + if (n_answers == 0) { + g_assert(self->n_buttons == 1); /* should be set to this above.. */ + self->button[0].text = g_strdup(_("OK")); + } + else { + g_assert(self->n_buttons > 0); + for (i = 0; i < self->n_buttons; ++i) { + self->button[i].text = g_strdup(answers[i].text); + self->button[i].result = answers[i].result; + } + } + + for (i = 0; i < self->n_buttons; ++i) { + self->button[i].window = XCreateWindow(obt_display, self->super.window, + 0, 0, 1, 1, 0, + CopyFromParent, InputOutput, + CopyFromParent, 0, NULL); + XMapWindow(obt_display, self->button[i].window); + window_add(&self->button[i].window, PROMPT_AS_WINDOW(self)); + + /* listen for button presses on the buttons */ + XSelectInput(obt_display, self->button[i].window, + ButtonPressMask | ButtonReleaseMask | ButtonMotionMask); + } + + prompt_list = g_list_prepend(prompt_list, self); + + return self; +} + +void prompt_ref(ObPrompt *self) +{ + ++self->ref; +} + +void prompt_unref(ObPrompt *self) +{ + if (self && --self->ref == 0) { + gint i; + + prompt_list = g_list_remove(prompt_list, self); + + for (i = 0; i < self->n_buttons; ++i) { + window_remove(self->button[i].window); + XDestroyWindow(obt_display, self->button[i].window); + } + + XDestroyWindow(obt_display, self->msg.window); + + RrAppearanceFree(self->a_bg); + + XDestroyWindow(obt_display, self->super.window); + g_free(self); + } +} + +static void prompt_layout(ObPrompt *self) +{ + gint l, r, t, b; + gint i; + gint allbuttonsw, allbuttonsh, buttonx; + gint w, h; + gint maxw; + + const gint OUTSIDE_MARGIN = 4; + const gint MSG_BUTTON_SEPARATION = 4; + const gint BUTTON_SEPARATION = 4; + const gint BUTTON_VMARGIN = 4; + const gint BUTTON_HMARGIN = 12; + const gint MAX_WIDTH = 600; + + RrMargins(self->a_bg, &l, &t, &r, &b); + l += OUTSIDE_MARGIN; + t += OUTSIDE_MARGIN; + r += OUTSIDE_MARGIN; + b += OUTSIDE_MARGIN; + + { + Rect *area = screen_physical_area_all_monitors(); + maxw = MIN(MAX_WIDTH, area->width*4/5); + g_free(area); + } + + /* find the button sizes and how much space we need for them */ + allbuttonsw = allbuttonsh = 0; + for (i = 0; i < self->n_buttons; ++i) { + gint bw, bh; + + prompt_a_button->texture[0].data.text.string = self->button[i].text; + prompt_a_focus->texture[0].data.text.string = self->button[i].text; + prompt_a_press->texture[0].data.text.string = self->button[i].text; + RrMinSize(prompt_a_button, &bw, &bh); + self->button[i].width = bw; + self->button[i].height = bh; + RrMinSize(prompt_a_focus, &bw, &bh); + self->button[i].width = MAX(self->button[i].width, bw); + self->button[i].height = MAX(self->button[i].height, bh); + RrMinSize(prompt_a_press, &bw, &bh); + self->button[i].width = MAX(self->button[i].width, bw); + self->button[i].height = MAX(self->button[i].height, bh); + + self->button[i].width += BUTTON_HMARGIN * 2; + self->button[i].height += BUTTON_VMARGIN * 2; + + allbuttonsw += self->button[i].width + (i > 0 ? BUTTON_SEPARATION : 0); + allbuttonsh = MAX(allbuttonsh, self->button[i].height); + } + + self->msg_wbound = MAX(allbuttonsw, maxw); + + /* measure the text message area */ + prompt_a_msg->texture[0].data.text.string = self->msg.text; + prompt_a_msg->texture[0].data.text.maxwidth = self->msg_wbound; + RrMinSize(prompt_a_msg, &self->msg.width, &self->msg.height); + + /* width and height inside the outer margins */ + w = MAX(self->msg.width, allbuttonsw); + h = self->msg.height + MSG_BUTTON_SEPARATION + allbuttonsh; + + /* position the text message */ + self->msg.x = l + (w - self->msg.width) / 2; + self->msg.y = t; + + /* position the button buttons on the right of the dialog */ + buttonx = l + w; + for (i = self->n_buttons - 1; i >= 0; --i) { + self->button[i].x = buttonx - self->button[i].width; + buttonx -= self->button[i].width + BUTTON_SEPARATION; + self->button[i].y = t + h - allbuttonsh; + self->button[i].y += (allbuttonsh - self->button[i].height) / 2; + } + + /* size and position the toplevel window */ + self->width = w + l + r; + self->height = h + t + b; + + /* move and resize the actual windows */ + XResizeWindow(obt_display, self->super.window, self->width, self->height); + XMoveResizeWindow(obt_display, self->msg.window, + self->msg.x, self->msg.y, + self->msg.width, self->msg.height); + for (i = 0; i < self->n_buttons; ++i) + XMoveResizeWindow(obt_display, self->button[i].window, + self->button[i].x, self->button[i].y, + self->button[i].width, self->button[i].height); +} + +static void render_button(ObPrompt *self, ObPromptElement *e) +{ + RrAppearance *a; + + if (e->pressed) a = prompt_a_press; + else if (self->focus == e) a = prompt_a_focus; + else a = prompt_a_button; + + a->surface.parent = self->a_bg; + a->surface.parentx = e->x; + a->surface.parentx = e->y; + + a->texture[0].data.text.string = e->text; + RrPaint(a, e->window, e->width, e->height); +} + +static void render_all(ObPrompt *self) +{ + gint i; + + RrPaint(self->a_bg, self->super.window, self->width, self->height); + + prompt_a_msg->surface.parent = self->a_bg; + prompt_a_msg->surface.parentx = self->msg.x; + prompt_a_msg->surface.parenty = self->msg.y; + + prompt_a_msg->texture[0].data.text.string = self->msg.text; + prompt_a_msg->texture[0].data.text.maxwidth = self->msg_wbound; + RrPaint(prompt_a_msg, self->msg.window, self->msg.width, self->msg.height); + + for (i = 0; i < self->n_buttons; ++i) + render_button(self, &self->button[i]); +} + +void prompt_show(ObPrompt *self, ObClient *parent) +{ + XSizeHints hints; + gint i; + + if (self->mapped) { + /* activate the prompt */ + OBT_PROP_MSG(ob_screen, self->super.window, NET_ACTIVE_WINDOW, + 1, /* from an application.. */ + event_curtime, + 0, + 0, 0); + return; + } + + /* set the focused button (if not found then the first button is used) */ + self->focus = &self->button[0]; + for (i = 0; i < self->n_buttons; ++i) + if (self->button[i].result == self->default_result) { + self->focus = &self->button[i]; + break; + } + + /* you can't resize the prompt */ + hints.flags = PMinSize | PMaxSize; + hints.min_width = hints.max_width = self->width; + hints.min_height = hints.max_height = self->height; + XSetWMNormalHints(obt_display, self->super.window, &hints); + + XSetTransientForHint(obt_display, self->super.window, + (parent ? parent->window : 0)); + + /* set up the dialog and render it */ + prompt_layout(self); + render_all(self); + + client_manage(self->super.window, self); + + self->mapped = TRUE; +} + +void prompt_hide(ObPrompt *self) +{ + XUnmapWindow(obt_display, self->super.window); + self->mapped = FALSE; +} + +gboolean prompt_key_event(ObPrompt *self, XEvent *e) +{ + gboolean shift; + guint shift_mask; + + if (e->type != KeyPress) return FALSE; + + shift_mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SHIFT); + shift = !!(e->xkey.state & shift_mask); + + /* only accept shift */ + if (e->xkey.state != 0 && e->xkey.state != shift_mask) + return FALSE; + + if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) + prompt_cancel(self); + else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN) || + e->xkey.keycode == ob_keycode(OB_KEY_SPACE)) + { + if (self->func) self->func(self, self->focus->result, self->data); + prompt_hide(self); + } + else if (e->xkey.keycode == ob_keycode(OB_KEY_TAB) || + e->xkey.keycode == ob_keycode(OB_KEY_LEFT) || + e->xkey.keycode == ob_keycode(OB_KEY_RIGHT)) + { + gint i; + gboolean left; + ObPromptElement *oldfocus; + + left = e->xkey.keycode == ob_keycode(OB_KEY_LEFT) || + (e->xkey.keycode == ob_keycode(OB_KEY_TAB) && shift); + oldfocus = self->focus; + + for (i = 0; i < self->n_buttons; ++i) + if (self->focus == &self->button[i]) break; + i += (left ? -1 : 1); + if (i < 0) i = self->n_buttons - 1; + else if (i >= self->n_buttons) i = 0; + self->focus = &self->button[i]; + + if (oldfocus != self->focus) render_button(self, oldfocus); + render_button(self, self->focus); + } + return TRUE; +} + +gboolean prompt_mouse_event(ObPrompt *self, XEvent *e) +{ + gint i; + ObPromptElement *but; + + if (e->type != ButtonPress && e->type != ButtonRelease && + e->type != MotionNotify) return FALSE; + + /* find the button */ + but = NULL; + for (i = 0; i < self->n_buttons; ++i) + if (self->button[i].window == + (e->type == MotionNotify ? e->xmotion.window : e->xbutton.window)) + { + but = &self->button[i]; + break; + } + if (!but) return FALSE; + + if (e->type == ButtonPress) { + ObPromptElement *oldfocus; + + oldfocus = self->focus; + + but->pressed = TRUE; + self->focus = but; + + if (oldfocus != but) render_button(self, oldfocus); + render_button(self, but); + } + else if (e->type == ButtonRelease) { + if (but->pressed) { + if (self->func) self->func(self, but->result, self->data); + prompt_hide(self); + } + } + else if (e->type == MotionNotify) { + gboolean press; + + press = (e->xmotion.x >= 0 && e->xmotion.y >= 0 && + e->xmotion.x < but->width && e->xmotion.y < but->height); + + if (press != but->pressed) { + but->pressed = press; + render_button(self, but); + } + } + return TRUE; +} + +void prompt_cancel(ObPrompt *self) +{ + if (self->func) self->func(self, self->cancel_result, self->data); + prompt_hide(self); +} diff --git a/openbox/prompt.h b/openbox/prompt.h new file mode 100644 index 00000000..1bcd66cc --- /dev/null +++ b/openbox/prompt.h @@ -0,0 +1,110 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + prompt.h for the Openbox window manager + Copyright (c) 2008 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + +#ifndef ob__prompt_h +#define ob__prompt_h + +#include "window.h" +#include "geom.h" +#include "render/render.h" +#include +#include + +typedef struct _ObPrompt ObPrompt; +typedef struct _ObPromptElement ObPromptElement; +typedef struct _ObPromptAnswer ObPromptAnswer; + +typedef void (*ObPromptCallback)(ObPrompt *p, gint result, gpointer data); + +struct _ObPromptElement { + gchar *text; + Window window; + + gint x, y, width, height; + gboolean pressed; + gint result; +}; + +struct _ObPrompt +{ + ObInternalWindow super; + gint ref; + + guint event_mask; + + /* keep a copy of this because we re-render things that may need it + (i.e. the buttons) */ + RrAppearance *a_bg; + + gboolean mapped; + gint width, height; + gint msg_wbound; + + ObPromptElement msg; + + /* one for each answer */ + ObPromptElement *button; + gint n_buttons; + + /* points to the button with the focus */ + ObPromptElement *focus; + /* the default button to have selected */ + gint default_result; + /* the cancel result if the dialog is closed */ + gint cancel_result; + + ObPromptCallback func; + gpointer data; +}; + +struct _ObPromptAnswer { + const gchar *text; + gint result; +}; + +void prompt_startup(gboolean reconfig); +void prompt_shutdown(gboolean reconfig); + +/*! Create a new prompt + @param answers A number of ObPromptAnswers which define the buttons which + will appear in the dialog from left to right, and the result + returned when they are selected. + @param n_answers The number of answers + @param default_result The result for the answer button selected by default + @param cancel_result The result that is given if the dialog is closed instead + of having a button presssed + @param func The callback function which is called when the dialog is closed + or a button is pressed + @param data User defined data which will be passed to the callback +*/ +ObPrompt* prompt_new(const gchar *msg, + const ObPromptAnswer *answers, gint n_answers, + gint default_result, gint cancel_result, + ObPromptCallback func, gpointer data); +void prompt_ref(ObPrompt *self); +void prompt_unref(ObPrompt *self); + +/*! Show the prompt. It will be centered within the given area rectangle */ +void prompt_show(ObPrompt *self, struct _ObClient *parent); +void prompt_hide(ObPrompt *self); + +gboolean prompt_key_event(ObPrompt *self, XEvent *e); +gboolean prompt_mouse_event(ObPrompt *self, XEvent *e); +void prompt_cancel(ObPrompt *self); + +#endif diff --git a/openbox/stacking.c b/openbox/stacking.c index 03a62dd4..3c05df49 100644 --- a/openbox/stacking.c +++ b/openbox/stacking.c @@ -221,6 +221,15 @@ static void restack_windows(ObClient *selected, gboolean raise) GList *modals = NULL; GList *trans = NULL; + if (raise) { + ObClient *p; + + /* if a window is modal for another single window, then raise it to the + top too, the same is done with the focus order */ + while (selected->modal && (p = client_direct_parent(selected))) + selected = p; + } + /* remove first so we can't run into ourself */ it = g_list_find(stacking_list, selected); g_assert(it); diff --git a/openbox/window.c b/openbox/window.c index 28b08571..c8951741 100644 --- a/openbox/window.c +++ b/openbox/window.c @@ -23,6 +23,7 @@ #include "client.h" #include "frame.h" #include "openbox.h" +#include "prompt.h" #include "debug.h" #include "grab.h" @@ -57,6 +58,8 @@ Window window_top(ObWindow *self) return WINDOW_AS_CLIENT(self)->frame->window; case OB_WINDOW_CLASS_INTERNAL: return WINDOW_AS_INTERNAL(self)->window; + case OB_WINDOW_CLASS_PROMPT: + return WINDOW_AS_PROMPT(self)->super.window; } g_assert_not_reached(); return None; @@ -71,6 +74,7 @@ ObStackingLayer window_layer(ObWindow *self) return ((ObClient*)self)->layer; case OB_WINDOW_CLASS_MENUFRAME: case OB_WINDOW_CLASS_INTERNAL: + case OB_WINDOW_CLASS_PROMPT: return OB_STACKING_LAYER_INTERNAL; } g_assert_not_reached(); @@ -189,7 +193,7 @@ void window_manage(Window win) dock_manage(icon_win, win); } else - client_manage(win); + client_manage(win, NULL); } else { grab_server(FALSE); diff --git a/openbox/window.h b/openbox/window.h index c7bfc895..24a7d07b 100644 --- a/openbox/window.h +++ b/openbox/window.h @@ -31,7 +31,8 @@ typedef enum { OB_WINDOW_CLASS_MENUFRAME, OB_WINDOW_CLASS_DOCK, OB_WINDOW_CLASS_CLIENT, - OB_WINDOW_CLASS_INTERNAL + OB_WINDOW_CLASS_INTERNAL, + OB_WINDOW_CLASS_PROMPT } ObWindowClass; /* In order to be an ObWindow, you need to make this struct the top of your @@ -48,21 +49,26 @@ struct _ObWindow { (((ObWindow*)win)->type == OB_WINDOW_CLASS_CLIENT) #define WINDOW_IS_INTERNAL(win) \ (((ObWindow*)win)->type == OB_WINDOW_CLASS_INTERNAL) +#define WINDOW_IS_PROMPT(win) \ + (((ObWindow*)win)->type == OB_WINDOW_CLASS_PROMPT) struct _ObMenu; struct _ObDock; struct _ObDockApp; struct _ObClient; +struct _ObPrompt; #define WINDOW_AS_MENUFRAME(win) ((struct _ObMenuFrame*)win) #define WINDOW_AS_DOCK(win) ((struct _ObDock*)win) #define WINDOW_AS_CLIENT(win) ((struct _ObClient*)win) #define WINDOW_AS_INTERNAL(win) ((struct _ObInternalWindow*)win) +#define WINDOW_AS_PROMPT(win) ((struct _ObPrompt*)win) #define MENUFRAME_AS_WINDOW(menu) ((ObWindow*)menu) #define DOCK_AS_WINDOW(dock) ((ObWindow*)dock) #define CLIENT_AS_WINDOW(client) ((ObWindow*)client) #define INTERNAL_AS_WINDOW(intern) ((ObWindow*)intern) +#define PROMPT_AS_WINDOW(prompt) ((ObWindow*)prompt) void window_startup (gboolean reconfig); void window_shutdown(gboolean reconfig); @@ -76,7 +82,7 @@ void window_remove(Window xwin); /* Internal openbox-owned windows like the alt-tab popup */ struct _ObInternalWindow { - ObWindow obwin; + ObWindowClass type; Window window; }; diff --git a/po/POTFILES.in b/po/POTFILES.in index 00f0dcf9..6de409fc 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -15,3 +15,4 @@ openbox/screen.c openbox/session.c openbox/startupnotify.c openbox/translate.c +openbox/prompt.c diff --git a/po/ar.po b/po/ar.po index 11d1e803..adc5e9df 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: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2007-07-21 14:43+0300\n" "Last-Translator: Khaled Hosny \n" "Language-Team: Arabic \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : " "3\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "" @@ -158,59 +158,59 @@ msgstr "حاولت الوصول إلى القائمة '%s' لكنها غير م msgid "More..." msgstr "المزيد..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "زر غير صحيح '%s' في ارتباط الفأرة" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "سياق غير صحيح '%s' في ارتباط الفأرة" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "لم أستطع تغيير المجلد المنزلي '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "تعذّر فتح العرض من متغير البيئة DISPLAY." -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "تعذّر بدأ مكتبة obrender." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "خادم إكس لا يدعم المحليّة." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "لم أستطِع ضبط مُغيِّرات المحليّة لخادم إكس." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "لم أعثر على ملف إعدادات سليم، سأستخدم بعض الإفتراضيات البسيطة" -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "لم أستطِع تحميل سِمة." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "فشلت إعادة التشغيل في تنفيذ مُنفّذ جديد '%s': %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "حقوق النسخ" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "الصيغة: openbox [options]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -218,23 +218,27 @@ msgstr "" "\n" "الخيارات:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help اعرض هذه المساعدة ثم اخرج\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version اعرض النسخة ثم اخرج\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace استبدل مدير النوافذ الذي يعمل حاليا\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable عطِّل الإتصال بمدير الجلسة\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -242,19 +246,19 @@ msgstr "" "\n" "تمرير رسائل لمرّة تعمل من أوبن‌بوكس:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure أعِد تحميل إعدادات أوبن‌بوكس\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart أعِد تشغيل أوبن‌بوكس\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -262,23 +266,23 @@ msgstr "" "\n" "خيارات التنقيح:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync شغّل في النمط المزامن\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug اعرض خرْج التنقيح\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus اعرض خرج التنقيح للتعامل مع البؤرة\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama شق العرض إلى شاشات xinerama زائفة\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -287,7 +291,11 @@ msgstr "" "\n" "من فضلك أبلغ عن العلل إلى %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "معامل سطر أوامر غير سليم '%s'\n" @@ -307,14 +315,14 @@ msgstr "تعذّر الحصول على انتقاء مدير النوافذ عل msgid "The WM on screen %d is not exiting" msgstr "مدير النوافذ على الشاشة %Id لا وجود له" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "سطح المكتب %Ii" diff --git a/po/bn_IN.po b/po/bn_IN.po index 7a142377..5f63682d 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: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2007-06-01 19:02+0530\n" "Last-Translator: Runa Bhattacharjee \n" "Language-Team: Bengali (India) \n" @@ -17,7 +17,7 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "" @@ -158,59 +158,59 @@ msgstr "অনুপস্থিত মেনু '%s' ব্যবহারে msgid "More..." msgstr "অতিরিক্ত..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "মাউস বাইন্ডিং সংক্রান্ত অবৈধ বাটন '%s'" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "মাউস বাইন্ডিং সংক্রান্ত অবৈধ কনটেক্সট '%s'" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "ব্যক্তিগত ডিরেক্টরি '%s'-তে পরিবর্তন করতে ব্যর্থ: %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "DISPLAY এনভাশরনমেন্ট ভেরিয়েবলের মান প্রয়োগ করে প্রদর্শন আরম্ভ করতে ব্যর্থ।" -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "obrender লাইব্রেরি আরম্ভ করতে ব্যর্থ।" -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "X সার্ভার দ্বারা লোকেইল সমর্থিতত হয় না।" -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "X সার্ভারের জন্য লোকেইল মডিফায়ার নির্ধারণ করতে ব্যর্থ।" -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "বৈধ কনফিগ ফাইল সনাক্ত করতে ব্যর্থ, কয়েকটি সাধারণ ডিফল্ট মান প্রয়োগ করা হবে।" -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "থিম লোড করতে ব্যর্থ।" -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "পুনরাম্ভের পরে নতুন এক্সেকিউটেবল '%s' সঞ্চালন করতে ব্যর্থ: %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "স্বত্বাধিকার (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "ব্যবহারপ্রণালী: openbox [বিকল্প]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -218,25 +218,29 @@ msgstr "" "\n" "বিবিধ বিকল্প:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help সহায়তা বার্তা প্রদর্শন করে প্রস্থান\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version সংস্করণ প্রদর্শন করে প্রস্থান\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr "" " --replace বর্তমানে চলমান উইন্ডো পরিচালন ব্যবস্থা পরিবর্তন করা হবে\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr "" " --sm-disable সেশান পরিচালন ব্যবস্থার সাথে সংযোগ নিষ্ক্রিয় করা হবে\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -244,19 +248,19 @@ msgstr "" "\n" "চলমান Openbox ইনস্ট্যান্সে বার্তা প্রেরণ:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Openbox-র কনফিগারেশন পুনরায় লোড করে\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Openbox পুনরারম্ভ\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -264,24 +268,24 @@ msgstr "" "\n" "ডিবাগ করার বিভিন্ন বিকল্প:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync সিঙ্ক্রোনাস মোডে সঞ্চালিত হবে\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug ডিবাগ-এর ফলাফল প্রদর্শন করে\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr "" " --debug-focus ফোকাস হ্যান্ডলিং সংক্রান্ত ডিবাগের ফলাফল প্রদর্শন করে\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama প্রদর্শন ক্ষেত্রটি নকল xinerama পর্দায় ভাগ করা হবে\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -290,7 +294,11 @@ msgstr "" "\n" "অনুগ্রহ করে %s-এ বাগ সংক্রান্ত সূচনা দায়ের করুন\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "অবৈধ কমান্ড-লাইন আর্গুমেন্ট '%s'\n" @@ -310,14 +318,14 @@ msgstr "পর্দা %d-এ উইন্ডো পরিচালন ব্ msgid "The WM on screen %d is not exiting" msgstr "পর্দা %d-র উপর চলমান উইন্ডো পরিচালন ব্যবস্থাটি বন্ধ করতে ব্যর্থ" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "desktop %i" diff --git a/po/ca.po b/po/ca.po index 0ea4774c..df173c03 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: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2007-05-28 15:54+0200\n" "Last-Translator: David Majà Martínez \n" "Language-Team: catalan\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "L'acció sollicitada '%s' no és vàlida. Aquesta acció no existeix." @@ -156,63 +156,63 @@ msgstr "S'ha intentat accedir al menú '%s' ja que no existeix" msgid "More..." msgstr "Més..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "El botó '%s' no és vàlid en la vinculació del ratolí" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "El context '%s' no és vàlid en la vinculació del ratolí" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, 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:151 +#: openbox/openbox.c:152 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:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "S'ha produït un error en inicialitza la llibreria obrender." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "El servidor X no te suport per a idiomes" -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 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:253 +#: openbox/openbox.c:255 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:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "No s'ha pogut carregar el tema." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, 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:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Sintaxis: openbox [opcions]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -220,25 +220,29 @@ msgstr "" "\n" "Opcions:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Visualitza aquesta ajuda i surt\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Visualitza la versió i surt\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 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:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Inhabilita la connexió amb gestor de sessió\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -247,19 +251,19 @@ msgstr "" "S'està transferint missatges a la instància del Openbox que s'està " "executant:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Torna a carregar la configuració de Openbox\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Torna a iniciar Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -267,27 +271,27 @@ msgstr "" "\n" "Opcions de depuració:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Executa en mode sincronitzat\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Mostra la sortida de depuració\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 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:501 +#: openbox/openbox.c:512 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:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -296,7 +300,11 @@ msgstr "" "\n" "Informeu dels errors a %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Opció '%s' no vàlida a la línia d'ordres\n" @@ -317,14 +325,14 @@ msgstr "" msgid "The WM on screen %d is not exiting" msgstr "El gestor de finestres de la pantalla %d no està sortint" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "escriptori %i" diff --git a/po/cs.po b/po/cs.po index 6d61634c..7b8d2f98 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: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2007-07-21 00:15+0200\n" "Last-Translator: tezlo \n" "Language-Team: Czech \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Požadována neplatná akce '%s'. Žádná taková akce neexistuje." @@ -155,61 +155,61 @@ msgstr "Pokus o přístup k menu '%s', ale ono neexistuje" msgid "More..." msgstr "Víc..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Neplatné tlačítko '%s' v nastavení myÅ¡i" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Neplatný kontext '%s' v nastavení myÅ¡i" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, 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:151 +#: openbox/openbox.c:152 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:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Nepodařilo se inicializovat knihovnu obrender." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "X server nepodporuje lokalizaci." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "Nelze nastavit modifikátory lokalizace pro X server." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 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:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Nepodařilo se načíst motiv." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, 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:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Syntaxe: openbox [přepínače]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -217,23 +217,27 @@ msgstr "" "\n" "Přepínače:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Zobrazit tuto nápovědu a skončit\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Zobrazit verzi a skončit\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Nahradit běžící window manager\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Nepřipojovat se k session manageru\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -241,19 +245,19 @@ msgstr "" "\n" "Zasílání zpráv běžící instanci Openbox:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Znovu načíst konfiguraci Openbox\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Restartovat Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -261,23 +265,23 @@ msgstr "" "\n" "Ladící přepínače:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Spustit v synchronním módu\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Zobrazit ladící výstup\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 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:501 +#: openbox/openbox.c:512 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:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -286,7 +290,11 @@ msgstr "" "\n" "Prosím hlaÅ¡te chyby na %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Neplatný argument příkazové řádky '%s'\n" @@ -306,14 +314,14 @@ msgstr "Nepodařilo se získat výseč pro window manager na obrazovce %d" msgid "The WM on screen %d is not exiting" msgstr "Window manager na obrazovce %d ne a ne skončit" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "plochu %i" diff --git a/po/de.po b/po/de.po index 136b9bf1..5015be65 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.5\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2008-01-17 22:49+0100\n" "Last-Translator: Finn Zirngibl \n" "Language-Team: \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Unzulässige Aktion '%s' angefordert. Diese Aktion existiert nicht." @@ -158,62 +158,62 @@ msgstr "Das Menü '%s' wurde bei dem Versuch darauf zuzugreifen nicht gefunden" msgid "More..." msgstr "Mehr..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Maus-Binding enthält ungültigen Button '%s'" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Maus-Binding enthält ungültigen Kontext '%s'" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Konnte nicht in das Heimatverzeichnis '%s' wechseln: %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Konnte das Display aus der Umgebungsvariable DISPLAY nicht öffnen." -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Konnte die obrender Bibliothek nicht initialisieren." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "Die gewählte Lokalisierung wird vom X-Server nicht unterstützt." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "" "Die Lokalisierungsmodifizierer für den X-Server konnten nicht gesetzt werden." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Es wurde keine gültige Konfigurationsdatei gefunden, benutze einfache " "Standardwerte." -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Konnte kein Thema laden." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "Neustart fehlgeschlagen, um die ausführbare Datei '%s' zu starten: %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Syntax: openbox [Optionen]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -221,23 +221,27 @@ msgstr "" "\n" "Optionen:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Diese Hilfe anzeigen und beenden\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Version anzeigen und beenden\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Den aktuell laufenden Fenstermanager ersetzen\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Keine Verbindung zum Sitzungsmanager aufbauen\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -245,19 +249,19 @@ msgstr "" "\n" "Nachrichten an eine laufende Openbox-Instanz weiterleiten:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Openbox's Konfiguration neu laden\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Openbox neu starten\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr " --exit Beende Openbox\n" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -265,25 +269,25 @@ msgstr "" "\n" "Debugging Optionen:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync im Synchronisierungsmodus starten\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Debugging-Informationen anzeigen\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr "" " --debug-focus Debugging-Informationen für's Fokus-Handling anzeigen\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr "" " --debug-xinerama Anzeige in künstliche Xinerama-Bildschirme aufteilen\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -292,7 +296,11 @@ msgstr "" "\n" "Bitte melden Sie Bugreports an: %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Ungültiges Kommandozeilen Argument '%s'\n" @@ -312,14 +320,14 @@ msgstr "Konnte die Fenstermanagerauswahl auf Bildschirm %d nicht reservieren" msgid "The WM on screen %d is not exiting" msgstr "Der Fenstermanager auf Bildschirm %d beendet sich nicht" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "desktop %i" diff --git a/po/en@boldquot.po b/po/en@boldquot.po index d04017b5..576da68c 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: 2008-02-02 09:06-0500\n" -"PO-Revision-Date: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" +"PO-Revision-Date: 2008-02-02 11:51-0500\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -41,7 +41,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Invalid action ‘%s’ requested. No such action exists." @@ -181,59 +181,59 @@ msgstr "Attempted to access menu ‘%s’ but it does not exist" msgid "More..." msgstr "More..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Invalid button ‘%s’ in mouse binding" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Invalid context ‘%s’ in mouse binding" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Unable to change to home directory '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 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:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Failed to initialize the obrender library." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "X server does not support locale." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "Cannot set locale modifiers for the X server." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 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:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Unable to load a theme." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "Restart failed to execute new executable '%s': %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Syntax: openbox [options]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -241,23 +241,27 @@ msgstr "" "\n" "Options:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Display this help and exit\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Display the version and exit\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Replace the currently running window manager\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr " --config-file FILE Specify the path to the config file to use\n" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Disable connection to the session manager\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -265,19 +269,19 @@ msgstr "" "\n" "Passing messages to a running Openbox instance:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Reload Openbox's configuration\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Restart Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr " --exit Exit Openbox\n" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -285,23 +289,23 @@ msgstr "" "\n" "Debugging options:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Run in synchronous mode\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Display debugging output\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Display debugging output for focus handling\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 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:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -310,7 +314,11 @@ msgstr "" "\n" "Please report bugs at %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "--config-file requires an argument\n" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Invalid command line argument ‘%s’\n" @@ -330,7 +338,7 @@ msgstr "Could not acquire window manager selection on screen %d" msgid "The WM on screen %d is not exiting" msgstr "The WM on screen %d is not exiting" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " @@ -339,7 +347,7 @@ msgstr "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "desktop %i" diff --git a/po/en@quot.po b/po/en@quot.po index c53b32cd..f6e07851 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: 2008-02-02 09:06-0500\n" -"PO-Revision-Date: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" +"PO-Revision-Date: 2008-02-02 11:51-0500\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Invalid action ‘%s’ requested. No such action exists." @@ -178,59 +178,59 @@ msgstr "Attempted to access menu ‘%s’ but it does not exist" msgid "More..." msgstr "More..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Invalid button ‘%s’ in mouse binding" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Invalid context ‘%s’ in mouse binding" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Unable to change to home directory '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 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:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Failed to initialize the obrender library." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "X server does not support locale." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "Cannot set locale modifiers for the X server." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 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:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Unable to load a theme." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "Restart failed to execute new executable '%s': %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Syntax: openbox [options]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -238,23 +238,27 @@ msgstr "" "\n" "Options:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Display this help and exit\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Display the version and exit\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Replace the currently running window manager\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr " --config-file FILE Specify the path to the config file to use\n" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Disable connection to the session manager\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -262,19 +266,19 @@ msgstr "" "\n" "Passing messages to a running Openbox instance:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Reload Openbox's configuration\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Restart Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr " --exit Exit Openbox\n" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -282,23 +286,23 @@ msgstr "" "\n" "Debugging options:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Run in synchronous mode\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Display debugging output\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Display debugging output for focus handling\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 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:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -307,7 +311,11 @@ msgstr "" "\n" "Please report bugs at %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "--config-file requires an argument\n" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Invalid command line argument ‘%s’\n" @@ -327,7 +335,7 @@ msgstr "Could not acquire window manager selection on screen %d" msgid "The WM on screen %d is not exiting" msgstr "The WM on screen %d is not exiting" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " @@ -336,7 +344,7 @@ msgstr "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "desktop %i" diff --git a/po/es.po b/po/es.po index fe9b8352..140e0cf4 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: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2007-07-21 21:26+0200\n" "Last-Translator: David Merino \n" "Language-Team: None\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "La acción '%s' solicitada es inválida. No existe tal acción." @@ -157,61 +157,61 @@ msgstr "Intentó acceder al menú '%s' pero este no existe" msgid "More..." msgstr "Más..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Botón inválido '%s' en mouse binding" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Contexto inválido '%s' en mouse binding" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "No es posible cambiar al directorio home '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 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:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Falló la inicialización de la librería obrender" -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "El servidor X no soporta locale." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "No se puede establecer los modificadores locale para el servidor X." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 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:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "No es posible cargar el tema." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "Reiniciada falló en ejecutar nuevo ejecutable '%s': %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Sintaxis: openbox [opciones]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -219,26 +219,30 @@ msgstr "" "\n" "Opciones\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Muestra esta ayuda y sale\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Muestra la versión y sale\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr "" " --replace Remplaza el gestor de ventanas que esta corriendo " "actualmente\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 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:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -246,19 +250,19 @@ msgstr "" "\n" "Pasando mensajes a la instancia que esta corriendo de Openbox:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Recarga la configuración de Openbox\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Reinicia Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -266,25 +270,25 @@ msgstr "" "\n" "Opciones de depuración:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Correr en modo sincrónico\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Mostrar salida del depurador\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr "" " --debug-focus Mostrar salida del depurador para focus handling\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 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:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -293,7 +297,11 @@ msgstr "" "\n" "Por favor reportar errores a %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Argumento de linea de comando inválido '%s'\n" @@ -314,14 +322,14 @@ msgstr "" msgid "The WM on screen %d is not exiting" msgstr "El WM en la pantalla %d no esta saliendo" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "Escritorio %i" diff --git a/po/et.po b/po/et.po index acdfe7b1..c7df9c24 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: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2007-07-20 16:54+0200\n" "Last-Translator: Andres Järv \n" "Language-Team: Estonian \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Taotleti kehtetut käsklust '%s'. Sellist käsklust pole olemas." @@ -156,61 +156,61 @@ msgstr "Üritati ligi pääseda menüüle '%s', aga seda pole olemas" msgid "More..." msgstr "Rohkem..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Vigane nupp '%s' hiire kiirklahvides" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Vigane kontekst '%s' hiire kiirklahvides" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Ei suudetud siseneda kodukataloogi '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "DISPLAY keskkonnamuutujas oleva ekraani avamine ebaõnnestus." -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Obrender-damisteegi käivitamine ebaõnnestus." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "X server ei toeta lokaati." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "Ei suudetud sättida lokaadimuutujaid X serveri jaoks." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 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:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Ei suudetud laadida teemat." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, 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:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Autoriõigused (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Süntaks: openbox [seaded]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -218,23 +218,27 @@ msgstr "" "\n" "Seaded:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Selle abi kuvamine ja väljumine\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Versiooni kuvamine ja väljumine\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Hetkel töötava aknahalduri asendamine\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Seansihalduriga ühenduse keelamine\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -242,19 +246,19 @@ msgstr "" "\n" "Jooksvale Openboxi seansile sõnumite edastamine:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Openboxi konfiguratsioon uuesti laadimine\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Openboxi taaskäivitamine\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -262,23 +266,23 @@ msgstr "" "\n" "Silumise seaded:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Sünkroonselt jooksutamine\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Silumisväljundi kuvamine\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Fookusekäsitluse siluriväljundi kuvamine\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Ekraani võlts-Xinerama ekraanideks jagamine\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -287,7 +291,11 @@ msgstr "" "\n" "Palun teata vigadest siia %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Vigane käsurea argument '%s'\n" @@ -307,14 +315,14 @@ msgstr "Ei suuda hankida aknahaldurite loetelu ekraanil %d" msgid "The WM on screen %d is not exiting" msgstr "Aknahaldur ekraanil %d ei sulgu" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "töölaud %i" diff --git a/po/eu.po b/po/eu.po index d10fc765..050555c9 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.5\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2008-01-19 14:34+0100\n" "Last-Translator: Inko I. A. \n" "Language-Team: Inko I. A. \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Eskatutako '%s' ekintza baliogabea. Ez da ekintza hori existitzen." @@ -155,61 +155,61 @@ msgstr "'%s' menua atzitzen saiatu da baina ez da existitzen" msgid "More..." msgstr "Gehiago..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Baliogabeko '%s' botoia sagu elkarketan" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Baliogabeko '%s' testuingurua sagu elkarketan" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Ezin da '%s' hasiera direktoriora aldatu: %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Hutsegitea pantaila irekitzean DISPLAY ingurune aldagaitik." -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Hutsegitea obrender liburutegia hasieratzean." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "X zerbitzariak ez du locale euskarririk." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "Ezin da locale modifikatzailerik ezarri X zerbitzariarentzat." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Ezin da baliozko konfigurazio fitxategirik aurkitu, hainbat aukera lehenetsi " "sinple erabiltzen" -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Ezin da gai bat kargatu." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "Berrabiarazteak hutsegitea '%s' exekutagarri berria exekutatzean: %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Sintaxia: openbox [aukerak]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -217,24 +217,28 @@ msgstr "" "\n" "Aukerak:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Mezu hau erakutsi eta irten\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Bertsioa bistarazi eta irten\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr "" " --replace Ordezkatu exekutatzen ari den leiho-kudeatzailea\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Ezgaitu saio kudeatzailearekiko konexioa\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -242,19 +246,19 @@ msgstr "" "\n" "Exekutatzen ari den Openbox instantzia bati mezuak pasatzen:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Birkargatu Openbox-en konfigurazioa\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Berrabiarazi Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr " --exit Itxi Openbox\n" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -262,23 +266,23 @@ msgstr "" "\n" "Arazketa aukerak:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Modu sinkronoan exekutatu\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Arazketa irteera erakutsi\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Erakutsi arazketa irteera foku maneiurako\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Zatitu pantaila xinerama pantaila faltsuetan\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -287,7 +291,11 @@ msgstr "" "\n" "%s helbidean erroreen berri eman mesedez\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "'%s' komando lerro argumentu baliogabea\n" @@ -310,14 +318,14 @@ msgstr "" msgid "The WM on screen %d is not exiting" msgstr "%d bistaratze pantailako leiho-kudeatzailea ez da irteten" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "%i Idazmahaia" diff --git a/po/fi.po b/po/fi.po index 7da566af..aa43b423 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.5\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2008-01-18 14:55+0100\n" "Last-Translator: Jarkko Piiroinen \n" "Language-Team: None\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Virheellinen tapahtuma '%s' yritetty. Tapahtumaa ei ole." @@ -158,62 +158,62 @@ msgstr "Valikon '%s' lukemista yritettiin, mutta sitä ei ole olemassa" msgid "More..." msgstr "Lisää..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Virheellinen painike '%s' hiirisidonnoissa" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Virheellinen asiayhteys '%s' hiirisidonnoissa" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Kotihakemistoon '%s' vaihtaminen epäonnistui: '%s'" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Näytön avaaminen DISPLAY-muuttujasta epäonnistui." -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Obrender-kirjaston käynnistäminen epäonnistui." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "X-palvelin ei tue kieliasetusta." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "Lokaalimuuttujia ei voitu tehdä X-palvelimelle." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Kelvollista asetustiedostoa ei löytynyt, käytetään yksinkertaisia " "oletusarvoja" -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Teeman lataaminen epäonnistui." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "" "Uudelleenkäynnistys ei onnistunut käynnistämään uutta ohjelmaa '%s': %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Tekijänoikeudet (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Syntaksi: openbox [valitsin]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -221,23 +221,27 @@ msgstr "" "\n" "Käyttö:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Näytä tämä ohje ja sulje\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Näytä versio ja sulje\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Korvaa käynnissä oleva ikkunointiohjelma\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Estä yhteys istuntojen hallintaan\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -245,19 +249,19 @@ msgstr "" "\n" "Komentojen antaminen käynnissä olevalle Openboxille:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Lataa Openboxin asetustiedosto uudelleen\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Käynnistä Openbox uudelleen\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr " --exit Sulje Openbox\n" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -265,23 +269,23 @@ msgstr "" "\n" "Virheenjäljitysasetukset:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Aja synkronisointi-tilassa\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Näytä vianjäljitystuloste\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Näytä vianjäljitystuloste ikkunavalitsimelle\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Jaa näyttö kahteen vale xinerama ruutuun\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -290,7 +294,11 @@ msgstr "" "\n" "Ilmoita virheistä: %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Virheellinen valitsin '%s'\n" @@ -310,14 +318,14 @@ msgstr "Ikkunointiohjelman valinta ruudulla %d ei onnistunut" msgid "The WM on screen %d is not exiting" msgstr "Ikkunointiohjelma ruudulla %d ei sulkeudu" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "työtila %i" diff --git a/po/fr.po b/po/fr.po index 37ba94e6..55525c8d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.5\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2008-01-17 22:53+0100\n" "Last-Translator: Cyrille Bagard \n" "Language-Team: français \n" @@ -19,7 +19,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Action demandée invalide '%s'. Une telle action n'existe pas." @@ -159,65 +159,65 @@ msgstr "Tentative d'acc msgid "More..." msgstr "Plus..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Bouton « %s » invalide dans le paramétrage de la souris" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Contexte « %s » invalide dans le paramétrage de la souris" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Impossible de changer vers le répertoire de l'utilisateur « %s » : %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "" "Échec de l'ouverture de l'affichage depuis la variable d'environnement " "DISPLAY." -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Échec de l'initialisation de la bibliothèque obrender." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "Le serveur X ne supporte pas la localisation." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "" "Impossible d'appliquer les modifications de localisation pour le serveur X." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Impossible de trouver un fichier de configuration valide, utilisation de " "défauts simples" -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Impossible de charger un thème." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "" "Le redémarrage n'a pas réussi à exécuter le nouvel exécutable « %s » : %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Syntaxe : openbox [options]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -225,26 +225,30 @@ msgstr "" "\n" "Options :\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Affiche cette aide et quitte\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Affiche la version et quitte\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr "" " --replace Remplace le gestionnaire de fenêtres actuellement en " "usage\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr "" " --sm-disable Désactive la connexion au gestionnaire de sessions\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -252,19 +256,19 @@ msgstr "" "\n" "Passage de messages à l'instance d'Openbox en cours :\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Recharge la configuration d'Openbox\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Redémarre Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr " --exit Sortir d'Openbox\n" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -272,26 +276,26 @@ msgstr "" "\n" "Options de déboguage :\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Exécute en mode synchrone\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Affiche la sortie de déboguage\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr "" " --debug-focus Affiche la sortie de déboguage pour la gestion du " "focus\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr "" " --debug-xinerama Découpe l'affichage en écrans xinerama factices\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -300,7 +304,11 @@ msgstr "" "\n" "Veuillez soumettre les rapports de bogues à %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Argument de la ligne de commande invalide « %s »\n" @@ -323,14 +331,14 @@ msgid "The WM on screen %d is not exiting" msgstr "" "Le gestionnaire de fenêtres sur l'écran %d n'est pas en train de se terminer" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "bureau %i" diff --git a/po/hu.po b/po/hu.po index 30c13e41..632fe44f 100644 --- a/po/hu.po +++ b/po/hu.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: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2007-12-21 14:33+0100\n" "Last-Translator: Robert Kuszinger \n" "Language-Team: Hungarian \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "" @@ -156,59 +156,59 @@ msgstr "'%s' menü elérésére történt kísérlet, de az nem létezik" msgid "More..." msgstr "Tovább..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Érvénytelen gomb '%s' az egér parancsoknál" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Érvénytelen környezet az egér parancsoknál: '%s'" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Nem lehet a saját mappába váltani '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Nem nyitható meg a DISPLAY változóban beállított képernyő" -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Nem sikerült használatba venni az obernder függvénykönyvtárat" -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "Az X kiszolgáló nem támogatja ezt a nemzetközi beállítást." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "A nemzetközi beálljtás módosítók nem állíthatók be az X szerveren." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "Nincs konfigurációs fájl, ezért egyszerű alapértelmezéseket használunk" -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Nem tölthető be a téma." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "Az újraindítás során ez az új program nem volt indítható '%s': %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Szerzői jogok (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Használat: openbox [options]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -216,23 +216,27 @@ msgstr "" "\n" "Opciók:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Súgó megjelenítése és kilépés\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Verzió kiírása majd kilépés\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Futó ablakkezelő cseréje\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Ne csatlakozzon a szekció-kezelőhöz\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -240,19 +244,19 @@ msgstr "" "\n" "Üzenet küldése a futó Openbox példánynak\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Konfiguráció úrjatöltése\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Openbox újraindítása\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr " --exit Kilépés az Openboxból\n" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -260,25 +264,25 @@ msgstr "" "\n" "Debug (hibakereső) lehetőségek:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Futtatás szinkron módban\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Hibakeresési információk megjelenítése\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr "" " --debug-focus Fókuszkezelésre vonatkozó hibakeresési információk " "kiírása\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Képernyő felosztása két ál-xinerama képernyőre\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -287,7 +291,11 @@ msgstr "" "\n" "Légyszi jelentsd a hibát itt: %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Érvénytelen parancssori opció: '%s'\n" @@ -307,14 +315,14 @@ msgstr "Nem tudok ablakkezelőt váltani ezen a képernyőn %d" msgid "The WM on screen %d is not exiting" msgstr "Ezen a képernyőn: %d az ablakkezelő nem lép ki" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "%i. munkaasztal" diff --git a/po/it.po b/po/it.po index e9d3e912..c2c5138c 100644 --- a/po/it.po +++ b/po/it.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: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2007-07-20 15:18+0200\n" "Last-Translator: Davide Truffa \n" "Language-Team: Italian \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "" @@ -158,63 +158,63 @@ msgstr "Tentativo di accedere al menù '%s'. Il menù non esiste" msgid "More..." msgstr "Altri..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Il pulsante '%s' specificato nelle associazioni mouse non è valido" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Il contesto '%s' specificato nelle associazioni mouse non è valido" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Impossibile accedere alla directory home '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Impossibile accedere al display specificato nella variabile DISPLAY." -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Impossibile inizializzare la libreria obrender." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "Il server X non ha il supporto per la localizzazione." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "" "Impossibile impostare la localizzazione dei tasti modificatori per il server " "X." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 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:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Impossibile caricare un tema." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "Non è stato possibile riavviare il nuovo eseguibile '%s': %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Sintassi: openbox [opzioni]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -222,23 +222,27 @@ msgstr "" "\n" "Opzioni:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Mostra questo messaggio di aiuto ed esce\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Mostra il numero di versione ed esce\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Sostituisce l'attuale window manager attivo\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Disabilita la connessione al session manager\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -246,19 +250,19 @@ msgstr "" "\n" "Inviare messaggi ad un'istanza di Openbox attiva:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Ricarica la configurazione di Openbox\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Riavvia Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -266,25 +270,25 @@ msgstr "" "\n" "Opzioni di debug:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Esegue in modalità sincrona\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Mostra le informazioni di debug\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 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:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Divide lo schermo per simulare xinerama\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -293,7 +297,11 @@ msgstr "" "\n" "Segnalate eventuali bug a %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Argomento da linea di comando non valido '%s'\n" @@ -313,14 +321,14 @@ msgstr "Impossibile acquisire la selezione del window manager sullo schermo %d" msgid "The WM on screen %d is not exiting" msgstr "Il WM sullo schermo %d non è terminato" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "desktop %i" diff --git a/po/ja.po b/po/ja.po index d66dfbee..871827cd 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: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2007-06-07 14:49+0200\n" "Last-Translator: Ryoichiro Suzuki \n" "Language-Team: Japanese \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "" @@ -159,128 +159,136 @@ msgstr "メニュー'%s'へのアクセスを試みましたが、それは存 msgid "More..." msgstr "もっと..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "マウス割り当てに於いて不正なボタン '%s'" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "マウス割り当てに於いて不正なコンテクスト '%s'" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "ホームディレクトリ'%s'に移動できません: %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "環境変数 DISPLAY からディスプレイを開くのに失敗しました。" -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "obrender ライブラリの初期化に失敗しました。" -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "Xサーバはロケールをサポートしていません。" -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "Xサーバの為のロケール修飾子を設定できません。" -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "正当な設定ファイルを見つけられません。単純な初期設定を使います。" -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "テーマを読み込めません。" -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "再起動の際新しい実行ファイル'%s'の実行に失敗しました: %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" msgstr "" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr "" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr "" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr "" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr "" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" msgstr "" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr "" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr "" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" msgstr "" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr "" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr "" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr "" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr "" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" "Please report bugs at %s\n" msgstr "" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "不正なコマンドライン引数 '%s'\n" @@ -300,14 +308,14 @@ msgstr "スクリーン%dでウィンドウマネージャの選択を取得で msgid "The WM on screen %d is not exiting" msgstr "スクリーン%dのWMが終了しません。" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "デスクトップ%i" diff --git a/po/nl.po b/po/nl.po index 5a32ad29..ec779726 100644 --- a/po/nl.po +++ b/po/nl.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: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2007-07-12 13:01+0200\n" "Last-Translator: Jochem Kossen \n" "Language-Team: Dutch \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Ongeldige actie '%s' gevraagd. Deze actie bestaat niet" @@ -156,61 +156,61 @@ msgstr "Toegang gevraagd tot menu '%s' maar het bestaat niet" msgid "More..." msgstr "Meer..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Ongeldige knop '%s' in muis binding" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Ongeldige context '%s' in muis binding" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Pad instellen mislukt naar de thuismap '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Scherm van de DISPLAY omgevingsvariabele te openen mislukt." -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Initialiseren van de obrender bibliotheek mislukt." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "X server ondersteunt locale niet" -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "Kan de locale bepaling van de X server niet instellen" -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 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:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Thema laden mislukt." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "Uitvoeren van nieuw programma '%s' tijdens herstart miskukt: %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Syntax: openbox [opties]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -218,23 +218,27 @@ msgstr "" "\n" "Opties:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Toon deze helptekst en sluit af\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Toon versie en sluit af\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Vervang de huidig draaiende window manager\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Verbinding met de sessiebeheerder uitschakelen\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -242,19 +246,19 @@ msgstr "" "\n" "Berichten worden naar een draaiende Openbox instantie gestuurd:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Openbox configuratie opnieuw laden\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Herstart Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -262,23 +266,23 @@ msgstr "" "\n" "Debugging opties:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Start in synchrone modus\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Debuguitvoer weergeven\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Debug uitvoer voor focusafhandeling weergeven\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 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:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -287,7 +291,11 @@ msgstr "" "\n" "Gelieve bugs te melden bij %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Onbekende optie '%s'\n" @@ -307,14 +315,14 @@ msgstr "Kon window manager selectie op scherm %d niet verkrijgen" msgid "The WM on screen %d is not exiting" msgstr "De window manager op scherm %d sluit zichzelf niet af" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "bureaublad %i" diff --git a/po/no.po b/po/no.po index a98702e8..ea68b136 100644 --- a/po/no.po +++ b/po/no.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.6\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2008-01-29 13:37+0100\n" "Last-Translator: Michael Kjelbergvik Thung \n" "Language-Team: None\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Ugyldig operasjon '%s' etterspurt. Operasjonen finnes ikke." @@ -155,59 +155,59 @@ msgstr "Forsøkte Ã¥ Ã¥pne menyen '%s', men denne finnes ikke" msgid "More..." msgstr "Mer..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Ugyldig knapp '%s' i binding for mus" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Ugyldig innhold '%s' i binding for mus" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Kan ikke endre til hjemmekatalogen '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Kunne ikke Ã¥pne displayet fra DISPLAY-miljøvariabelen" -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Kunne ikke starte obrender-biblioteket." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "X-serveren støtter ikke lokalisering." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "Kan ikke stille inn lokaliseringsmodifikatorene for X-serveren." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "Kunne ikke finne en gyldig konfigurasjonsfil, bruker standardverdier" -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Kan ikke laste et tema." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "Restart kunne ikke starte nytt program '%s': %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Syntax: openbox [alternativer\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -215,23 +215,27 @@ msgstr "" "\n" "Alternativ:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Vise denne hjelpeteksten og avslutt\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Vis versjonsnummeret og avslutt\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Erstatt den kjørende vindusbehandleren\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Deaktiver tilkobling til sesjonsbehandleren\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -239,19 +243,19 @@ msgstr "" "\n" "Sender beskjeder til en kjørende Openbox-instans:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Oppdater Openbox' konfigurasjon\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Start Openbox pÃ¥ nytt\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr " --exit Avslutt Openbox\n" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -259,23 +263,23 @@ msgstr "" "\n" "Debug-alternativ:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Kjør i synkron-modus\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Vis debuggingsinformasjon\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Vis debuggingsinformasjon for fokus-hÃ¥ndtering\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " -debug-xinerama Splitt displayet for falske xinerama-skjermer\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -284,7 +288,11 @@ msgstr "" "\n" "Vennligst rapporter bugs til %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Ugyldig kommandolinje-argument '%s'\n" @@ -304,7 +312,7 @@ msgstr "Kunne ikke hendte vindusbehandlerens markering pÃ¥ skjerm %d" msgid "The WM on screen %d is not exiting" msgstr "Vindusbehandleren pÃ¥ skjerm %d vil ikke avslutte" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " @@ -313,7 +321,7 @@ msgstr "" "Openbox er innstillt til %d skrivebord, men nÃ¥værende sesjon har %d. " "Benytter sesjonens innstilling." -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "skrivebord %i" diff --git a/po/openbox.pot b/po/openbox.pot index a7013246..6544b767 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: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "" @@ -156,128 +156,136 @@ msgstr "" msgid "More..." msgstr "" -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "" -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "" -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "" -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "" -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "" -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" msgstr "" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr "" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr "" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr "" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr "" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" msgstr "" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr "" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr "" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" msgstr "" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr "" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr "" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr "" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr "" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" "Please report bugs at %s\n" msgstr "" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "" @@ -297,14 +305,14 @@ msgstr "" msgid "The WM on screen %d is not exiting" msgstr "" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "" diff --git a/po/pl.po b/po/pl.po index ba0dbae3..00b6944d 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: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2007-07-14 00:43+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "" @@ -157,63 +157,63 @@ msgstr "Spróbowano uzyskać dostęp do menu '%s', ale ono nie istnieje" msgid "More..." msgstr "Więcej..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Nieprawidłowy klawisz '%s' w skrócie myszy" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Nieprawidłowy kontekst '%s' w skrócie myszy" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Nie można przejść do katalogu domowego '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 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:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Zainicjowanie biblioteki obrender nie powiodło się." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "Serwer X nie obsługuje ustawień lokalnych." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "Nie można ustawić modyfikatorów lokalnych dla serwera X." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 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:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Nie można wczytać motywu." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, 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:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Składnia: openbox [opcje]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -221,23 +221,27 @@ msgstr "" "\n" "Opcje:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Wyświetla tę pomoc i kończy\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Wyświetla wersję i kończy\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Zastępuje aktualnie działający menedżer okien\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 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:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -245,19 +249,19 @@ msgstr "" "\n" "Przekazywanie komunikatów do działającej instancji Openboksa:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Ponownie wczytuje pliki konfiguracyjne\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Ponownie uruchamia Openboksa\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -265,24 +269,24 @@ msgstr "" "\n" "Opcje debugowania:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Uruchamia w trybie synchronicznym\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Wyświetla informacje o debugowaniu\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 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:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Dzieli ekran na sztuczne ekrany xineramy\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -291,7 +295,11 @@ msgstr "" "\n" "Proszę zgłaszać błędy (w języku angielskim) pod adresem %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Nieprawidłowy argument wiersza poleceń '%s'\n" @@ -311,14 +319,14 @@ msgstr "Nie można uzyskać wyboru menedżera okien na ekranie %d" msgid "The WM on screen %d is not exiting" msgstr "Menedżer okien na ekranie %d nie kończy działania" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "pulpit %i" diff --git a/po/pt.po b/po/pt.po index 2769f352..b479a21e 100644 --- a/po/pt.po +++ b/po/pt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.5\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2008-01-22 22:17+0100\n" "Last-Translator: Althaser \n" "Language-Team: None\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Pedido de acção '%s' inválido. Não existem quaisquer acções." @@ -156,61 +156,61 @@ msgstr "Tentei aceder ao menu '%s' mas ele n msgid "More..." msgstr "Mais..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Botão inválido '%s' no atalho do rato" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Contexto inválido '%s' no atalho do rato" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Incapaz de mudar para o directório home '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Falha a abrir o ecrã pela variável de ambiente DISPLAY." -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Falha a inicializar a biblioteca obrender" -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "O servidor X não suporta o locale." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "Não pode definir locales modificados para o servidor X." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Incapaz de encontrar um ficheiro de configuração válido, usando algumas " "configurações simples de omissão" -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Incapaz de carregar o tema." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "Falha a reiniciar a execução de um novo executável '%s': %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Direitos de autor (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Sintaxe: openbox [opções]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -218,23 +218,27 @@ msgstr "" "\n" "Opções:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Mostra este help e sai\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Mostra a versão e sai\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Substitui o corrente gestor de janelas\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Desactiva a ligação com o gestor de sessões\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -242,19 +246,19 @@ msgstr "" "\n" "Passando mensagens para a solicitação do Openbox em execução\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Recarrega a configuração do Openbox\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Reinicia o Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr " --saida Sai do Openbox\n" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -262,25 +266,25 @@ msgstr "" "\n" "Opções de depuração\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Executa em modo sincronizado\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Mostra o resultado da depuração\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr "" " --debug-focus Mostra o resultado da depuração para manipulação em " "foco\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Divide o ecrã em falsos ecrãs xinerama\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -289,7 +293,11 @@ msgstr "" "\n" "Por favor reporte erros em %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Argumento inválido na linha de comandos '%s'\n" @@ -309,14 +317,14 @@ msgstr "N msgid "The WM on screen %d is not exiting" msgstr "O gestor de janelas no ecrã %d não está a fechar" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "área de trabalho %i" diff --git a/po/pt_BR.po b/po/pt_BR.po index 38444bb0..d09fb2f6 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.5\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2008-01-22 21:42+0100\n" "Last-Translator: Og Maciel \n" "Language-Team: Brazilian Portuguese \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Ação inválida '%s' requisitada. Ação não existe." @@ -157,62 +157,62 @@ msgstr "Tentou acessar menu '%s' mas ele não existe" msgid "More..." msgstr "Mais.." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Botão inválido '%s' na associação do mouse" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Contexto '%s' inválido na associação do mouse" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, 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:151 +#: openbox/openbox.c:152 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:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Falha ao iniciar a biblioteca obrender." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "Servidor X não suporta localização." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 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:253 +#: openbox/openbox.c:255 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:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Não foi possível carregar um tema." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, 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:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Sintaxe: openbox [opções]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -220,24 +220,28 @@ msgstr "" "\n" "Opções:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Mostra esta ajuda e sai\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Mostra a versão e sai\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Substitui o gerenciador de janelas ativo\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 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:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -245,19 +249,19 @@ msgstr "" "\n" "Passando mensagens para uma instância do Openbox em execução:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Recarrega a configuração do Openbox\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Reinicia o Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr " --exit Sai do Openbox\n" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -265,26 +269,26 @@ msgstr "" "\n" "Opções de depuração:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Executa em modo sincronizado\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Mostra saida de depuração\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 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:501 +#: openbox/openbox.c:512 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:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -293,7 +297,11 @@ msgstr "" "\n" "Por favor reporte erros em %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Argumento de linha de comando inválido '%s'\n" @@ -314,14 +322,14 @@ msgstr "" msgid "The WM on screen %d is not exiting" msgstr "O gerenciador de janelas na tela %d não está saindo" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "área de trabalho %i" diff --git a/po/ru.po b/po/ru.po index 5a482e5a..efef579c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.5\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2008-01-22 07:56+0100\n" "Last-Translator: Nikita Bukhvostov \n" "Language-Team: Russian \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Запрошенное действие '%s' не найдено." @@ -156,61 +156,61 @@ msgstr "Попытка доступа к несуществующему меню msgid "More..." msgstr "Больше..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Некорректная кнопка '%s' в привязке мыши" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Некорректный контекст '%s' в привязке мыши" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Не могу перейти в домашнюю директорию '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Не могу открыть экран из переменной окружения DISPLAY." -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Не могу инициализировать библиотеку obrender." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "X-сервер не поддерживает локали." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "Не могу установить модификаторы локали X-сервера." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Не могу найти корректный конфигурационный файл, использую значения по-" "умолчанию" -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Не могу загрузить тему." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "При перезапуске не удалось запустить исполняемый файл '%s': %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Синтаксис: openbox [параметры]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -218,23 +218,27 @@ msgstr "" "\n" "Параметры:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Показать эту справку и выйти\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Показать версию и выйти\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Заменить текущий менеджер окон\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Не соединяться с менеджером сессий\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -242,19 +246,19 @@ msgstr "" "\n" "Передаю сообщения запущенной инстанции Openbox:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Перезагрузить конфигурацию Openbox\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Перезапустить Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr " --exit Выход из Openbox\n" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -262,25 +266,25 @@ msgstr "" "\n" "Отладочные параметры:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Запустить в синхронном режиме\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Отображать отладочную информацию\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr "" " --debug-focus Отображать отладочную информацию об управлении " "фокусом\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Разбить экран на фальшивые экраны xinerama\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -289,7 +293,11 @@ msgstr "" "\n" "Пожалуйста, сообщайте об ошибках на %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Некорректный командный параметр '%s'\n" @@ -309,14 +317,14 @@ msgstr "Не могу получить выбор менеджера окон н msgid "The WM on screen %d is not exiting" msgstr "Менеджер окон на экране %d не завершается" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "рабочий стол %i" diff --git a/po/sk.po b/po/sk.po index 78e7a8db..556c6f1b 100644 --- a/po/sk.po +++ b/po/sk.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: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2007-12-7 13:43Central Europe Daylight Time\n" "Last-Translator: Jozef Riha \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Vyžiadaná neplatná akcia '%s'. Takáto akcia neexistuje." @@ -155,61 +155,61 @@ msgstr "Pokus o sprístupnenie menu '%s', ale to neexistuje" msgid "More..." msgstr "Viac..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Neplatné tlačidlo '%s' v priradení myÅ¡i" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Neplatný kontext '%s' v priradení myÅ¡i" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, 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:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Nepodarilo sa otvoriÅ¥ displej z premennej prostredia DISPLAY" -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Nepodarilo sa inicializovaÅ¥ knižnicu obrender." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "X server nepodporuje locale." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "Nemôžem nastaviÅ¥ locale pre X server." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 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:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Nepodarilo sa nahraÅ¥ tému." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, 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:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Syntax: openbox [volby]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -217,24 +217,28 @@ msgstr "" "\n" "Volby:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Zobrazi tuto napovedu a skonci\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Zobrazi cislo verzie a skonci\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr "" " --replace Nahradi momentalne beziace sedenie window manazera\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Vypne spojenie k manazerovi sedenia\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -242,19 +246,19 @@ msgstr "" "\n" "Predavanie sprav beziacej instancii Openboxu:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Opatovne nacita konfiguraciu Openboxu\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Restartuje Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -262,24 +266,24 @@ msgstr "" "\n" "Volby ladenia:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Spustit v synchronnom mode\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Zobrazit ladiaci vystup\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr "" " --debug-focus Zobrazit ladiaci vystup pre manipulaciu s fokusom\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Rozdelit displej na neprave obrazovky xineramy\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -288,7 +292,11 @@ msgstr "" "\n" "Prosim hlaste chyby na %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Neplatny parameter prikazoveho riadku '%s'\n" @@ -308,14 +316,14 @@ msgstr "Nepodarilo sa získaÅ¥ výber okenného manažéra na obrazovke %d" msgid "The WM on screen %d is not exiting" msgstr "Okenný manažér na obrazovke %d sa neukončuje" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "plocha %i" diff --git a/po/sv.po b/po/sv.po index 69b14de9..337ecd13 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.6\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2008-01-25 03:52+0100\n" "Last-Translator: Mikael Magnusson \n" "Language-Team: None\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Ogiltig action '%s' efterfrågades, men den finns inte." @@ -155,60 +155,60 @@ msgstr "F msgid "More..." msgstr "Mer..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Ogiltig knapp '%s' i musbindning" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Ogiltig kontext '%s' i musbindning" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Kunde inte gå till hemkatalogen '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Kunde inte öppna en display från miljövariabeln DISPLAY." -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Kunde inte initialisera obrender-biblioteket." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "X-servern stödjer inte lokalisering." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "Kan inte sätta lokaliseringsmodifierare för X-servern." -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Kunde inte hitta en giltig konfigurationsfil, använder enkla standardvärden" -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Kunde inte ladda ett tema." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "Restart misslyckades att starta nytt program '%s': %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Copyright (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Syntax: openbox [alternativ]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -216,23 +216,27 @@ msgstr "" "\n" "Alternativ:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Visa den här hjälpen och avsluta\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version Visa versionen och avsluta\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Ersätt den befintliga fönsterhanteraren\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Avaktivera anslutning till sessionshanteraren\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -240,19 +244,19 @@ msgstr "" "\n" "Skicka meddelanden till en exekverande instans av Openbox:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Ladda om Openbox konfiguration\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Starta om Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr " --exit Avsluta Openbox\n" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -260,23 +264,23 @@ msgstr "" "\n" "Debug-alternativ:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Kör i synkroniserat läge\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Visa debuginformation\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus Visa debuginformation för fokushantering\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Dela skärmen i simulerade xinerama-skärmar\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -285,7 +289,11 @@ msgstr "" "\n" "Rapportera buggar till %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Ogiltigt kommandoradsargument '%s'\n" @@ -305,7 +313,7 @@ msgstr "Kunde inte erh msgid "The WM on screen %d is not exiting" msgstr "Fönsterhanteraren på skärm %d avslutar inte" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " @@ -314,7 +322,7 @@ msgstr "" "Openbox är inställt på %d skrivbord, men nuvarande session har %d. Använder " "sessionens inställning." -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "skrivbord %i" diff --git a/po/ua.po b/po/ua.po index a1aa85e4..418cd5bf 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: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2007-06-16 13:02+0200\n" "Last-Translator: Dmitriy Moroz \n" "Language-Team: Ukrainian \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Здійснено запит на некоректну дію '%s'. Нема такої дії." @@ -155,62 +155,62 @@ msgstr "Спроба доступа до меню '%s' якого не існу msgid "More..." msgstr "Більше..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Некоректна клавіша '%s' в прив'язці клавіш мишки" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Некоректний контекст '%s' в прив'зці клавіш мишки" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Не вдалося перейти в домашню директорію '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Не вдалося відкрити дисплей зі змінної середовища DISPLAY" -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Не вдалося ініцаілізувати бібліотеку obrender" -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "X-сервер не підтримує локалі" -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "Не можу встановити модифікатори локалі для X-сервера" -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" "Не вдалося знайти коректний файл конфігурації, використовую стандартні " "налаштування" -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Не вдалося загрузити стиль" -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "" "При перезавантаженні не вдалося виконати новий виконуваний файл '%s': %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Авторські права (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Синтакс: openbox [параметри]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -218,23 +218,27 @@ msgstr "" "\n" "Параметри:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help Показати цю справку і вийти\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --vesrion Показати версію і вийти\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace Замінити поточний менеджер вікон\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable Не з'єднуватися з сесійним менеджером\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -242,19 +246,19 @@ msgstr "" "\n" "Передаю повідомлення процесу Openbox що виконується\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Перезавантажити конфігурацію Openbox'у\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Перезапустити Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -262,24 +266,24 @@ msgstr "" "\n" "Налагоджувальні параметри\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Запустити в синхронному режимі\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug Показувати інформацію налагоджування\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr "" " --debug-focus Показувати інформацію налагоджування для уравління\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama Розбити екран на фальшиві екрани xinerama\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -288,7 +292,11 @@ msgstr "" "\n" "Будь-ласка, повідомляйте про помилки на %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Некоректний командний аргумент '%s'\n" @@ -308,14 +316,14 @@ msgstr "Не можу отримати вибір менеджера вікон msgid "The WM on screen %d is not exiting" msgstr "Менеджео вікон на дисплеї %d не завершується" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "стільниця %i" diff --git a/po/vi.po b/po/vi.po index 2eb0563f..9ac8afe6 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.5\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2008-01-17 23:08+0100\n" "Last-Translator: Quan Tran \n" "Language-Team: None\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Hành động '%s' làm không được. Hành động đó không có." @@ -155,59 +155,59 @@ msgstr "Thá»­ mở thá»±c đơn '%s' nhÆ°ng mà cái đó không có" msgid "More..." msgstr "Thêm nữa" -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "Vô hiệu nút '%s' ở trong máy chuột đặt" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "Vô hiệu văn cảnh '%s' ở trong chuột đặt" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "Không thể đổi đến chỗ nhà '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "Không mở hình từ DISPLAY được." -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "Không mở được thÆ° viện obrender." -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "ChÆ°Æ¡ng trình X không có locale cho tiếng nay." -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 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:253 +#: openbox/openbox.c:255 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:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "Không thể đọc theme." -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, 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:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "Bản quyền (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "Cách dùng: openbox [chọn lá»±a]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -215,24 +215,28 @@ msgstr "" "\n" "Chọn lá»±a:\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 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:490 +#: openbox/openbox.c:500 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:491 +#: openbox/openbox.c:501 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:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 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:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -240,19 +244,19 @@ msgstr "" "\n" "Đưa thông báo cho chÆ°Æ¡ng trình Openbox:\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure Bắt đầu lại Openbox's hình thể\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart Bắt đầu lại Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr " --exit Đi ra Openbox\n" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -260,24 +264,24 @@ msgstr "" "\n" "Debugging chọn lá»±a:\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync Chạy trong cách thức synchronous\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug TrÆ°ng bày debugging đoàn chữ\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 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:501 +#: openbox/openbox.c:512 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:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -286,7 +290,11 @@ msgstr "" "\n" "Làm Æ¡n báo cáo bugs ở chỗ %s\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Mệnh lệnh viết sai '%s'\n" @@ -306,14 +314,14 @@ msgstr "Không thể lấy được chÆ°Æ¡ng trình quản lý cá»­a sổ ở tr msgid "The WM on screen %d is not exiting" msgstr "ChÆ°Æ¡ng trình quản lý cá»­a sổ trên màn hình %d không đi ra" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, 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 1ea350f9..b157e84d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.5\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2008-01-18 15:02+0100\n" "Last-Translator: Shaodong Di \n" "Language-Team: 简体中文\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "请求的动作 '%s' 无效。该动作不存在。" @@ -156,59 +156,59 @@ msgstr "尝试读取菜单 '%s'，但是它不存在" msgid "More..." msgstr "更多..." -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "鼠标绑定中的无效按键 '%s'" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "鼠标绑定中无效的上下文 '%s'" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "无法切换到主目录 '%s': %s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "在打开DISPLAY环境变量所指定的X显示时失败。" -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "初始化obrender库时失败。" -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "X服务器不支持locale。" -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "无法设置X服务器的locale修饰键。" -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "无法找到有效的配置文件，使用一些简单的默认值" -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "无法读入主题。" -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "重新启动以执行新的可执行文件 '%s' 时失败: %s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "版权所有 (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "用法: openbox [选项]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -216,23 +216,27 @@ msgstr "" "\n" "选项： \n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help 显示该帮助信息后退出\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version 显示版本号后退出\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace 替换当前运行的窗口管理器\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable 禁止连接到会话管理器\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -240,19 +244,19 @@ msgstr "" "\n" "传递信息给运行中的 Openbox 实例：\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure 重新载入 Openbox 的配置\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart 重新启动 Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr " --exit 退出 Openbox\n" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -260,23 +264,23 @@ msgstr "" "\n" "调试选项：\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync 在同步模式中运行\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug 显示调试输出\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus 显示焦点处理的调试输出\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama 分割显示到伪造的 xinerama 屏幕中\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -285,7 +289,11 @@ msgstr "" "\n" "请向 %s 报告错误\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "无效的命令行参数 '%s'\n" @@ -305,14 +313,14 @@ msgstr "在屏幕 %d 无法被选为窗口管理器" msgid "The WM on screen %d is not exiting" msgstr "屏幕 %d 的窗口管理器没有退出" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "桌面 %i" diff --git a/po/zh_TW.po b/po/zh_TW.po index 0391efda..4f2b7bb3 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: 2008-02-02 09:06-0500\n" +"POT-Creation-Date: 2008-02-02 11:51-0500\n" "PO-Revision-Date: 2007-07-23 23:22+0200\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: openbox/actions.c:149 +#: openbox/actions.c:151 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "要求的動作「%s」無效。無此類動作存在。" @@ -156,59 +156,59 @@ msgstr "試圖存取選單「%s」但是它不存在" msgid "More..." msgstr "更多…" -#: openbox/mouse.c:349 +#: openbox/mouse.c:363 #, c-format msgid "Invalid button '%s' in mouse binding" msgstr "與滑鼠組合的按鈕「%s」無效" -#: openbox/mouse.c:355 +#: openbox/mouse.c:369 #, c-format msgid "Invalid context '%s' in mouse binding" msgstr "與滑鼠組合的上下文「%s」無效" -#: openbox/openbox.c:131 +#: openbox/openbox.c:132 #, c-format msgid "Unable to change to home directory '%s': %s" msgstr "無法變更到主目錄「%s」：%s" -#: openbox/openbox.c:151 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." msgstr "開啟依 DISPLAY 環境變數所指的顯示時失敗。" -#: openbox/openbox.c:182 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." msgstr "初始化 obrender 函式庫時失敗。" -#: openbox/openbox.c:188 +#: openbox/openbox.c:189 msgid "X server does not support locale." msgstr "X 伺服器不支援語區。" -#: openbox/openbox.c:190 +#: openbox/openbox.c:191 msgid "Cannot set locale modifiers for the X server." msgstr "無法設定用於 X 伺服器的語區修飾項。" -#: openbox/openbox.c:253 +#: openbox/openbox.c:255 msgid "Unable to find a valid config file, using some simple defaults" msgstr "無法找到有效的配置檔案，而使用某些簡單的預設值" -#: openbox/openbox.c:279 +#: openbox/openbox.c:289 msgid "Unable to load a theme." msgstr "無法載入佈景主題。" -#: openbox/openbox.c:406 +#: openbox/openbox.c:416 #, c-format msgid "Restart failed to execute new executable '%s': %s" msgstr "重新啟動以執行新的可執行檔「%s」時失敗：%s" -#: openbox/openbox.c:476 openbox/openbox.c:478 +#: openbox/openbox.c:486 openbox/openbox.c:488 msgid "Copyright (c)" msgstr "著作權 (c)" -#: openbox/openbox.c:487 +#: openbox/openbox.c:497 msgid "Syntax: openbox [options]\n" msgstr "語法：openbox [選項]\n" -#: openbox/openbox.c:488 +#: openbox/openbox.c:498 msgid "" "\n" "Options:\n" @@ -216,23 +216,27 @@ msgstr "" "\n" "選項：\n" -#: openbox/openbox.c:489 +#: openbox/openbox.c:499 msgid " --help Display this help and exit\n" msgstr " --help 顯示此說明然後離開\n" -#: openbox/openbox.c:490 +#: openbox/openbox.c:500 msgid " --version Display the version and exit\n" msgstr " --version 顯示版本然後離開\n" -#: openbox/openbox.c:491 +#: openbox/openbox.c:501 msgid " --replace Replace the currently running window manager\n" msgstr " --replace 替換目前執行的視窗管理員\n" -#: openbox/openbox.c:492 +#: openbox/openbox.c:502 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" + +#: openbox/openbox.c:503 msgid " --sm-disable Disable connection to the session manager\n" msgstr " --sm-disable 停用與執行階段管理程式的連結\n" -#: openbox/openbox.c:493 +#: openbox/openbox.c:504 msgid "" "\n" "Passing messages to a running Openbox instance:\n" @@ -240,19 +244,19 @@ msgstr "" "\n" "傳遞訊息到執行中的 Openbox 實體：\n" -#: openbox/openbox.c:494 +#: openbox/openbox.c:505 msgid " --reconfigure Reload Openbox's configuration\n" msgstr " --reconfigure 重新載入 Openbox 配置\n" -#: openbox/openbox.c:495 +#: openbox/openbox.c:506 msgid " --restart Restart Openbox\n" msgstr " --restart 重新啟動 Openbox\n" -#: openbox/openbox.c:496 +#: openbox/openbox.c:507 msgid " --exit Exit Openbox\n" msgstr "" -#: openbox/openbox.c:497 +#: openbox/openbox.c:508 msgid "" "\n" "Debugging options:\n" @@ -260,23 +264,23 @@ msgstr "" "\n" "偵錯選項：\n" -#: openbox/openbox.c:498 +#: openbox/openbox.c:509 msgid " --sync Run in synchronous mode\n" msgstr " --sync 在同步模式中運行\n" -#: openbox/openbox.c:499 +#: openbox/openbox.c:510 msgid " --debug Display debugging output\n" msgstr " --debug 顯示偵錯輸出\n" -#: openbox/openbox.c:500 +#: openbox/openbox.c:511 msgid " --debug-focus Display debugging output for focus handling\n" msgstr " --debug-focus 顯示焦點處理的偵錯輸出\n" -#: openbox/openbox.c:501 +#: openbox/openbox.c:512 msgid " --debug-xinerama Split the display into fake xinerama screens\n" msgstr " --debug-xinerama 分割顯示以進入假造的 xinerama 螢幕\n" -#: openbox/openbox.c:502 +#: openbox/openbox.c:513 #, c-format msgid "" "\n" @@ -285,7 +289,11 @@ msgstr "" "\n" "請向 %s 報告錯誤\n" -#: openbox/openbox.c:603 +#: openbox/openbox.c:583 +msgid "--config-file requires an argument\n" +msgstr "" + +#: openbox/openbox.c:626 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "無效的命令列引數「%s」\n" @@ -305,14 +313,14 @@ msgstr "無法於螢幕 %d 獲選為視窗管理員" msgid "The WM on screen %d is not exiting" msgstr "螢幕 %d 中的視窗管理員並未離開" -#: openbox/screen.c:407 +#: openbox/screen.c:408 #, c-format msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." msgstr "" -#: openbox/screen.c:1168 +#: openbox/screen.c:1169 #, c-format msgid "desktop %i" msgstr "桌面 %i" diff --git a/render/font.c b/render/font.c index 356b9c6e..5ccfb8fd 100644 --- a/render/font.c +++ b/render/font.c @@ -108,7 +108,7 @@ RrFont *RrFontOpen(const RrInstance *inst, const gchar *name, gint size, /* setup the layout */ pango_layout_set_font_description(out->layout, out->font_desc); - pango_layout_set_single_paragraph_mode(out->layout, TRUE); + pango_layout_set_wrap(out->layout, PANGO_WRAP_WORD_CHAR); /* get the ascent and descent */ measure_font(inst, out); @@ -139,12 +139,23 @@ void RrFontClose(RrFont *f) } static void font_measure_full(const RrFont *f, const gchar *str, - gint *x, gint *y, gint shadow_x, gint shadow_y) + gint *x, gint *y, gint shadow_x, gint shadow_y, + gboolean flow, gint maxwidth) { PangoRectangle rect; pango_layout_set_text(f->layout, str, -1); - pango_layout_set_width(f->layout, -1); + if (flow) { + pango_layout_set_single_paragraph_mode(f->layout, FALSE); + pango_layout_set_width(f->layout, maxwidth * PANGO_SCALE); + pango_layout_set_ellipsize(f->layout, PANGO_ELLIPSIZE_NONE); + } + else { + /* single line mode */ + pango_layout_set_single_paragraph_mode(f->layout, TRUE); + pango_layout_set_width(f->layout, -1); + pango_layout_set_ellipsize(f->layout, PANGO_ELLIPSIZE_MIDDLE); + } /* pango_layout_get_pixel_extents lies! this is the right way to get the size of the text's area */ @@ -163,11 +174,16 @@ static void font_measure_full(const RrFont *f, const gchar *str, } RrSize *RrFontMeasureString(const RrFont *f, const gchar *str, - gint shadow_x, gint shadow_y) + gint shadow_x, gint shadow_y, + gboolean flow, gint maxwidth) { RrSize *size; + + g_assert(!flow || maxwidth > 0); + size = g_new(RrSize, 1); - font_measure_full(f, str, &size->width, &size->height, shadow_x, shadow_y); + font_measure_full(f, str, &size->width, &size->height, shadow_x, shadow_y, + flow, maxwidth); return size; } @@ -208,36 +224,47 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) PangoAttrList *attrlist; PangoEllipsizeMode ell; - /* center the text vertically - We do this centering based on the 'baseline' since different fonts have - different top edges. It looks bad when the whole string is moved when 1 - character from a non-default language is included in the string */ - y = area->y + - font_calculate_baseline(t->font, area->height); + g_assert(!t->flow || t->maxwidth > 0); + + y = area->y; + if (!t->flow) + /* center the text vertically + We do this centering based on the 'baseline' since different fonts + have different top edges. It looks bad when the whole string is + moved when 1 character from a non-default language is included in + the string */ + y += font_calculate_baseline(t->font, area->height); /* the +2 and -4 leave a small blank edge on the sides */ x = area->x + 2; - w = area->width - 4; + w = area->width; + if (t->flow) w = MAX(w, t->maxwidth); + w -= 4; h = area->height; - switch (t->ellipsize) { - case RR_ELLIPSIZE_NONE: + if (t->flow) ell = PANGO_ELLIPSIZE_NONE; - break; - case RR_ELLIPSIZE_START: - ell = PANGO_ELLIPSIZE_START; - break; - case RR_ELLIPSIZE_MIDDLE: - ell = PANGO_ELLIPSIZE_MIDDLE; - break; - case RR_ELLIPSIZE_END: - ell = PANGO_ELLIPSIZE_END; - break; + else { + switch (t->ellipsize) { + case RR_ELLIPSIZE_NONE: + ell = PANGO_ELLIPSIZE_NONE; + break; + case RR_ELLIPSIZE_START: + ell = PANGO_ELLIPSIZE_START; + break; + case RR_ELLIPSIZE_MIDDLE: + ell = PANGO_ELLIPSIZE_MIDDLE; + break; + case RR_ELLIPSIZE_END: + ell = PANGO_ELLIPSIZE_END; + break; + } } pango_layout_set_text(t->font->layout, t->string, -1); pango_layout_set_width(t->font->layout, w * PANGO_SCALE); pango_layout_set_ellipsize(t->font->layout, ell); + pango_layout_set_single_paragraph_mode(t->font->layout, !t->flow); /* * * end of setting up the layout * * */ @@ -265,10 +292,23 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) c.pixel = t->shadow_color->pixel; /* see below... */ - pango_xft_render_layout_line - (d, &c, pango_layout_get_line(t->font->layout, 0), - (x + t->shadow_offset_x) * PANGO_SCALE, - (y + t->shadow_offset_y) * PANGO_SCALE); + if (!t->flow) { + pango_xft_render_layout_line + (d, &c, +#if PANGO_VERSION_MAJOR > 1 || \ + (PANGO_VERSION_MAJOR == 1 && PANGO_VERSION_MINOR >= 16) + pango_layout_get_line_readonly(t->font->layout, 0), +#else + pango_layout_get_line(t->font->layout, 0), +#endif + (x + t->shadow_offset_x) * PANGO_SCALE, + (y + t->shadow_offset_y) * PANGO_SCALE); + } + else { + pango_xft_render_layout(d, &c, t->font->layout, + (x + t->shadow_offset_x) * PANGO_SCALE, + (y + t->shadow_offset_y) * PANGO_SCALE); + } } c.color.red = t->color->r | t->color->r << 8; @@ -295,9 +335,23 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) /* layout_line() uses y to specify the baseline The line doesn't need to be freed, it's a part of the layout */ - pango_xft_render_layout_line - (d, &c, pango_layout_get_line(t->font->layout, 0), - x * PANGO_SCALE, y * PANGO_SCALE); + if (!t->flow) { + pango_xft_render_layout_line + (d, &c, +#if PANGO_VERSION_MAJOR > 1 || \ + (PANGO_VERSION_MAJOR == 1 && PANGO_VERSION_MINOR >= 16) + pango_layout_get_line_readonly(t->font->layout, 0), +#else + pango_layout_get_line(t->font->layout, 0), +#endif + x * PANGO_SCALE, + y * PANGO_SCALE); + } + else { + pango_xft_render_layout(d, &c, t->font->layout, + x * PANGO_SCALE, + y * PANGO_SCALE); + } if (t->shortcut) { t->font->shortcut_underline->start_index = 0; diff --git a/render/render.c b/render/render.c index 7791429a..49485c8a 100644 --- a/render/render.c +++ b/render/render.c @@ -188,6 +188,12 @@ RrAppearance *RrAppearanceNew(const RrInstance *inst, gint numtex) return out; } +void RrAppearanceRemoveTextures(RrAppearance *a) +{ + g_free(a->texture); + a->textures = 0; +} + void RrAppearanceAddTextures(RrAppearance *a, gint numtex) { g_assert(a->textures == 0); @@ -388,7 +394,9 @@ gint RrMinWidth(RrAppearance *a) m = RrFontMeasureString(a->texture[i].data.text.font, a->texture[i].data.text.string, a->texture[i].data.text.shadow_offset_x, - a->texture[i].data.text.shadow_offset_y); + a->texture[i].data.text.shadow_offset_y, + a->texture[i].data.text.flow, + a->texture[i].data.text.maxwidth); w = MAX(w, m->width); g_free(m); break; @@ -414,6 +422,7 @@ gint RrMinHeight(RrAppearance *a) { gint i; gint l, t, r, b; + RrSize *m; gint h = 0; for (i = 0; i < a->textures; ++i) { @@ -424,8 +433,24 @@ gint RrMinHeight(RrAppearance *a) h = MAX(h, a->texture[i].data.mask.mask->height); break; case RR_TEXTURE_TEXT: - h += MAX(h, RrFontHeight(a->texture[i].data.text.font, - a->texture[i].data.text.shadow_offset_y)); + if (a->texture[i].data.text.flow) { + g_assert(a->texture[i].data.text.string != NULL); + + m = RrFontMeasureString + (a->texture[i].data.text.font, + a->texture[i].data.text.string, + a->texture[i].data.text.shadow_offset_x, + a->texture[i].data.text.shadow_offset_y, + a->texture[i].data.text.flow, + a->texture[i].data.text.maxwidth); + h += MAX(h, m->height); + g_free(m); + } + else + h += MAX(h, + RrFontHeight + (a->texture[i].data.text.font, + a->texture[i].data.text.shadow_offset_y)); break; case RR_TEXTURE_RGBA: h += MAX(h, a->texture[i].data.rgba.height); diff --git a/render/render.h b/render/render.h index 7b81e2ff..260ebeb0 100644 --- a/render/render.h +++ b/render/render.h @@ -22,7 +22,7 @@ #define __render_h #include "geom.h" -#include "version.h" +#include "render/version.h" #include /* some platforms dont include this as needed for Xft */ #include @@ -141,6 +141,8 @@ struct _RrTextureText { gboolean shortcut; /*!< Underline a character */ guint shortcut_pos; /*!< Position in bytes of the character to underline */ RrEllipsizeMode ellipsize; + gboolean flow; /* allow multiple lines. must set maxwidth below */ + gint maxwidth; }; struct _RrPixmapMask { @@ -249,6 +251,7 @@ GC RrColorGC (RrColor *c); RrAppearance *RrAppearanceNew (const RrInstance *inst, gint numtex); RrAppearance *RrAppearanceCopy (RrAppearance *a); void RrAppearanceFree (RrAppearance *a); +void RrAppearanceRemoveTextures(RrAppearance *a); void RrAppearanceAddTextures(RrAppearance *a, gint numtex); RrFont *RrFontOpen (const RrInstance *inst, const gchar *name, @@ -256,7 +259,8 @@ RrFont *RrFontOpen (const RrInstance *inst, const gchar *name, RrFont *RrFontOpenDefault (const RrInstance *inst); void RrFontClose (RrFont *f); RrSize *RrFontMeasureString (const RrFont *f, const gchar *str, - gint shadow_offset_x, gint shadow_offset_y); + gint shadow_offset_x, gint shadow_offset_y, + gboolean flow, gint maxwidth); gint RrFontHeight (const RrFont *f, gint shadow_offset_y); gint RrFontMaxCharWidth (const RrFont *f); @@ -267,6 +271,8 @@ Pixmap RrPaintPixmap (RrAppearance *a, gint w, gint h); void RrPaint (RrAppearance *a, Window win, gint w, gint h); void RrMinSize (RrAppearance *a, gint *w, gint *h); gint RrMinWidth (RrAppearance *a); +/* For text textures, if flow is TRUE, then the string must be set before + calling this, otherwise it doesn't need to be */ gint RrMinHeight (RrAppearance *a); void RrMargins (RrAppearance *a, gint *l, gint *t, gint *r, gint *b); diff --git a/render/theme.c b/render/theme.c index 6d87cafb..a6931be6 100644 --- a/render/theme.c +++ b/render/theme.c @@ -907,13 +907,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, j = (i > 0 ? 0 : 255); i = ABS(i*255/100); - theme->title_focused_shadow_color = RrColorNew(inst, j, j, j); - theme->title_focused_shadow_alpha = i; theme->osd_shadow_color = RrColorNew(inst, j, j, j); theme->osd_shadow_alpha = i; } else { - theme->title_focused_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->title_focused_shadow_alpha = 50; theme->osd_shadow_color = RrColorNew(inst, 0, 0, 0); theme->osd_shadow_alpha = 50; } diff --git a/render/version.h.in b/render/version.h.in new file mode 100644 index 00000000..0ff30b57 --- /dev/null +++ b/render/version.h.in @@ -0,0 +1,15 @@ +#ifndef rr__version_h +#define rr__version_h + +#define RR_MAJOR_VERSION @RR_MAJOR_VERSION@ +#define RR_MINOR_VERSION @RR_MINOR_VERSION@ +#define RR_MICRO_VERSION @RR_MICRO_VERSION@ +#define RR_VERSION RR_MAJOR_VERSION.RR_MINOR_VERSION.RR_MICRO_VERSION + +#define RR_CHECK_VERSION(major,minor,micro) \ + (RR_MAJOR_VERSION > (major) || \ + (RR_MAJOR_VERSION == (major) && RR_MINOR_VERSION > (minor)) || \ + (RR_MAJOR_VERSION == (major) && RR_MINOR_VERSION == (minor) && \ + RR_MICRO_VERSION >= (micro))) + +#endif diff --git a/themes/Clearlooks/openbox-3/themerc b/themes/Clearlooks/openbox-3/themerc index 21be4e83..1dde5fba 100644 --- a/themes/Clearlooks/openbox-3/themerc +++ b/themes/Clearlooks/openbox-3/themerc @@ -1,41 +1,54 @@ -! Clearlooks Evolving -! Clearlooks as it evolves in gnome-svn... +!# Clearlooks-Evolving +!# Clearlooks as it evolves in gnome-svn... +!# Last updated 19/01/08 # Fonts # these are really halos, but who cares? -window.active.label.text.font:shadow=y:shadowtint=45:shadowoffset=1 +*.font: shadow=n +window.active.label.text.font:shadow=y:shadowtint=25:shadowoffset=1 window.inactive.label.text.font:shadow=y:shadowtint=00:shadowoffset=0 -menu.title.text.font:shadow=y:shadowtint=20:shadowoffset=1 -menu.items.font:shadow=y:shadowtint=0:shadowoffset=2 -# lettuce set some stuff +menu.items.font:shadow=y:shadowtint=0:shadowoffset=1 + +!# general stuff border.width: 1 padding.width: 3 padding.height: 2 window.handle.width: 3 window.client.padding.width: 0 -menu.overlap: 0 +menu.overlap: 2 *.justify: center + +!# lets set our damn shadows here, eh? + *.bg.highlight: 50 -*.bg.shadow: 01 +*.bg.shadow: 05 + +window.active.title.bg.highlight: 40 +window.active.title.bg.shadow: 00 + +window.inactive.title.bg.highlight: 30 +window.inactive.title.bg.shadow: 00 -# Menu settings +window.*.grip.bg.highlight: 50 +window.*.grip.bg.shadow: 30 + +window.*.handle.bg.highlight: 50 +window.*.handle.bg.shadow: 30 + +!# Menu settings menu.border.color: #aaaaaa menu.border.width: 1 -*.title.bg: Raised Gradient splitvertical -*.title.bg.color: #8fb2de -*.title.bg.color.splitTo: #9ebde5 -*.title.bg.colorTo: #86abd9 -*.title.bg.colorTo.splitTo: #749dcf - -menu.title.text.color: #ffffff +menu.title.bg: solid flat +menu.title.bg.color: #E6E7E6 +menu.title.text.color: #111111 menu.items.bg: Flat Solid menu.items.bg.color: #ffffff -menu.items.text.color: #444444 +menu.items.text.color: #111111 menu.items.disabled.text.color: #aaaaaa menu.items.active.bg: Flat Gradient splitvertical border @@ -48,44 +61,39 @@ menu.items.active.bg.colorTo.splitTo: #80a7d6 menu.items.active.bg.border.color: #4b6e99 menu.items.active.text.color: #ffffff -# start with the active -!# no handles -#window.active.border.color: #455d7c -!# handles -window.active.border.color: #686a6d -window.active.title.separator.color: #4e76a8 -!!! +!# set handles here and only the once? + +window.*.handle.bg: Raised solid +window.*.handle.bg.color: #eaebec -#window.active.title.bg: Raised Gradient splitvertical -#window.active.title.bg.color: #8db0dd -#window.active.title.bg.color.splitTo: #9ebde5 -#window.active.title.bg.colorTo: #86abd9 -#window.active.title.bg.colorTo.splitTo: #749dcf +window.*.grip.bg: Raised solid +window.*.grip.bg.color: #eaebec +!# Active -window.active.title.bg: Raised Gradient splitvertical -window.active.title.bg.color: #8fb2de -window.active.title.bg.color.splitTo: #9ebde5 -window.active.title.bg.colorTo: #86abd9 -window.active.title.bg.colorTo.splitTo: #749dcf +!# no handles - kind of closer to the clearlooks border, maybe? +!#window.active.border.color: #455d7c +window.*.border.color: #585a5d -window.active.title.bg.highlight: 35 -window.active.title.bg.shadow: 00 +window.active.title.separator.color: #4e76a8 + +*.title.bg: Raised Gradient splitvertical +*.title.bg.color: #8CB0DC +*.title.bg.color.splitTo: #99BAE3 +*.title.bg.colorTo: #86ABD9 +*.title.bg.colorTo.splitTo: #7AA1D1 window.active.label.bg: Parentrelative window.active.label.text.color: #ffffff - window.active.button.*.bg: Flat Gradient splitvertical Border -#window.active.button.*.bg.color: #94B5E0 -window.active.button.*.bg.color: #97b8e1 -window.active.button.*.bg.color.splitTo: #B7D0EF +window.active.button.*.bg.color: #92B4DF +window.active.button.*.bg.color.splitTo: #B0CAEB window.active.button.*.bg.colorTo: #86ABD9 -window.active.button.*.bg.colorTo.splitTo: #7099CC -#window.active.button.*.bg.border.color: #4F77A9 -!#this is the real colour, but hey... +window.active.button.*.bg.colorTo.splitTo: #769FD0 + window.active.button.*.bg.border.color: #49678B window.active.button.*.image.color: #F4F5F6 @@ -101,47 +109,39 @@ window.active.button.pressed.bg.color: #7aa1d2 window.active.button.hover.bg.border.color: #4A658C -# inactive +!# inactive -window.inactive.border.color: #7e8285 +!#window.inactive.border.color: #7e8285 window.inactive.title.separator.color: #96999d window.inactive.title.bg: Raised Gradient splitvertical -window.inactive.title.bg.color: #e0e2e3 -window.inactive.title.bg.color.splitTo: #e9eaeb -window.inactive.title.bg.colorTo: #dadcde -window.inactive.title.bg.colorTo.splitTo: #d0d2d4 -window.inactive.title.bg.highlight: 30 -window.inactive.title.bg.shadow: 00 +window.inactive.title.bg.color: #E3E2E0 +window.inactive.title.bg.color.splitTo: #EBEAE9 +window.inactive.title.bg.colorTo: #DEDCDA +window.inactive.title.bg.colorTo.splitTo: #D5D3D1 window.inactive.label.bg: Parentrelative window.inactive.label.text.color: #70747d -window.*.handle.bg: Raised solid -window.*.handle.bg.color: #eaebec - -window.*.grip.bg: Raised solid -window.*.grip.bg.color: #eaebec - window.inactive.button.*.bg: Flat Gradient splitVertical Border window.inactive.button.*.bg.color: #ffffff -window.inactive.button.*.bg.color.splitto: #f8f8f9 -window.inactive.button.*.bg.colorTo: #f4f4f5 -window.inactive.button.*.bg.colorTo.splitto: #dfe1e2 -window.inactive.button.*.bg.border.color: #8a8e91 -window.inactive.button.*.image.color: #757676 +window.inactive.button.*.bg.color.splitto: #ffffff +window.inactive.button.*.bg.colorTo: #F9F8F8 +window.inactive.button.*.bg.colorTo.splitto: #E9E7E6 +window.inactive.button.*.bg.border.color: #928F8B +window.inactive.button.*.image.color: #6D6C6C -!#osd +!# osd (pop ups and what not, dock?) osd.border.width: 1 -osd.border.color: #5c5e5c +osd.border.color: #999 osd.bg: flat border gradient splitvertical -osd.bg.color: #EEEFF0 -osd.bg.color.splitto: #EEEFF0 +osd.bg.color: #F0EFEE +osd.bg.color.splitto: #f5f5f4 osd.bg.colorTo: #EAEBEC -osd.bg.colorTo.splitto: #EAEBEC +osd.bg.colorTo.splitto: #E7E5E4 osd.bg.border.color: #ffffff diff --git a/version.h.in b/version.h.in deleted file mode 100644 index da3f02ef..00000000 --- a/version.h.in +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef ob__version_h -#define ob__version_h - -#define OB_MAJOR_VERSION @OB_MAJOR_VERSION@ -#define OB_MINOR_VERSION @OB_MINOR_VERSION@ -#define OB_MICRO_VERSION @OB_MICRO_VERSION@ -#define OB_VERSION OB_MAJOR_VERSION.OB_MINOR_VERSION.OB_MICRO_VERSION - -#define OB_CHECK_VERSION(major,minor,micro) \ - (OB_MAJOR_VERSION > (major) || \ - (OB_MAJOR_VERSION == (major) && OB_MINOR_VERSION > (minor)) || \ - (OB_MAJOR_VERSION == (major) && OB_MINOR_VERSION == (minor) && \ - OB_MICRO_VERSION >= (micro))) - -#endif