summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-03-06 21:19:44 +0000
committerKhem Raj <raj.khem@gmail.com>2012-03-14 17:33:25 -0700
commitcb5ff1622e3dbf75f60f9d6414ff386d10f6c28f (patch)
tree53d820cedbca6c6b646f51aa3514dae7964196fe /meta-oe
parent4586a3b9abd6f01592b1f4b27f8a2b6c51fb9668 (diff)
downloadmeta-openembedded-cb5ff1622e3dbf75f60f9d6414ff386d10f6c28f.tar.gz
openbox: update to 3.5.0
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-graphics/openbox/openbox/fix-decorations.patch73
-rw-r--r--meta-oe/recipes-graphics/openbox/openbox/fix-dialog-buttons.patch38
-rw-r--r--meta-oe/recipes-graphics/openbox/openbox/sync-with-3.4-working.patch2739
-rw-r--r--meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb (renamed from meta-oe/recipes-graphics/openbox/openbox_3.4.11.2.bb)10
4 files changed, 3 insertions, 2857 deletions
diff --git a/meta-oe/recipes-graphics/openbox/openbox/fix-decorations.patch b/meta-oe/recipes-graphics/openbox/openbox/fix-decorations.patch
deleted file mode 100644
index e3489b7ce..000000000
--- a/meta-oe/recipes-graphics/openbox/openbox/fix-decorations.patch
+++ /dev/null
@@ -1,73 +0,0 @@
1Fix client decorations
2
3Upstream-Status: Pending
4
5diff --git a/openbox/client.c b/openbox/client.c
6index c65e350..1c82763 100644
7--- a/openbox/client.c
8+++ b/openbox/client.c
9@@ -1733,8 +1733,20 @@ void client_setup_decor_and_functions(ObClient *self, gboolean reconfig)
10 switch (self->type) {
11 case OB_CLIENT_TYPE_NORMAL:
12 /* normal windows retain all of the possible decorations and
13- functionality, and can be fullscreen */
14- self->functions |= OB_CLIENT_FUNC_FULLSCREEN;
15+ functionality, and can be fullscreen, unless if it can't be resized */
16+ if (self->functions & OB_CLIENT_FUNC_RESIZE)
17+ self->functions |= OB_CLIENT_FUNC_FULLSCREEN;
18+ else {
19+ self->decorations &= ~(OB_FRAME_DECOR_HANDLE |
20+ OB_FRAME_DECOR_MAXIMIZE);
21+
22+ self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE;
23+
24+ self->mwmhints.decorations &= ~(OB_MWM_DECOR_HANDLE |
25+ OB_MWM_DECOR_MAXIMIZE);
26+
27+ self->mwmhints.functions &= ~OB_MWM_FUNC_MAXIMIZE;
28+ }
29 break;
30
31 case OB_CLIENT_TYPE_DIALOG:
32diff --git a/openbox/frame.c b/openbox/frame.c
33index 64dd290..fc84f2f 100644
34--- a/openbox/frame.c
35+++ b/openbox/frame.c
36@@ -1209,6 +1209,7 @@ static void layout_title(ObFrame *self)
37 firstcon = &self->rightmost;
38 }
39
40+ self->decorations = self->client->decorations;
41 /* stop at the end of the string (or the label, which calls break) */
42 for (; *lc != '\0' && lc >= config_title_layout; lc+=i) {
43 if (*lc == 'L') {
44@@ -1217,23 +1218,23 @@ static void layout_title(ObFrame *self)
45 self->label_x = x;
46 }
47 break; /* break the for loop, do other side of label */
48- } else if (*lc == 'N') {
49+ } else if (*lc == 'N' && (self->decorations & OB_FRAME_DECOR_ICON)) {
50 if (firstcon) *firstcon = OB_FRAME_CONTEXT_ICON;
51 /* icon is bigger than buttons */
52 place_button(self, lc, bwidth + 2, left, i, &x, &self->icon_on, &self->icon_x);
53- } else if (*lc == 'D') {
54+ } else if (*lc == 'D' && (self->decorations & OB_FRAME_DECOR_ALLDESKTOPS)) {
55 if (firstcon) *firstcon = OB_FRAME_CONTEXT_ALLDESKTOPS;
56 place_button(self, lc, bwidth, left, i, &x, &self->desk_on, &self->desk_x);
57- } else if (*lc == 'S') {
58+ } else if (*lc == 'S' && (self->decorations & OB_FRAME_DECOR_SHADE)) {
59 if (firstcon) *firstcon = OB_FRAME_CONTEXT_SHADE;
60 place_button(self, lc, bwidth, left, i, &x, &self->shade_on, &self->shade_x);
61- } else if (*lc == 'I') {
62+ } else if (*lc == 'I' && (self->decorations & OB_FRAME_DECOR_ICONIFY)) {
63 if (firstcon) *firstcon = OB_FRAME_CONTEXT_ICONIFY;
64 place_button(self, lc, bwidth, left, i, &x, &self->iconify_on, &self->iconify_x);
65- } else if (*lc == 'M') {
66+ } else if (*lc == 'M' && (self->decorations & OB_FRAME_DECOR_MAXIMIZE)) {
67 if (firstcon) *firstcon = OB_FRAME_CONTEXT_MAXIMIZE;
68 place_button(self, lc, bwidth, left, i, &x, &self->max_on, &self->max_x);
69- } else if (*lc == 'C') {
70+ } else if (*lc == 'C' && (self->decorations & OB_FRAME_DECOR_CLOSE)) {
71 if (firstcon) *firstcon = OB_FRAME_CONTEXT_CLOSE;
72 place_button(self, lc, bwidth, left, i, &x, &self->close_on, &self->close_x);
73 } else
diff --git a/meta-oe/recipes-graphics/openbox/openbox/fix-dialog-buttons.patch b/meta-oe/recipes-graphics/openbox/openbox/fix-dialog-buttons.patch
deleted file mode 100644
index 02486eecb..000000000
--- a/meta-oe/recipes-graphics/openbox/openbox/fix-dialog-buttons.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Fix dialog support
2
3Upstream-Status: Pending
4
5diff --git a/openbox/client.c b/openbox/client.c
6index 4d54b38..c65e350 100644
7--- a/openbox/client.c
8+++ b/openbox/client.c
9@@ -562,6 +562,14 @@ void client_manage(Window window, ObPrompt *prompt)
10 /* free the ObAppSettings shallow copy */
11 g_free(settings);
12
13+ /* force dialogs to skip taskbar */
14+ if (self->type == OB_CLIENT_TYPE_DIALOG) {
15+ self->skip_taskbar = TRUE;
16+
17+ gulong state = prop_atoms.net_wm_state_skip_taskbar;
18+ PROP_SET32(self->window, net_wm_state, atom, state);
19+ }
20+
21 ob_debug("Managed window 0x%lx plate 0x%x (%s)\n",
22 window, self->frame->window, self->class);
23
24@@ -1733,6 +1741,14 @@ void client_setup_decor_and_functions(ObClient *self, gboolean reconfig)
25 /* sometimes apps make dialog windows fullscreen for some reason (for
26 e.g. kpdf does this..) */
27 self->functions |= OB_CLIENT_FUNC_FULLSCREEN;
28+ /* these windows cannot be maximized or minimized*/
29+ self->decorations &= ~(OB_FRAME_DECOR_ICONIFY |
30+ OB_FRAME_DECOR_MAXIMIZE |
31+ OB_FRAME_DECOR_HANDLE);
32+
33+ self->functions &= ~(OB_CLIENT_FUNC_ICONIFY |
34+ OB_CLIENT_FUNC_MAXIMIZE |
35+ OB_CLIENT_FUNC_RESIZE);
36 break;
37
38 case OB_CLIENT_TYPE_UTILITY:
diff --git a/meta-oe/recipes-graphics/openbox/openbox/sync-with-3.4-working.patch b/meta-oe/recipes-graphics/openbox/openbox/sync-with-3.4-working.patch
deleted file mode 100644
index 6cd91b948..000000000
--- a/meta-oe/recipes-graphics/openbox/openbox/sync-with-3.4-working.patch
+++ /dev/null
@@ -1,2739 +0,0 @@
1Sync with 3.4-working branch
2
3Upstream-Status: Backport
4
5diff --git a/.gitignore b/.gitignore
6index 907abb9..bac98c7 100644
7--- a/.gitignore
8+++ b/.gitignore
9@@ -22,6 +22,7 @@ doc/openbox-gnome-session.1
10 doc/openbox-kde-session.1
11 doc/openbox-session.1
12 doc/openbox.1
13+doc/obxprop.1
14 libtool
15 ltmain.sh
16 m4/*.m4
17diff --git a/CHANGELOG b/CHANGELOG
18index 915e315..3ad87e9 100644
19--- a/CHANGELOG
20+++ b/CHANGELOG
21@@ -1,3 +1,16 @@
22+3.4.11.2:
23+ * Updated Estonian and Portuguese translations.
24+ * Fix a rare crash involving moving fullscreen windows to different monitors
25+ * Fix a more common crash involving pressing right in a menu
26+
27+3.4.11.1:
28+ * Updated Polish translation.
29+ * Fixed bug #4519 (Incorrect focus in reused windows).
30+ * Lower the default submenu open/hide delay from 200ms to 100ms.
31+ * Fix some more problems with gnome integration.
32+ * Update Clearlooks theme.
33+ * Some other small fixes.
34+
35 3.4.11:
36 * Update Hungarian, Japanese, and Latvian translations.
37 * Make xdg-autostart use the OPENBOX environment by default, so you can use
38diff --git a/Makefile.am b/Makefile.am
39index fe6ef92..e2430e0 100644
40--- a/Makefile.am
41+++ b/Makefile.am
42@@ -444,6 +444,7 @@ edit = $(SED) \
43 -e 's!@version\@!$(VERSION)!' \
44 -e 's!@configdir\@!$(configdir)!' \
45 -e 's!@secretbindir\@!$(secretbindir)!' \
46+ -e 's!@libexecdir\@!$(libexecdir)!' \
47 -e 's!@bindir\@!$(bindir)!'
48
49 data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile
50@@ -542,6 +543,7 @@ CLEANFILES = \
51 doc/openbox-session.1 \
52 doc/openbox-gnome-session.1 \
53 doc/openbox-kde-session.1 \
54+ doc/obxprop.1 \
55 data/xsession/openbox-session \
56 data/xsession/openbox-gnome-session \
57 data/xsession/openbox-kde-session \
58diff --git a/configure.ac b/configure.ac
59index 1ed2fd2..72445fa 100644
60--- a/configure.ac
61+++ b/configure.ac
62@@ -1,5 +1,5 @@
63 AC_PREREQ([2.54])
64-AC_INIT([openbox], [3.4.11], [http://bugzilla.icculus.org])
65+AC_INIT([openbox], [3.4.11.2], [http://bugzilla.icculus.org])
66 AM_INIT_AUTOMAKE
67 AC_CONFIG_SRCDIR([openbox/openbox.c])
68
69@@ -15,9 +15,9 @@ dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match
70 dnl
71 OB_MAJOR_VERSION=3
72 OB_MINOR_VERSION=4
73-OB_MICRO_VERSION=28
74-OB_INTERFACE_AGE=7
75-OB_BINARY_AGE=7
76+OB_MICRO_VERSION=30
77+OB_INTERFACE_AGE=9
78+OB_BINARY_AGE=9
79 OB_VERSION=$PACKAGE_VERSION
80
81 AC_SUBST(OB_MAJOR_VERSION)
82diff --git a/data/autostart.sh.in b/data/autostart.sh.in
83index eb55558..910e5e8 100644
84--- a/data/autostart.sh.in
85+++ b/data/autostart.sh.in
86@@ -22,8 +22,8 @@ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
87 fi
88
89 # Make GTK apps look and behave how they were set up in the gnome config tools
90-if test -x /usr/libexec/gnome-settings-daemon >/dev/null; then
91- /usr/libexec/gnome-settings-daemon &
92+if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
93+ @libexecdir@/gnome-settings-daemon &
94 elif which gnome-settings-daemon >/dev/null; then
95 gnome-settings-daemon &
96 # Make GTK apps look and behave how they were set up in the XFCE config tools
97diff --git a/data/gnome-wm-properties/openbox.desktop b/data/gnome-wm-properties/openbox.desktop
98index 23e690e..67e49e4 100644
99--- a/data/gnome-wm-properties/openbox.desktop
100+++ b/data/gnome-wm-properties/openbox.desktop
101@@ -1,4 +1,5 @@
102 [Desktop Entry]
103+Type=Application
104 Name=Openbox
105 Exec=openbox
106
107diff --git a/data/rc.xml b/data/rc.xml
108index 9c5424f..1b947b5 100644
109--- a/data/rc.xml
110+++ b/data/rc.xml
111@@ -373,6 +373,12 @@
112 <mousebind button="Left" action="Drag">
113 <action name="Resize"><edge>left</edge></action>
114 </mousebind>
115+
116+ <mousebind button="Right" action="Press">
117+ <action name="Focus"/>
118+ <action name="Raise"/>
119+ <action name="ShowMenu"><menu>client-menu</menu></action>
120+ </mousebind>
121 </context>
122
123 <context name="Right">
124@@ -383,6 +389,12 @@
125 <mousebind button="Left" action="Drag">
126 <action name="Resize"><edge>right</edge></action>
127 </mousebind>
128+
129+ <mousebind button="Right" action="Press">
130+ <action name="Focus"/>
131+ <action name="Raise"/>
132+ <action name="ShowMenu"><menu>client-menu</menu></action>
133+ </mousebind>
134 </context>
135
136 <context name="Bottom">
137@@ -615,7 +627,7 @@
138 menu is hidden again -->
139 <middle>no</middle>
140 <!-- center submenus vertically about the parent entry -->
141- <submenuShowDelay>200</submenuShowDelay>
142+ <submenuShowDelay>100</submenuShowDelay>
143 <!-- time to delay before showing a submenu after hovering over the parent
144 entry.
145 if this is a negative value, then the delay is infinite and the
146diff --git a/doc/openbox.1.in b/doc/openbox.1.in
147index d508e8c..89183aa 100644
148--- a/doc/openbox.1.in
149+++ b/doc/openbox.1.in
150@@ -4,7 +4,7 @@ openbox \(em A minimalistic, highly configurable, next generation window
151 manager with extensive standards support.
152 .SH "SYNOPSIS"
153 .PP
154-\fBopenbox\fR [\fB\-\-help\fP] [\fB\-\-version\fP] [\fB\-\-replace\fP] [\fB\-\-reconfigure\fP] [\fB\-\-restart\fP] [\fB\-\-sm-disable\fP] [\fB\-\-sync\fP] [\fB\-\-debug\fP] [\fB\-\-debug-focus\fP] [\fB\-\-debug-xinerama\fP]
155+\fBopenbox\fR [\fB\-\-help\fP] [\fB\-\-version\fP] [\fB\-\-replace\fP] [\fB\-\-reconfigure\fP] [\fB\-\-restart\fP] [\fB\-\-config-file FILE\fP] [\fB\-\-sm-disable\fP] [\fB\-\-sync\fP] [\fB\-\-debug\fP] [\fB\-\-debug-focus\fP] [\fB\-\-debug-xinerama\fP]
156 .SH "DESCRIPTION"
157 .PP
158 Openbox is minimalistic, highly configurable, next generation window
159@@ -70,6 +70,9 @@ reload its configuration.
160 If Openbox is already running on the display, tell it to
161 restart. This is useful if you have upgraded Openbox and don't
162 want to restart X.
163+.IP "\fB\-\-config-file FILE\fP" 10
164+Use FILE for configuration instead of looking for rc.xml
165+in the XDG search path. FILE is an absolute path.
166 .IP "\fB\-\-sm-disable\fP" 10
167 Do not connect to the session manager.
168 .IP "\fB\-\-sync\fP" 10
169@@ -92,4 +95,4 @@ The program's full documentation is available on the website:
170 .PP
171 Please report bugs to: \fBhttp://bugzilla.icculus.org/
172 \fP
173-.\" created by instant / docbook-to-man, Wed 06 Jan 2010, 13:40
174+.\" created by instant / docbook-to-man, Fri 26 Mar 2010, 01:55
175diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml
176index 275c324..a06d0cf 100644
177--- a/doc/openbox.1.sgml
178+++ b/doc/openbox.1.sgml
179@@ -41,6 +41,7 @@ manpage.1: manpage.sgml
180 <arg><option>--replace</option></arg>
181 <arg><option>--reconfigure</option></arg>
182 <arg><option>--restart</option></arg>
183+ <arg><option>--config-file FILE</option></arg>
184 <arg><option>--sm-disable</option></arg>
185 <arg><option>--sync</option></arg>
186 <arg><option>--debug</option></arg>
187@@ -137,6 +138,13 @@ manpage.1: manpage.sgml
188 </listitem>
189 </varlistentry>
190 <varlistentry>
191+ <term><option>--config-file FILE</option></term>
192+ <listitem>
193+ <para>Use FILE for configuration instead of looking for rc.xml
194+ in the XDG search path. FILE is an absolute path.</para>
195+ </listitem>
196+ </varlistentry>
197+ <varlistentry>
198 <term><option>--sm-disable</option></term>
199 <listitem>
200 <para>Do not connect to the session manager.</para>
201diff --git a/openbox/actions.c b/openbox/actions.c
202index 948ac2c..a6a6ea4 100644
203--- a/openbox/actions.c
204+++ b/openbox/actions.c
205@@ -47,6 +47,7 @@ struct _ObActionsDefinition {
206 ObActionsRunFunc run;
207 ObActionsInteractiveInputFunc i_input;
208 ObActionsInteractiveCancelFunc i_cancel;
209+ ObActionsShutdownFunc shutdown;
210 };
211
212 struct _ObActionsAct {
213@@ -73,7 +74,9 @@ void actions_shutdown(gboolean reconfig)
214
215 /* free all the registered actions */
216 while (registered) {
217- actions_definition_unref(registered->data);
218+ ObActionsDefinition *d = registered->data;
219+ if (d->shutdown) d->shutdown();
220+ actions_definition_unref(d);
221 registered = g_slist_delete_link(registered, registered);
222 }
223 }
224@@ -105,12 +108,29 @@ gboolean actions_register(const gchar *name,
225 def->run = run;
226 def->i_input = i_input;
227 def->i_cancel = i_cancel;
228+ def->shutdown = NULL;
229
230 registered = g_slist_prepend(registered, def);
231
232 return TRUE;
233 }
234
235+gboolean actions_set_shutdown(const gchar *name,
236+ ObActionsShutdownFunc shutdown)
237+{
238+ GSList *it;
239+ ObActionsDefinition *def;
240+
241+ for (it = registered; it; it = g_slist_next(it)) {
242+ def = it->data;
243+ if (!g_ascii_strcasecmp(name, def->name)) {
244+ def->shutdown = shutdown;
245+ return TRUE;
246+ }
247+ }
248+ return FALSE;
249+}
250+
251 static void actions_definition_ref(ObActionsDefinition *def)
252 {
253 ++def->ref;
254diff --git a/openbox/actions.h b/openbox/actions.h
255index fb9a6a8..7a98aab 100644
256--- a/openbox/actions.h
257+++ b/openbox/actions.h
258@@ -35,6 +35,7 @@ typedef gpointer (*ObActionsDataSetupFunc)(ObParseInst *i,
259 typedef void (*ObActionsDataFreeFunc)(gpointer options);
260 typedef gboolean (*ObActionsRunFunc)(ObActionsData *data,
261 gpointer options);
262+typedef void (*ObActionsShutdownFunc)(void);
263 typedef gboolean (*ObActionsInteractiveInputFunc)(guint initial_state,
264 XEvent *e,
265 gpointer options,
266@@ -64,9 +65,13 @@ gboolean actions_register(const gchar *name,
267 ObActionsInteractiveInputFunc i_input,
268 ObActionsInteractiveCancelFunc i_cancel);
269
270+gboolean actions_set_shutdown(const gchar *name,
271+ ObActionsShutdownFunc shutdown);
272+
273 ObActionsAct* actions_parse(ObParseInst *i,
274 xmlDocPtr doc,
275 xmlNodePtr node);
276+
277 ObActionsAct* actions_parse_string(const gchar *name);
278
279 gboolean actions_act_is_interactive(ObActionsAct *act);
280diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
281index 4e0dfd8..29cd327 100644
282--- a/openbox/actions/execute.c
283+++ b/openbox/actions/execute.c
284@@ -1,4 +1,5 @@
285 #include "openbox/actions.h"
286+#include "openbox/client.h"
287 #include "openbox/event.h"
288 #include "openbox/startupnotify.h"
289 #include "openbox/prompt.h"
290@@ -16,18 +17,16 @@ typedef struct {
291 gchar *sn_icon;
292 gchar *sn_wmclass;
293 gchar *prompt;
294+ ObActionsData *data;
295 } Options;
296
297 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
298 static void free_func(gpointer options);
299 static gboolean run_func(ObActionsData *data, gpointer options);
300-/*
301-static gboolean i_input_func(guint initial_state,
302- XEvent *e,
303- gpointer options,
304- gboolean *used);
305-static void i_cancel_func(gpointer options);
306-*/
307+static void shutdown_func(void);
308+static void client_dest(ObClient *client, gpointer data);
309+
310+static GSList *prompt_opts = NULL;
311
312 void action_execute_startup(void)
313 {
314@@ -36,6 +35,20 @@ void action_execute_startup(void)
315 free_func,
316 run_func,
317 NULL, NULL);
318+ actions_set_shutdown("Execute", shutdown_func);
319+
320+ client_add_destroy_notify(client_dest, NULL);
321+}
322+
323+static void client_dest(ObClient *client, gpointer data)
324+{
325+ GSList *it;
326+
327+ for (it = prompt_opts; it; it = g_slist_next(it)) {
328+ Options *o = it->data;
329+ if (o->data->client == client)
330+ o->data->client = NULL;
331+ }
332 }
333
334 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
335@@ -70,21 +83,29 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
336 return o;
337 }
338
339+static void shutdown_func(void)
340+{
341+ client_remove_destroy_notify(client_dest);
342+}
343+
344 static void free_func(gpointer options)
345 {
346 Options *o = options;
347
348 if (o) {
349+ prompt_opts = g_slist_remove(prompt_opts, o);
350+
351 g_free(o->cmd);
352 g_free(o->sn_name);
353 g_free(o->sn_icon);
354 g_free(o->sn_wmclass);
355 g_free(o->prompt);
356+ if (o->data) g_free(o->data);
357 g_free(o);
358 }
359 }
360
361-static Options* dup_options(Options *in)
362+static Options* dup_options(Options *in, ObActionsData *data)
363 {
364 Options *o = g_new(Options, 1);
365 o->cmd = g_strdup(in->cmd);
366@@ -93,15 +114,15 @@ static Options* dup_options(Options *in)
367 o->sn_icon = g_strdup(in->sn_icon);
368 o->sn_wmclass = g_strdup(in->sn_wmclass);
369 o->prompt = NULL;
370+ o->data = g_memdup(data, sizeof(ObActionsData));
371 return o;
372 }
373
374-static gboolean run_func(ObActionsData *data, gpointer options);
375-
376 static gboolean prompt_cb(ObPrompt *p, gint result, gpointer options)
377 {
378+ Options *o = options;
379 if (result)
380- run_func(NULL, options);
381+ run_func(o->data, o);
382 return TRUE; /* call the cleanup func */
383 }
384
385@@ -129,7 +150,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
386 { _("Yes"), 1 }
387 };
388
389- ocp = dup_options(options);
390+ ocp = dup_options(options, data);
391 p = prompt_new(o->prompt, _("Execute"), answers, 2, 0, 0,
392 prompt_cb, prompt_cleanup, ocp);
393 prompt_show(p, NULL, FALSE);
394@@ -149,7 +170,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
395 event_cancel_all_key_grabs();
396
397 if (!g_shell_parse_argv(cmd, NULL, &argv, &e)) {
398- g_message(e->message, o->cmd);
399+ g_message("%s", e->message);
400 g_error_free(e);
401 }
402 else {
403@@ -168,7 +189,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
404 G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
405 NULL, NULL, NULL, &e))
406 {
407- g_message(e->message, o->cmd);
408+ g_message("%s", e->message);
409 g_error_free(e);
410
411 if (o->sn)
412diff --git a/openbox/actions/exit.c b/openbox/actions/exit.c
413index 567926e..f447830 100644
414--- a/openbox/actions/exit.c
415+++ b/openbox/actions/exit.c
416@@ -10,11 +10,12 @@ typedef struct {
417
418 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
419 static gboolean run_func(ObActionsData *data, gpointer options);
420+static void free_func(gpointer options);
421
422 void action_exit_startup(void)
423 {
424- actions_register("Exit", setup_func, NULL, run_func, NULL, NULL);
425- actions_register("SessionLogout", setup_func, NULL, run_func, NULL, NULL);
426+ actions_register("Exit", setup_func, free_func, run_func, NULL, NULL);
427+ actions_register("SessionLogout", setup_func, free_func, run_func, NULL, NULL);
428 }
429
430 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
431@@ -31,6 +32,12 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
432 return o;
433 }
434
435+static void free_func(gpointer options)
436+{
437+ if (options)
438+ g_free(options);
439+}
440+
441 static void do_exit(void)
442 {
443 if (session_connected())
444diff --git a/openbox/actions/moverelative.c b/openbox/actions/moverelative.c
445index 1d1189c..a553519 100644
446--- a/openbox/actions/moverelative.c
447+++ b/openbox/actions/moverelative.c
448@@ -54,15 +54,15 @@ static gboolean run_func(ObActionsData *data, gpointer options)
449 gint x, y, lw, lh, w, h;
450
451 c = data->client;
452- x = data->client->area.x + o->x;
453- y = data->client->area.y + o->y;
454- w = data->client->area.width;
455- h = data->client->area.height;
456- client_try_configure(data->client, &x, &y, &w, &h, &lw, &lh, TRUE);
457- client_find_onscreen(data->client, &x, &y, w, h, FALSE);
458+ x = c->area.x + o->x;
459+ y = c->area.y + o->y;
460+ w = c->area.width;
461+ h = c->area.height;
462+ client_try_configure(c, &x, &y, &w, &h, &lw, &lh, TRUE);
463+ client_find_onscreen(c, &x, &y, w, h, FALSE);
464
465 actions_client_move(data, TRUE);
466- client_configure(data->client, x, y, w, h, TRUE, TRUE, FALSE);
467+ client_configure(c, x, y, w, h, TRUE, TRUE, FALSE);
468 actions_client_move(data, FALSE);
469 }
470
471diff --git a/openbox/client.c b/openbox/client.c
472index fd5d375..2d6885d 100644
473--- a/openbox/client.c
474+++ b/openbox/client.c
475@@ -372,7 +372,7 @@ void client_manage(Window window, ObPrompt *prompt)
476 /* NET_WM_USER_TIME 0 when mapping means don't focus */
477 (user_time != 0) &&
478 /* this checks for focus=false for the window */
479- (!settings || settings->focus != 0) &&
480+ settings->focus != 0 &&
481 focus_valid_target(self, FALSE, FALSE, TRUE, FALSE, FALSE,
482 settings->focus == 1))
483 {
484@@ -782,7 +782,7 @@ static gboolean client_can_steal_focus(ObClient *self, Time steal_time,
485
486 /* This is focus stealing prevention */
487 ob_debug_type(OB_DEBUG_FOCUS,
488- "Want to focus new window 0x%x at time %u "
489+ "Want to focus window 0x%x at time %u "
490 "launched at %u (last user interaction time %u)\n",
491 self->window, steal_time, launch_time,
492 event_last_user_time);
493@@ -791,8 +791,9 @@ static gboolean client_can_steal_focus(ObClient *self, Time steal_time,
494 if (!(self->desktop == screen_desktop ||
495 self->desktop == DESKTOP_ALL) &&
496 /* the timestamp is from before you changed desktops */
497- launch_time && screen_desktop_user_time &&
498- !event_time_after(launch_time, screen_desktop_user_time))
499+ (!launch_time ||
500+ (screen_desktop_user_time &&
501+ !event_time_after(launch_time, screen_desktop_user_time))))
502 {
503 steal = FALSE;
504 ob_debug_type(OB_DEBUG_FOCUS,
505@@ -2488,7 +2489,7 @@ ObClient *client_search_focus_tree_full(ObClient *self)
506
507 for (it = self->parents; it; it = g_slist_next(it)) {
508 ObClient *c = it->data;
509- if ((c = client_search_focus_tree_full(it->data))) return c;
510+ if ((c = client_search_focus_tree_full(c))) return c;
511 }
512
513 return NULL;
514@@ -3175,7 +3176,8 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h,
515
516 /* if it moved between monitors, then this can affect the stacking
517 layer of this window or others - for fullscreen windows */
518- if (screen_find_monitor(&self->frame->area) !=
519+ if (self->managed &&
520+ screen_find_monitor(&self->frame->area) !=
521 screen_find_monitor(&oldframe))
522 {
523 client_calc_layer(self);
524diff --git a/openbox/config.c b/openbox/config.c
525index 1a99539..503f028 100644
526--- a/openbox/config.c
527+++ b/openbox/config.c
528@@ -205,7 +205,7 @@ static void parse_per_app_settings(ObParseInst *inst, xmlDocPtr doc,
529 gboolean x_pos_given;
530
531 while (app) {
532- name_set = class_set = type_set = x_pos_given = FALSE;
533+ x_pos_given = FALSE;
534
535 class_set = parse_attr_string("class", app, &class);
536 name_set = parse_attr_string("name", app, &name);
537@@ -1018,7 +1018,7 @@ void config_startup(ObParseInst *i)
538
539 config_menu_hide_delay = 250;
540 config_menu_middle = FALSE;
541- config_submenu_show_delay = 200;
542+ config_submenu_show_delay = 100;
543 config_submenu_hide_delay = 400;
544 config_menu_client_list_icons = TRUE;
545 config_menu_manage_desktops = TRUE;
546diff --git a/openbox/event.c b/openbox/event.c
547index 2ebea6b..1c6c043 100644
548--- a/openbox/event.c
549+++ b/openbox/event.c
550@@ -652,6 +652,7 @@ static void event_process(const XEvent *ec, gpointer data)
551 /* keyboard layout changes for modifier mapping changes. reload the
552 modifier map, and rebind all the key bindings as appropriate */
553 ob_debug("Keyboard map changed. Reloading keyboard bindings.\n");
554+ XRefreshKeyboardMapping(&e->xmapping);
555 ob_set_state(OB_STATE_RECONFIGURING);
556 modkeys_shutdown(TRUE);
557 modkeys_startup(TRUE);
558@@ -1323,11 +1324,23 @@ static void event_handle_client(ObClient *client, XEvent *e)
559 (e->xclient.data.l[0] == 2 ? "user" : "INVALID"))));
560 /* XXX make use of data.l[2] !? */
561 if (e->xclient.data.l[0] == 1 || e->xclient.data.l[0] == 2) {
562- event_curtime = e->xclient.data.l[1];
563+ /* we can not trust the timestamp from applications.
564+ e.g. chromium passes a very old timestamp. openbox thinks
565+ the window will get focus and calls XSetInputFocus with the
566+ (old) timestamp, which doesn't end up moving focus at all.
567+ but the window is raised, not hilited, etc, as if it was
568+ really going to get focus.
569+
570+ so do not use this timestamp in event_curtime, as this would
571+ be used in XSetInputFocus.
572+ */
573+ /*event_curtime = e->xclient.data.l[1];*/
574 if (e->xclient.data.l[1] == 0)
575 ob_debug_type(OB_DEBUG_APP_BUGS,
576 "_NET_ACTIVE_WINDOW message for window %s is"
577 " missing a timestamp\n", client->title);
578+
579+ event_curtime = event_get_server_time();
580 } else
581 ob_debug_type(OB_DEBUG_APP_BUGS,
582 "_NET_ACTIVE_WINDOW message for window %s is "
583@@ -1712,7 +1725,9 @@ static gboolean event_handle_menu_keyboard(XEvent *ev)
584
585 else if (ob_keycode_match(keycode, OB_KEY_RIGHT)) {
586 /* Right goes to the selected submenu */
587- if (frame->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
588+ if (frame->selected &&
589+ frame->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
590+ {
591 /* make sure it is visible */
592 menu_frame_select(frame, frame->selected, TRUE);
593 menu_frame_select_next(frame->child);
594diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
595index d7ac9f5..c48b8f2 100644
596--- a/openbox/focus_cycle_popup.c
597+++ b/openbox/focus_cycle_popup.c
598@@ -317,7 +317,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
599 gint innerw, innerh;
600 gint i;
601 GList *it;
602- const ObFocusCyclePopupTarget *newtarget;
603+ const ObFocusCyclePopupTarget *newtarget = NULL;
604 gint newtargetx, newtargety;
605
606 screen_area = screen_physical_area_primary(FALSE);
607diff --git a/openbox/menuframe.c b/openbox/menuframe.c
608index 36fdc5f..fa65c85 100644
609--- a/openbox/menuframe.c
610+++ b/openbox/menuframe.c
611@@ -654,7 +654,6 @@ void menu_frame_render(ObMenuFrame *self)
612 if (self->entries) {
613 gint l, t, r, b;
614
615- e = self->entries->data;
616 ob_rr_theme->a_menu_text_normal->texture[0].data.text.string = "";
617 tw = RrMinWidth(ob_rr_theme->a_menu_text_normal);
618 tw += 2*PADDING;
619diff --git a/openbox/modkeys.c b/openbox/modkeys.c
620index e897ccb..a54fdf0 100644
621--- a/openbox/modkeys.c
622+++ b/openbox/modkeys.c
623@@ -189,7 +189,7 @@ KeyCode* modkeys_sym_to_code(KeySym sym)
624 for (i = min_keycode; i <= max_keycode; ++i)
625 for (j = 0; j < keysyms_per_keycode; ++j)
626 if (sym == keymap[(i-min_keycode) * keysyms_per_keycode + j]) {
627- ret = g_renew(KeyCode, ret, ++n);
628+ ret = g_renew(KeyCode, ret, ++n + 1);
629 ret[n-1] = i;
630 ret[n] = 0;
631 }
632diff --git a/openbox/moveresize.c b/openbox/moveresize.c
633index fd52d89..39ae5b7 100644
634--- a/openbox/moveresize.c
635+++ b/openbox/moveresize.c
636@@ -655,7 +655,7 @@ static void move_with_keys(gint keycode, gint state)
637 static void resize_with_keys(gint keycode, gint state)
638 {
639 gint dw = 0, dh = 0, pdx = 0, pdy = 0, opx, opy, px, py;
640- gint dist = 0, resist = 0;
641+ gint resist = 0;
642 ObDirection dir;
643
644 /* pick the edge if it needs to move */
645@@ -745,27 +745,27 @@ static void resize_with_keys(gint keycode, gint state)
646
647 if (key_resize_edge == OB_DIRECTION_WEST) {
648 if (dir == OB_DIRECTION_WEST)
649- dw = (dist = distw);
650+ dw = distw;
651 else
652- dw = -(dist = distw);
653+ dw = -distw;
654 }
655 else if (key_resize_edge == OB_DIRECTION_EAST) {
656 if (dir == OB_DIRECTION_EAST)
657- dw = (dist = distw);
658+ dw = distw;
659 else
660- dw = -(dist = distw);
661+ dw = -distw;
662 }
663 else if (key_resize_edge == OB_DIRECTION_NORTH) {
664 if (dir == OB_DIRECTION_NORTH)
665- dh = (dist = disth);
666+ dh = disth;
667 else
668- dh = -(dist = disth);
669+ dh = -disth;
670 }
671 else /*if (key_resize_edge == OB_DIRECTION_SOUTH)*/ {
672 if (dir == OB_DIRECTION_SOUTH)
673- dh = (dist = disth);
674+ dh = disth;
675 else
676- dh = -(dist = disth);
677+ dh = -disth;
678 }
679 }
680
681diff --git a/openbox/openbox.c b/openbox/openbox.c
682index f19f064..12fb2f6 100644
683--- a/openbox/openbox.c
684+++ b/openbox/openbox.c
685@@ -711,7 +711,7 @@ static Cursor load_cursor(const gchar *name, guint fontval)
686
687 void ob_exit_with_error(const gchar *msg)
688 {
689- g_message(msg);
690+ g_message("%s", msg);
691 session_shutdown(TRUE);
692 exit(EXIT_FAILURE);
693 }
694diff --git a/openbox/prompt.c b/openbox/prompt.c
695index bef06a7..a97cd1b 100644
696--- a/openbox/prompt.c
697+++ b/openbox/prompt.c
698@@ -95,17 +95,17 @@ void prompt_startup(gboolean reconfig)
699 prompt_a_button->texture[0].data.text.color = c_button;
700 prompt_a_focus->texture[0].data.text.color = c_focus;
701 prompt_a_press->texture[0].data.text.color = c_press;
702- prompt_a_pfocus->texture[0].data.text.color = c_press;
703+ prompt_a_pfocus->texture[0].data.text.color = c_pfocus;
704
705 prompt_a_focus->texture[1].data.lineart.color = c_focus;
706 prompt_a_focus->texture[2].data.lineart.color = c_focus;
707 prompt_a_focus->texture[3].data.lineart.color = c_focus;
708 prompt_a_focus->texture[4].data.lineart.color = c_focus;
709
710- prompt_a_pfocus->texture[1].data.lineart.color = c_press;
711- prompt_a_pfocus->texture[2].data.lineart.color = c_press;
712- prompt_a_pfocus->texture[3].data.lineart.color = c_press;
713- prompt_a_pfocus->texture[4].data.lineart.color = c_press;
714+ prompt_a_pfocus->texture[1].data.lineart.color = c_pfocus;
715+ prompt_a_pfocus->texture[2].data.lineart.color = c_pfocus;
716+ prompt_a_pfocus->texture[3].data.lineart.color = c_pfocus;
717+ prompt_a_pfocus->texture[4].data.lineart.color = c_pfocus;
718
719 prompt_a_msg = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
720 prompt_a_msg->texture[0].data.text.flow = TRUE;
721diff --git a/openbox/resist.c b/openbox/resist.c
722index 91eabcb..9b785a3 100644
723--- a/openbox/resist.c
724+++ b/openbox/resist.c
725@@ -330,7 +330,6 @@ void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h,
726 Rect *area, *parea;
727 gint al, at, ar, ab; /* screen boundaries */
728 gint pl, pt, pr, pb; /* physical screen boundaries */
729- gint incw, inch;
730 guint i;
731 Rect desired_area;
732
733@@ -341,9 +340,6 @@ void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h,
734 t = RECT_TOP(c->frame->area);
735 b = RECT_BOTTOM(c->frame->area);
736
737- incw = c->size_inc.width;
738- inch = c->size_inc.height;
739-
740 RECT_SET(desired_area, c->area.x, c->area.y, *w, *h);
741
742 for (i = 0; i < screen_num_monitors; ++i) {
743diff --git a/openbox/screen.c b/openbox/screen.c
744index 55fd58d..d11c0b6 100644
745--- a/openbox/screen.c
746+++ b/openbox/screen.c
747@@ -513,7 +513,6 @@ void screen_resize(void)
748
749 void screen_set_num_desktops(guint num)
750 {
751- guint old;
752 gulong *viewport;
753 GList *it, *stacking_copy;
754
755@@ -521,7 +520,6 @@ void screen_set_num_desktops(guint num)
756
757 if (screen_num_desktops == num) return;
758
759- old = screen_num_desktops;
760 screen_num_desktops = num;
761 PROP_SET32(RootWindow(ob_display, ob_screen),
762 net_number_of_desktops, cardinal, num);
763@@ -1462,7 +1460,7 @@ Rect* screen_area(guint desktop, guint head, Rect *search)
764 {
765 Rect *a;
766 GSList *it;
767- gint l, r, t, b, al, ar, at, ab;
768+ gint l, r, t, b;
769 guint i, d;
770 gboolean us = search != NULL; /* user provided search */
771
772@@ -1482,36 +1480,32 @@ Rect* screen_area(guint desktop, guint head, Rect *search)
773 }
774 if (head == SCREEN_AREA_ONE_MONITOR) head = screen_find_monitor(search);
775
776- /* al is "all left" meaning the furthest left you can get, l is our
777- "working left" meaning our current strut edge which we're calculating
778- */
779-
780 /* only include monitors which the search area lines up with */
781 if (RECT_INTERSECTS_RECT(monitor_area[screen_num_monitors], *search)) {
782- al = l = RECT_RIGHT(monitor_area[screen_num_monitors]);
783- at = t = RECT_BOTTOM(monitor_area[screen_num_monitors]);
784- ar = r = RECT_LEFT(monitor_area[screen_num_monitors]);
785- ab = b = RECT_TOP(monitor_area[screen_num_monitors]);
786+ l = RECT_RIGHT(monitor_area[screen_num_monitors]);
787+ t = RECT_BOTTOM(monitor_area[screen_num_monitors]);
788+ r = RECT_LEFT(monitor_area[screen_num_monitors]);
789+ b = RECT_TOP(monitor_area[screen_num_monitors]);
790 for (i = 0; i < screen_num_monitors; ++i) {
791 /* add the monitor if applicable */
792 if (RANGES_INTERSECT(search->x, search->width,
793 monitor_area[i].x, monitor_area[i].width))
794 {
795- at = t = MIN(t, RECT_TOP(monitor_area[i]));
796- ab = b = MAX(b, RECT_BOTTOM(monitor_area[i]));
797+ t = MIN(t, RECT_TOP(monitor_area[i]));
798+ b = MAX(b, RECT_BOTTOM(monitor_area[i]));
799 }
800 if (RANGES_INTERSECT(search->y, search->height,
801 monitor_area[i].y, monitor_area[i].height))
802 {
803- al = l = MIN(l, RECT_LEFT(monitor_area[i]));
804- ar = r = MAX(r, RECT_RIGHT(monitor_area[i]));
805+ l = MIN(l, RECT_LEFT(monitor_area[i]));
806+ r = MAX(r, RECT_RIGHT(monitor_area[i]));
807 }
808 }
809 } else {
810- al = l = RECT_LEFT(monitor_area[screen_num_monitors]);
811- at = t = RECT_TOP(monitor_area[screen_num_monitors]);
812- ar = r = RECT_RIGHT(monitor_area[screen_num_monitors]);
813- ab = b = RECT_BOTTOM(monitor_area[screen_num_monitors]);
814+ l = RECT_LEFT(monitor_area[screen_num_monitors]);
815+ t = RECT_TOP(monitor_area[screen_num_monitors]);
816+ r = RECT_RIGHT(monitor_area[screen_num_monitors]);
817+ b = RECT_BOTTOM(monitor_area[screen_num_monitors]);
818 }
819
820 for (d = 0; d < screen_num_desktops; ++d) {
821diff --git a/openbox/translate.c b/openbox/translate.c
822index bd8b88f..71a919c 100644
823--- a/openbox/translate.c
824+++ b/openbox/translate.c
825@@ -166,7 +166,11 @@ gchar *translate_keycode(guint keycode)
826
827 if ((sym = XKeycodeToKeysym(ob_display, keycode, 0)) != NoSymbol)
828 ret = XKeysymToString(sym);
829- return g_locale_to_utf8(ret, -1, NULL, NULL, NULL);
830+ /* glib crashes in g_locale_to_utf8 if you pass it NULL here */
831+ if (ret)
832+ return g_locale_to_utf8(ret, -1, NULL, NULL, NULL);
833+ else
834+ return NULL;
835 }
836
837 gunichar translate_unichar(guint keycode)
838diff --git a/parser/parse.c b/parser/parse.c
839index 7a3c72e..6db7ca7 100644
840--- a/parser/parse.c
841+++ b/parser/parse.c
842@@ -219,10 +219,12 @@ void parse_close(xmlDocPtr doc)
843 void parse_tree(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
844 {
845 while (node) {
846- struct Callback *c = g_hash_table_lookup(i->callbacks, node->name);
847+ if (node->name) {
848+ struct Callback *c = g_hash_table_lookup(i->callbacks, node->name);
849
850- if (c)
851- c->func(i, doc, node, c->data);
852+ if (c)
853+ c->func(i, doc, node, c->data);
854+ }
855
856 node = node->next;
857 }
858diff --git a/po/et.po b/po/et.po
859index 9c9c9f3..d4a80d8 100644
860--- a/po/et.po
861+++ b/po/et.po
862@@ -1,20 +1,22 @@
863+# Openboxi eesti keele tõlge
864 # translation of openbox to Estonian
865 # Copyright (C) 2007 Dana Jansens
866 # This file is distributed under the same license as the Openbox 3 package.
867 #
868 # Andres Järv <andresjarv@gmail.com>, 2007.
869+# Mihkel <turakas gmail com>, 2010
870 msgid ""
871 msgstr ""
872-"Project-Id-Version: Openbox 3.4.3\n"
873+"Project-Id-Version: Openbox 3.4.11.1\n"
874 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
875-"POT-Creation-Date: 2008-11-15 22:28+0100\n"
876-"PO-Revision-Date: 2007-07-20 16:54+0200\n"
877-"Last-Translator: Andres Järv <andresjarv@gmail.com>\n"
878+"POT-Creation-Date: 2010-04-22 15:53+0200\n"
879+"PO-Revision-Date: 2010-04-21 21:40+0300\n"
880+"Last-Translator: mihkel <turakas@gmail.com>\n"
881 "Language-Team: Estonian <et@li.org>\n"
882 "MIME-Version: 1.0\n"
883 "Content-Type: text/plain; charset=UTF-8\n"
884 "Content-Transfer-Encoding: 8bit\n"
885-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
886+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
887
888 #: openbox/actions.c:149
889 #, c-format
890@@ -23,87 +25,82 @@ msgstr "Taotleti kehtetut käsklust \"%s\". Sellist käsklust pole olemas."
891
892 #: openbox/actions/execute.c:128
893 msgid "No"
894-msgstr ""
895+msgstr "Ei"
896
897 #: openbox/actions/execute.c:129
898 msgid "Yes"
899-msgstr ""
900+msgstr "Jah"
901
902 #: openbox/actions/execute.c:133
903 msgid "Execute"
904-msgstr ""
905+msgstr "Käivita"
906
907 #: openbox/actions/execute.c:142
908 #, c-format
909 msgid "Failed to convert the path \"%s\" from utf8"
910 msgstr "Raja \"%s\" ümberkodeerimine UTF8-st ebaõnnestus"
911
912-#: openbox/actions/exit.c:52 openbox/actions/session.c:64
913-#: openbox/client.c:3465
914+#: openbox/actions/exit.c:62 openbox/client.c:3506
915 msgid "Cancel"
916-msgstr ""
917+msgstr "Katkesta"
918
919-#: openbox/actions/exit.c:53
920+#: openbox/actions/exit.c:63
921 msgid "Exit"
922-msgstr ""
923-
924-#: openbox/actions/exit.c:56
925-msgid "Are you sure you want to exit Openbox?"
926-msgstr ""
927-
928-#: openbox/actions/exit.c:57
929-msgid "Exit Openbox"
930-msgstr ""
931+msgstr "Välju"
932
933-#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the
934-#. name of the action you write in rc.xml
935-#: openbox/actions/session.c:43
936-msgid ""
937-"The SessionLogout action is not available since Openbox was built without "
938-"session management support"
939-msgstr ""
940+#: openbox/actions/exit.c:67
941+msgid "Are you sure you want to log out?"
942+msgstr "Kas oled kindel, et soovid välja logida?"
943
944-#: openbox/actions/session.c:65 openbox/actions/session.c:70
945+#: openbox/actions/exit.c:68
946 msgid "Log Out"
947-msgstr ""
948+msgstr "Logi välja"
949
950-#: openbox/actions/session.c:69
951-msgid "Are you sure you want to log out?"
952-msgstr ""
953+#: openbox/actions/exit.c:71
954+msgid "Are you sure you want to exit Openbox?"
955+msgstr "Kas oled kindel, et soovid OpenBoxist väljuda?"
956+
957+#: openbox/actions/exit.c:72
958+msgid "Exit Openbox"
959+msgstr "Välju Openbox-st"
960
961-#: openbox/client.c:2012
962+#: openbox/client.c:2024
963 msgid "Unnamed Window"
964-msgstr ""
965+msgstr "Nimetu aken"
966
967-#: openbox/client.c:2026 openbox/client.c:2058
968+#: openbox/client.c:2038 openbox/client.c:2070
969 msgid "Killing..."
970-msgstr ""
971+msgstr "Tapan..."
972
973-#: openbox/client.c:2028 openbox/client.c:2060
974+#: openbox/client.c:2040 openbox/client.c:2072
975 msgid "Not Responding"
976-msgstr ""
977+msgstr "Ei vasta"
978
979-#: openbox/client.c:3454
980+#: openbox/client.c:3495
981 #, c-format
982 msgid ""
983 "The window \"%s\" does not seem to be responding. Do you want to force it "
984 "to exit by sending the %s signal?"
985 msgstr ""
986+"Paistab, et aken \"%s\" ei vasta enam. Kas soovid teda jõuga väljuma sundida "
987+"saates %s signaali?"
988
989-#: openbox/client.c:3456
990+#: openbox/client.c:3497
991 msgid "End Process"
992-msgstr ""
993+msgstr "Lõpeta protsess"
994
995-#: openbox/client.c:3460
996+#: openbox/client.c:3501
997 #, c-format
998 msgid ""
999 "The window \"%s\" does not seem to be responding. Do you want to disconnect "
1000 "it from the X server?"
1001 msgstr ""
1002+"Paistab, et aken \"%s\" ei vasta enam. Kas soovid ta X serverist lahti "
1003+"ühendada?"
1004
1005-#: openbox/client.c:3462
1006+#: openbox/client.c:3503
1007 msgid "Disconnect"
1008-msgstr ""
1009+msgstr "Ühenda lahti"
1010
1011 #: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91
1012 msgid "Go there..."
1013@@ -189,14 +186,14 @@ msgstr "Äär_ed sisse/välja"
1014 msgid "_Close"
1015 msgstr "S_ulge"
1016
1017-#: openbox/config.c:781
1018+#: openbox/config.c:798
1019 #, c-format
1020 msgid "Invalid button \"%s\" specified in config file"
1021-msgstr "Vigane nupp \"%s\" määratletud konfiguratsioonifailis"
1022+msgstr "Vigane nupp \"%s\" määratud seadistuste failis"
1023
1024 #: openbox/keyboard.c:157
1025 msgid "Conflict with key binding in config file"
1026-msgstr "Konflikt kiirklahviga konfiguratsioonifailis"
1027+msgstr "Konflikt kiirklahviga seadistuste failis"
1028
1029 #: openbox/menu.c:102 openbox/menu.c:110
1030 #, c-format
1031@@ -218,7 +215,7 @@ msgstr "Vigane väljund torumenüüst \"%s\""
1032 msgid "Attempted to access menu \"%s\" but it does not exist"
1033 msgstr "Üritati ligi pääseda menüüle \"%s\", aga seda pole olemas"
1034
1035-#: openbox/menu.c:367 openbox/menu.c:368
1036+#: openbox/menu.c:370 openbox/menu.c:371
1037 msgid "More..."
1038 msgstr "Rohkem..."
1039
1040@@ -243,7 +240,7 @@ msgstr "DISPLAY keskkonnamuutujas oleva ekraani avamine ebaõnnestus."
1041
1042 #: openbox/openbox.c:183
1043 msgid "Failed to initialize the obrender library."
1044-msgstr "Obrender-damisteegi käivitamine ebaõnnestus."
1045+msgstr "Obrender-damise teegi käivitamine ebaõnnestus."
1046
1047 #: openbox/openbox.c:194
1048 msgid "X server does not support locale."
1049@@ -253,46 +250,49 @@ msgstr "X server ei toeta lokaati."
1050 msgid "Cannot set locale modifiers for the X server."
1051 msgstr "Ei suudetud sättida lokaadimuutujaid X serveri jaoks."
1052
1053-#: openbox/openbox.c:263
1054+#: openbox/openbox.c:265
1055 msgid "Unable to find a valid config file, using some simple defaults"
1056 msgstr ""
1057-"Ei suudetud leida kehtivat konfiguratsioonifaili, kasutatakse lihtsaid "
1058+"Kehtiva seadistuste faili leidmine ebaõnnestus, kasutatakse lihtsaid "
1059 "vaikimisi seadeid"
1060
1061-#: openbox/openbox.c:297
1062+#: openbox/openbox.c:299
1063 msgid "Unable to load a theme."
1064-msgstr "Ei suudetud laadida teemat."
1065+msgstr "Teema laadimine ebaõnnestus."
1066
1067-#: openbox/openbox.c:377
1068+#: openbox/openbox.c:379
1069 #, c-format
1070 msgid ""
1071 "One or more XML syntax errors were found while parsing the Openbox "
1072 "configuration files. See stdout for more information. The last error seen "
1073 "was in file \"%s\" line %d, with message: %s"
1074 msgstr ""
1075+"Üks või enam XML süntaki viga leiti Openboxi seadistuse faili parsides. "
1076+"Rohkem infot leiad stdout-st. Viimane viga oli failis \"%s\", real %d ja "
1077+"sõnum oli: %s"
1078
1079-#: openbox/openbox.c:379
1080+#: openbox/openbox.c:381
1081 msgid "Openbox Syntax Error"
1082-msgstr ""
1083+msgstr "Openboxi süntaksi viga"
1084
1085-#: openbox/openbox.c:379
1086+#: openbox/openbox.c:381
1087 msgid "Close"
1088 msgstr "Sulge"
1089
1090-#: openbox/openbox.c:448
1091+#: openbox/openbox.c:463
1092 #, c-format
1093 msgid "Restart failed to execute new executable \"%s\": %s"
1094 msgstr "Taaskäivitusel ebaõnnestus uue käivitusfaili \"%s\" käivitamine: %s"
1095
1096-#: openbox/openbox.c:518 openbox/openbox.c:520
1097+#: openbox/openbox.c:533 openbox/openbox.c:535
1098 msgid "Copyright (c)"
1099 msgstr "Autoriõigused (c)"
1100
1101-#: openbox/openbox.c:529
1102+#: openbox/openbox.c:544
1103 msgid "Syntax: openbox [options]\n"
1104 msgstr "Süntaks: openbox [seaded]\n"
1105
1106-#: openbox/openbox.c:530
1107+#: openbox/openbox.c:545
1108 msgid ""
1109 "\n"
1110 "Options:\n"
1111@@ -300,30 +300,30 @@ msgstr ""
1112 "\n"
1113 "Seaded:\n"
1114
1115-#: openbox/openbox.c:531
1116+#: openbox/openbox.c:546
1117 msgid " --help Display this help and exit\n"
1118 msgstr " --help Selle abi kuvamine ja väljumine\n"
1119
1120-#: openbox/openbox.c:532
1121+#: openbox/openbox.c:547
1122 msgid " --version Display the version and exit\n"
1123 msgstr " --version Versiooni kuvamine ja väljumine\n"
1124
1125-#: openbox/openbox.c:533
1126+#: openbox/openbox.c:548
1127 msgid " --replace Replace the currently running window manager\n"
1128 msgstr " --replace Hetkel töötava aknahalduri asendamine\n"
1129
1130 #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..."
1131 #. aligned still, if you have to, make a new line with \n and 22 spaces. It's
1132 #. fine to leave it as FILE though.
1133-#: openbox/openbox.c:537
1134+#: openbox/openbox.c:552
1135 msgid " --config-file FILE Specify the path to the config file to use\n"
1136-msgstr ""
1137+msgstr " --config-file FAIL Määra kasutatava seadistuste faili teekond\n"
1138
1139-#: openbox/openbox.c:538
1140+#: openbox/openbox.c:553
1141 msgid " --sm-disable Disable connection to the session manager\n"
1142 msgstr " --sm-disable Seansihalduriga ühenduse keelamine\n"
1143
1144-#: openbox/openbox.c:539
1145+#: openbox/openbox.c:554
1146 msgid ""
1147 "\n"
1148 "Passing messages to a running Openbox instance:\n"
1149@@ -331,19 +331,19 @@ msgstr ""
1150 "\n"
1151 "Jooksvale Openboxi seansile sõnumite edastamine:\n"
1152
1153-#: openbox/openbox.c:540
1154+#: openbox/openbox.c:555
1155 msgid " --reconfigure Reload Openbox's configuration\n"
1156 msgstr " --reconfigure Openboxi konfiguratsioon uuesti laadimine\n"
1157
1158-#: openbox/openbox.c:541
1159+#: openbox/openbox.c:556
1160 msgid " --restart Restart Openbox\n"
1161 msgstr " --restart Openboxi taaskäivitamine\n"
1162
1163-#: openbox/openbox.c:542
1164+#: openbox/openbox.c:557
1165 msgid " --exit Exit Openbox\n"
1166-msgstr ""
1167+msgstr " --exit Välju Openbox-st\n"
1168
1169-#: openbox/openbox.c:543
1170+#: openbox/openbox.c:558
1171 msgid ""
1172 "\n"
1173 "Debugging options:\n"
1174@@ -351,23 +351,23 @@ msgstr ""
1175 "\n"
1176 "Silumise seaded:\n"
1177
1178-#: openbox/openbox.c:544
1179+#: openbox/openbox.c:559
1180 msgid " --sync Run in synchronous mode\n"
1181 msgstr " --sync Sünkroonselt jooksutamine\n"
1182
1183-#: openbox/openbox.c:545
1184+#: openbox/openbox.c:560
1185 msgid " --debug Display debugging output\n"
1186 msgstr " --debug Silumisväljundi kuvamine\n"
1187
1188-#: openbox/openbox.c:546
1189+#: openbox/openbox.c:561
1190 msgid " --debug-focus Display debugging output for focus handling\n"
1191 msgstr " --debug-focus Fookusekäsitluse siluriväljundi kuvamine\n"
1192
1193-#: openbox/openbox.c:547
1194+#: openbox/openbox.c:562
1195 msgid " --debug-xinerama Split the display into fake xinerama screens\n"
1196 msgstr " --debug-xinerama Ekraani võlts-Xinerama ekraanideks jagamine\n"
1197
1198-#: openbox/openbox.c:548
1199+#: openbox/openbox.c:563
1200 #, c-format
1201 msgid ""
1202 "\n"
1203@@ -376,26 +376,26 @@ msgstr ""
1204 "\n"
1205 "Palun teata vigadest siia %s\n"
1206
1207-#: openbox/openbox.c:617
1208+#: openbox/openbox.c:645
1209 msgid "--config-file requires an argument\n"
1210-msgstr ""
1211+msgstr "--config-file nõuab argumenti\n"
1212
1213-#: openbox/openbox.c:660
1214+#: openbox/openbox.c:688
1215 #, c-format
1216 msgid "Invalid command line argument \"%s\"\n"
1217 msgstr "Vigane käsurea argument \"%s\"\n"
1218
1219-#: openbox/screen.c:102 openbox/screen.c:190
1220+#: openbox/screen.c:103 openbox/screen.c:191
1221 #, c-format
1222 msgid "A window manager is already running on screen %d"
1223 msgstr "Ekraanil %d juba jookseb aknahaldur"
1224
1225-#: openbox/screen.c:124
1226+#: openbox/screen.c:125
1227 #, c-format
1228 msgid "Could not acquire window manager selection on screen %d"
1229 msgstr "Ei suuda hankida aknahaldurite loetelu ekraanil %d"
1230
1231-#: openbox/screen.c:145
1232+#: openbox/screen.c:146
1233 #, c-format
1234 msgid "The WM on screen %d is not exiting"
1235 msgstr "Aknahaldur ekraanil %d ei sulgu"
1236@@ -404,7 +404,7 @@ msgstr "Aknahaldur ekraanil %d ei sulgu"
1237 #. arguments, you can use %1$d for the first one and %2$d for the
1238 #. second one. For example,
1239 #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..."
1240-#: openbox/screen.c:412
1241+#: openbox/screen.c:421
1242 #, c-format
1243 msgid ""
1244 "Openbox is configured for %d desktop, but the current session has %d. "
1245@@ -413,31 +413,35 @@ msgid_plural ""
1246 "Openbox is configured for %d desktops, but the current session has %d. "
1247 "Overriding the Openbox configuration."
1248 msgstr[0] ""
1249+"Openbox on seadistatud %d töölauale, aga aktiivsel seansil on %d. Tühistan "
1250+"Openboxi seadistuse."
1251 msgstr[1] ""
1252+"Openbox on seadistatud %d töölauale, aga aktiivsel seansil on %d. Tühistan "
1253+"Openboxi seadistuse."
1254
1255-#: openbox/screen.c:1180
1256+#: openbox/screen.c:1203
1257 #, c-format
1258 msgid "desktop %i"
1259 msgstr "töölaud %i"
1260
1261-#: openbox/session.c:104
1262+#: openbox/session.c:105
1263 #, c-format
1264 msgid "Unable to make directory \"%s\": %s"
1265 msgstr "Kausta \"%s\" tegemine ebaõnnestus: %s"
1266
1267-#: openbox/session.c:466
1268+#: openbox/session.c:472
1269 #, c-format
1270 msgid "Unable to save the session to \"%s\": %s"
1271 msgstr "Seansi \"%s\" salvestamine ebaõnnestus: %s"
1272
1273-#: openbox/session.c:605
1274+#: openbox/session.c:611
1275 #, c-format
1276 msgid "Error while saving the session to \"%s\": %s"
1277 msgstr "Seansi \"%s\" salvestamisel ilmnes viga: %s"
1278
1279-#: openbox/session.c:842
1280+#: openbox/session.c:848
1281 msgid "Not connected to a session manager"
1282-msgstr ""
1283+msgstr "Pole ühendatud seansihalduriga"
1284
1285 #: openbox/startupnotify.c:243
1286 #, c-format
1287@@ -471,7 +475,14 @@ msgstr "X-i viga: %s"
1288
1289 #: openbox/prompt.c:200
1290 msgid "OK"
1291-msgstr ""
1292+msgstr "Sobib"
1293+
1294+#~ msgid ""
1295+#~ "The SessionLogout action is not available since Openbox was built without "
1296+#~ "session management support"
1297+#~ msgstr ""
1298+#~ "SessionLogout tegevust pole saadaval, kuna Openbox on kompileeritud "
1299+#~ "seansi haldamise toeta"
1300
1301 #~ msgid "Failed to execute \"%s\": %s"
1302 #~ msgstr "\"%s\" käivitamine ebaõnnestus: %s"
1303diff --git a/po/fi.po b/po/fi.po
1304index 0c5b344..157e13b 100644
1305--- a/po/fi.po
1306+++ b/po/fi.po
1307@@ -8,15 +8,16 @@
1308 #
1309 msgid ""
1310 msgstr ""
1311-"Project-Id-Version: Openbox 3.4.7\n"
1312+"Project-Id-Version: Openbox 3.4.11\n"
1313 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
1314-"POT-Creation-Date: 2008-11-15 22:28+0100\n"
1315-"PO-Revision-Date: 2008-03-17 21:26+0100\n"
1316+"POT-Creation-Date: 2010-03-11 14:26+0100\n"
1317+"PO-Revision-Date: 2010-03-13 21:56+0100\n"
1318 "Last-Translator: Lauri Hakko <aperculum@gmail.com>\n"
1319 "Language-Team: None\n"
1320 "MIME-Version: 1.0\n"
1321 "Content-Type: text/plain; charset=UTF-8\n"
1322 "Content-Transfer-Encoding: 8bit\n"
1323+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
1324
1325 #: openbox/actions.c:149
1326 #, c-format
1327@@ -40,54 +41,43 @@ msgstr "Suorita"
1328 msgid "Failed to convert the path \"%s\" from utf8"
1329 msgstr "Polun \"%s\" muuntaminen utf8:sta epäonnistui"
1330
1331-#: openbox/actions/exit.c:52 openbox/actions/session.c:64
1332-#: openbox/client.c:3465
1333+#: openbox/actions/exit.c:62 openbox/client.c:3506
1334 msgid "Cancel"
1335 msgstr "Peruuta"
1336
1337-#: openbox/actions/exit.c:53
1338+#: openbox/actions/exit.c:63
1339 msgid "Exit"
1340 msgstr "Sulje"
1341
1342-#: openbox/actions/exit.c:56
1343+#: openbox/actions/exit.c:67
1344+msgid "Are you sure you want to log out?"
1345+msgstr "Haluatko varmasti kirjautua ulos?"
1346+
1347+#: openbox/actions/exit.c:68
1348+msgid "Log Out"
1349+msgstr "Kirjaudu ulos"
1350+
1351+#: openbox/actions/exit.c:71
1352 msgid "Are you sure you want to exit Openbox?"
1353 msgstr "Haluatko varmasti sulkea Openboxin"
1354
1355-#: openbox/actions/exit.c:57
1356+#: openbox/actions/exit.c:72
1357 msgid "Exit Openbox"
1358 msgstr "Sulje Openbox"
1359
1360-#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the
1361-#. name of the action you write in rc.xml
1362-#: openbox/actions/session.c:43
1363-msgid ""
1364-"The SessionLogout action is not available since Openbox was built without "
1365-"session management support"
1366-msgstr ""
1367-"SessionLogout tapahtuma ei ole suoritettavissa, koska Openbox käännettiin "
1368-"ilman istunnon hallinnan tukea"
1369-
1370-#: openbox/actions/session.c:65 openbox/actions/session.c:70
1371-msgid "Log Out"
1372-msgstr "Kirjaudu ulos"
1373-
1374-#: openbox/actions/session.c:69
1375-msgid "Are you sure you want to log out?"
1376-msgstr "Haluatko varmasti kirjautua ulos?"
1377-
1378-#: openbox/client.c:2012
1379+#: openbox/client.c:2024
1380 msgid "Unnamed Window"
1381 msgstr "Nimetön ikkuna"
1382
1383-#: openbox/client.c:2026 openbox/client.c:2058
1384+#: openbox/client.c:2038 openbox/client.c:2070
1385 msgid "Killing..."
1386 msgstr "Tapetaan..."
1387
1388-#: openbox/client.c:2028 openbox/client.c:2060
1389+#: openbox/client.c:2040 openbox/client.c:2072
1390 msgid "Not Responding"
1391 msgstr "Ei vastaa"
1392
1393-#: openbox/client.c:3454
1394+#: openbox/client.c:3495
1395 #, c-format
1396 msgid ""
1397 "The window \"%s\" does not seem to be responding. Do you want to force it "
1398@@ -96,11 +86,11 @@ msgstr ""
1399 "Ikkuna \"%s\" ei näytä vastaavan. Haluatko sulkea sen lähettämällä sille "
1400 "singaalin %s?"
1401
1402-#: openbox/client.c:3456
1403+#: openbox/client.c:3497
1404 msgid "End Process"
1405 msgstr "Lopeta prosessi"
1406
1407-#: openbox/client.c:3460
1408+#: openbox/client.c:3501
1409 #, c-format
1410 msgid ""
1411 "The window \"%s\" does not seem to be responding. Do you want to disconnect "
1412@@ -109,7 +99,7 @@ msgstr ""
1413 "Ikkuna \"%s\" ei näytä vastaavan. Haluatko katkaista sen yhteyden X-"
1414 "palvelimeen?"
1415
1416-#: openbox/client.c:3462
1417+#: openbox/client.c:3503
1418 msgid "Disconnect"
1419 msgstr "Katkaise yhteys"
1420
1421@@ -197,7 +187,7 @@ msgstr "(Epä)_reunusta"
1422 msgid "_Close"
1423 msgstr "_Sulje"
1424
1425-#: openbox/config.c:781
1426+#: openbox/config.c:798
1427 #, c-format
1428 msgid "Invalid button \"%s\" specified in config file"
1429 msgstr "Asetustiedostossa määritelty painike \"%s\" on virheellinen"
1430@@ -226,7 +216,7 @@ msgstr "Virheellinen tulos putkivalikosta \"%s\""
1431 msgid "Attempted to access menu \"%s\" but it does not exist"
1432 msgstr "Valikon \"%s\" lukemista yritettiin, mutta sitä ei ole olemassa"
1433
1434-#: openbox/menu.c:367 openbox/menu.c:368
1435+#: openbox/menu.c:370 openbox/menu.c:371
1436 msgid "More..."
1437 msgstr "Lisää..."
1438
1439@@ -261,17 +251,17 @@ msgstr "X-palvelin ei tue maa-asetusta."
1440 msgid "Cannot set locale modifiers for the X server."
1441 msgstr "Maa-asetusmuuttujia ei voitu tehdä X-palvelimelle."
1442
1443-#: openbox/openbox.c:263
1444+#: openbox/openbox.c:265
1445 msgid "Unable to find a valid config file, using some simple defaults"
1446 msgstr ""
1447 "Kelvollista asetustiedostoa ei löytynyt, käytetään yksinkertaisia "
1448 "oletusarvoja"
1449
1450-#: openbox/openbox.c:297
1451+#: openbox/openbox.c:299
1452 msgid "Unable to load a theme."
1453 msgstr "Teeman lataaminen epäonnistui."
1454
1455-#: openbox/openbox.c:377
1456+#: openbox/openbox.c:379
1457 #, c-format
1458 msgid ""
1459 "One or more XML syntax errors were found while parsing the Openbox "
1460@@ -282,29 +272,29 @@ msgstr ""
1461 "stdout saadaksesi lisätietoja. Viimeisin virhe oli tiedostossa \"%s\" "
1462 "rivillä %d: %s"
1463
1464-#: openbox/openbox.c:379
1465+#: openbox/openbox.c:381
1466 msgid "Openbox Syntax Error"
1467 msgstr "Openbox syntaksivirhe"
1468
1469-#: openbox/openbox.c:379
1470+#: openbox/openbox.c:381
1471 msgid "Close"
1472 msgstr "Sulje"
1473
1474-#: openbox/openbox.c:448
1475+#: openbox/openbox.c:463
1476 #, c-format
1477 msgid "Restart failed to execute new executable \"%s\": %s"
1478 msgstr ""
1479 "Uudelleenkäynnistys ei onnistunut käynnistämään uutta ohjelmaa \"%s\": %s"
1480
1481-#: openbox/openbox.c:518 openbox/openbox.c:520
1482+#: openbox/openbox.c:533 openbox/openbox.c:535
1483 msgid "Copyright (c)"
1484 msgstr "Tekijänoikeudet (c)"
1485
1486-#: openbox/openbox.c:529
1487+#: openbox/openbox.c:544
1488 msgid "Syntax: openbox [options]\n"
1489 msgstr "Syntaksi: openbox [valitsin]\n"
1490
1491-#: openbox/openbox.c:530
1492+#: openbox/openbox.c:545
1493 msgid ""
1494 "\n"
1495 "Options:\n"
1496@@ -312,30 +302,30 @@ msgstr ""
1497 "\n"
1498 "Käyttö:\n"
1499
1500-#: openbox/openbox.c:531
1501+#: openbox/openbox.c:546
1502 msgid " --help Display this help and exit\n"
1503 msgstr " --help Näytä tämä ohje ja poistu\n"
1504
1505-#: openbox/openbox.c:532
1506+#: openbox/openbox.c:547
1507 msgid " --version Display the version and exit\n"
1508 msgstr " --version Näytä version tiedot ja poistu\n"
1509
1510-#: openbox/openbox.c:533
1511+#: openbox/openbox.c:548
1512 msgid " --replace Replace the currently running window manager\n"
1513 msgstr " --replace Korvaa käynnissä oleva ikkunointiohjelma\n"
1514
1515 #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..."
1516 #. aligned still, if you have to, make a new line with \n and 22 spaces. It's
1517 #. fine to leave it as FILE though.
1518-#: openbox/openbox.c:537
1519+#: openbox/openbox.c:552
1520 msgid " --config-file FILE Specify the path to the config file to use\n"
1521 msgstr " --config-file FILE Määritä käytettävän asetustiedoston polku\n"
1522
1523-#: openbox/openbox.c:538
1524+#: openbox/openbox.c:553
1525 msgid " --sm-disable Disable connection to the session manager\n"
1526 msgstr " --sm-disable Estä yhteys istuntojen hallintaan\n"
1527
1528-#: openbox/openbox.c:539
1529+#: openbox/openbox.c:554
1530 msgid ""
1531 "\n"
1532 "Passing messages to a running Openbox instance:\n"
1533@@ -343,19 +333,19 @@ msgstr ""
1534 "\n"
1535 "Komentojen antaminen käynnissä olevalle Openboxille:\n"
1536
1537-#: openbox/openbox.c:540
1538+#: openbox/openbox.c:555
1539 msgid " --reconfigure Reload Openbox's configuration\n"
1540 msgstr " --reconfigure Lataa Openboxin asetustiedosto uudelleen\n"
1541
1542-#: openbox/openbox.c:541
1543+#: openbox/openbox.c:556
1544 msgid " --restart Restart Openbox\n"
1545 msgstr " --restart Käynnistä Openbox uudelleen\n"
1546
1547-#: openbox/openbox.c:542
1548+#: openbox/openbox.c:557
1549 msgid " --exit Exit Openbox\n"
1550 msgstr " --exit Sulje Openbox\n"
1551
1552-#: openbox/openbox.c:543
1553+#: openbox/openbox.c:558
1554 msgid ""
1555 "\n"
1556 "Debugging options:\n"
1557@@ -363,23 +353,23 @@ msgstr ""
1558 "\n"
1559 "Vianjäljityksen asetukset:\n"
1560
1561-#: openbox/openbox.c:544
1562+#: openbox/openbox.c:559
1563 msgid " --sync Run in synchronous mode\n"
1564 msgstr " --sync Aja synkronointi-tilassa\n"
1565
1566-#: openbox/openbox.c:545
1567+#: openbox/openbox.c:560
1568 msgid " --debug Display debugging output\n"
1569 msgstr " --debug Näytä vianjäljitystuloste\n"
1570
1571-#: openbox/openbox.c:546
1572+#: openbox/openbox.c:561
1573 msgid " --debug-focus Display debugging output for focus handling\n"
1574 msgstr " --debug-focus Näytä vianjäljitystuloste ikkunavalitsimelle\n"
1575
1576-#: openbox/openbox.c:547
1577+#: openbox/openbox.c:562
1578 msgid " --debug-xinerama Split the display into fake xinerama screens\n"
1579 msgstr " --debug-xinerama Jaa näyttö kahteen vale-xinerama-ruutuun\n"
1580
1581-#: openbox/openbox.c:548
1582+#: openbox/openbox.c:563
1583 #, c-format
1584 msgid ""
1585 "\n"
1586@@ -388,26 +378,26 @@ msgstr ""
1587 "\n"
1588 "Ilmoita virheistä: %s\n"
1589
1590-#: openbox/openbox.c:617
1591+#: openbox/openbox.c:645
1592 msgid "--config-file requires an argument\n"
1593 msgstr "--config-file tarvitsee argumentin\n"
1594
1595-#: openbox/openbox.c:660
1596+#: openbox/openbox.c:688
1597 #, c-format
1598 msgid "Invalid command line argument \"%s\"\n"
1599 msgstr "Virheellinen valitsin \"%s\"\n"
1600
1601-#: openbox/screen.c:102 openbox/screen.c:190
1602+#: openbox/screen.c:103 openbox/screen.c:191
1603 #, c-format
1604 msgid "A window manager is already running on screen %d"
1605 msgstr "Ikkunointiohjelma on jo käynnissä näytöllä %d"
1606
1607-#: openbox/screen.c:124
1608+#: openbox/screen.c:125
1609 #, c-format
1610 msgid "Could not acquire window manager selection on screen %d"
1611 msgstr "Ikkunointiohjelman valinta ruudulla %d ei onnistunut"
1612
1613-#: openbox/screen.c:145
1614+#: openbox/screen.c:146
1615 #, c-format
1616 msgid "The WM on screen %d is not exiting"
1617 msgstr "Ikkunointiohjelma ruudulla %d ei sulkeudu"
1618@@ -416,8 +406,8 @@ msgstr "Ikkunointiohjelma ruudulla %d ei sulkeudu"
1619 #. arguments, you can use %1$d for the first one and %2$d for the
1620 #. second one. For example,
1621 #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..."
1622-#: openbox/screen.c:412
1623-#, fuzzy, c-format
1624+#: openbox/screen.c:421
1625+#, c-format
1626 msgid ""
1627 "Openbox is configured for %d desktop, but the current session has %d. "
1628 "Overriding the Openbox configuration."
1629@@ -431,27 +421,27 @@ msgstr[1] ""
1630 "Openbox on asetettu käyttämään %d työtilaa, mutta nykyisessä istunnossa "
1631 "työtiloja on %d. Ohitetaan Openboxin asetus."
1632
1633-#: openbox/screen.c:1180
1634+#: openbox/screen.c:1203
1635 #, c-format
1636 msgid "desktop %i"
1637 msgstr "työtila %i"
1638
1639-#: openbox/session.c:104
1640+#: openbox/session.c:105
1641 #, c-format
1642 msgid "Unable to make directory \"%s\": %s"
1643 msgstr "Hakemiston \"%s\" luonti epäonnistui: %s"
1644
1645-#: openbox/session.c:466
1646+#: openbox/session.c:472
1647 #, c-format
1648 msgid "Unable to save the session to \"%s\": %s"
1649 msgstr "Istuntoa ei voitu tallentaa hakemistoon \"%s\": %s"
1650
1651-#: openbox/session.c:605
1652+#: openbox/session.c:611
1653 #, c-format
1654 msgid "Error while saving the session to \"%s\": %s"
1655 msgstr "Virhe tallennettaessa istuntoa hakemistoon \"%s\": %s"
1656
1657-#: openbox/session.c:842
1658+#: openbox/session.c:848
1659 msgid "Not connected to a session manager"
1660 msgstr "Ei yhteyttä istunnon hallintaan"
1661
1662@@ -489,5 +479,12 @@ msgstr "X-virhe: %s"
1663 msgid "OK"
1664 msgstr "OK"
1665
1666+#~ msgid ""
1667+#~ "The SessionLogout action is not available since Openbox was built without "
1668+#~ "session management support"
1669+#~ msgstr ""
1670+#~ "SessionLogout tapahtuma ei ole suoritettavissa, koska Openbox käännettiin "
1671+#~ "ilman istunnon hallinnan tukea"
1672+
1673 #~ msgid "Failed to execute \"%s\": %s"
1674 #~ msgstr "Ohjelman \"%s\" suorittaminen epäonnistui: %s"
1675diff --git a/po/pl.po b/po/pl.po
1676index b0f5d52..00546d0 100644
1677--- a/po/pl.po
1678+++ b/po/pl.po
1679@@ -4,14 +4,15 @@
1680 # Madej <madej@afn.no-ip.org>, 2004.
1681 # Paweł Rusinek <p.rusinek@gmail.com>, 2007.
1682 # Piotr Drąg <raven@pmail.pl>, 2007.
1683+# Jakub Łojewski <lojewski@ovi.com>, 2010.
1684 #
1685 msgid ""
1686 msgstr ""
1687 "Project-Id-Version: Openbox 3.4.3\n"
1688 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
1689-"POT-Creation-Date: 2008-11-15 22:28+0100\n"
1690-"PO-Revision-Date: 2007-07-14 00:43+0200\n"
1691-"Last-Translator: Piotr Drąg <raven@pmail.pl>\n"
1692+"POT-Creation-Date: 2010-03-11 14:26+0100\n"
1693+"PO-Revision-Date: 2010-03-11 13:55+0100\n"
1694+"Last-Translator: Jakub Łojewski <lojewski@ovi.com>\n"
1695 "Language-Team: Polish <pl@li.org>\n"
1696 "MIME-Version: 1.0\n"
1697 "Content-Type: text/plain; charset=UTF-8\n"
1698@@ -20,91 +21,84 @@ msgstr ""
1699 #: openbox/actions.c:149
1700 #, c-format
1701 msgid "Invalid action \"%s\" requested. No such action exists."
1702-msgstr ""
1703+msgstr "Wywołana akcja \"%s\" nie istnieje."
1704
1705 #: openbox/actions/execute.c:128
1706 msgid "No"
1707-msgstr ""
1708+msgstr "Nie"
1709
1710 #: openbox/actions/execute.c:129
1711 msgid "Yes"
1712-msgstr ""
1713+msgstr "Tak"
1714
1715 #: openbox/actions/execute.c:133
1716 msgid "Execute"
1717-msgstr ""
1718+msgstr "Wykonaj"
1719
1720 #: openbox/actions/execute.c:142
1721 #, c-format
1722 msgid "Failed to convert the path \"%s\" from utf8"
1723 msgstr "Nie można przekonwertować ścieżki \"%s\" z UTF-8"
1724
1725-#: openbox/actions/exit.c:52 openbox/actions/session.c:64
1726-#: openbox/client.c:3465
1727+#: openbox/actions/exit.c:62 openbox/client.c:3506
1728 msgid "Cancel"
1729-msgstr ""
1730+msgstr "Anuluj"
1731
1732-#: openbox/actions/exit.c:53
1733+#: openbox/actions/exit.c:63
1734 msgid "Exit"
1735-msgstr ""
1736-
1737-#: openbox/actions/exit.c:56
1738-msgid "Are you sure you want to exit Openbox?"
1739-msgstr ""
1740-
1741-#: openbox/actions/exit.c:57
1742-msgid "Exit Openbox"
1743-msgstr ""
1744+msgstr "Wyjście"
1745
1746-#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the
1747-#. name of the action you write in rc.xml
1748-#: openbox/actions/session.c:43
1749-msgid ""
1750-"The SessionLogout action is not available since Openbox was built without "
1751-"session management support"
1752-msgstr ""
1753+#: openbox/actions/exit.c:67
1754+msgid "Are you sure you want to log out?"
1755+msgstr "Czy na pewno chcesz się wylogować?"
1756
1757-#: openbox/actions/session.c:65 openbox/actions/session.c:70
1758+#: openbox/actions/exit.c:68
1759 msgid "Log Out"
1760-msgstr ""
1761+msgstr "Wyloguj"
1762
1763-#: openbox/actions/session.c:69
1764-msgid "Are you sure you want to log out?"
1765-msgstr ""
1766+#: openbox/actions/exit.c:71
1767+msgid "Are you sure you want to exit Openbox?"
1768+msgstr "Czy na pewno chcesz opuścić Openboksa?"
1769+
1770+#: openbox/actions/exit.c:72
1771+msgid "Exit Openbox"
1772+msgstr "Opuść Openbox"
1773
1774-#: openbox/client.c:2012
1775+#: openbox/client.c:2024
1776 msgid "Unnamed Window"
1777-msgstr ""
1778+msgstr "Okno bez nazwy"
1779
1780-#: openbox/client.c:2026 openbox/client.c:2058
1781+#: openbox/client.c:2038 openbox/client.c:2070
1782 msgid "Killing..."
1783-msgstr ""
1784+msgstr "Kończenie..."
1785
1786-#: openbox/client.c:2028 openbox/client.c:2060
1787+#: openbox/client.c:2040 openbox/client.c:2072
1788 msgid "Not Responding"
1789-msgstr ""
1790+msgstr "Nie odpowiada"
1791
1792-#: openbox/client.c:3454
1793+#: openbox/client.c:3495
1794 #, c-format
1795 msgid ""
1796 "The window \"%s\" does not seem to be responding. Do you want to force it "
1797 "to exit by sending the %s signal?"
1798 msgstr ""
1799+"Okno \"%s\" nie odpowiada. Czy wymusić zakończenie poprzez wysłanie sygnału %"
1800+"s?"
1801
1802-#: openbox/client.c:3456
1803+#: openbox/client.c:3497
1804 msgid "End Process"
1805-msgstr ""
1806+msgstr "Zakończ proces"
1807
1808-#: openbox/client.c:3460
1809+#: openbox/client.c:3501
1810 #, c-format
1811 msgid ""
1812 "The window \"%s\" does not seem to be responding. Do you want to disconnect "
1813 "it from the X server?"
1814-msgstr ""
1815+msgstr "Okno \"%s\" nie odpowiada. Odłączyć je od serwera X?"
1816
1817-#: openbox/client.c:3462
1818+#: openbox/client.c:3503
1819 msgid "Disconnect"
1820-msgstr ""
1821+msgstr "Odłącz"
1822
1823 #: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91
1824 msgid "Go there..."
1825@@ -190,7 +184,7 @@ msgstr "Wyświetl/ukryj _dekoracje"
1826 msgid "_Close"
1827 msgstr "Z_amknij"
1828
1829-#: openbox/config.c:781
1830+#: openbox/config.c:798
1831 #, c-format
1832 msgid "Invalid button \"%s\" specified in config file"
1833 msgstr "Nieprawidłowy klawisz \"%s\" określony w pliku konfiguracyjnym"
1834@@ -219,7 +213,7 @@ msgstr "Nieprawidłowe wyjście z pipe-menu \"%s\""
1835 msgid "Attempted to access menu \"%s\" but it does not exist"
1836 msgstr "Spróbowano uzyskać dostęp do menu \"%s\", ale ono nie istnieje"
1837
1838-#: openbox/menu.c:367 openbox/menu.c:368
1839+#: openbox/menu.c:370 openbox/menu.c:371
1840 msgid "More..."
1841 msgstr "Więcej..."
1842
1843@@ -254,48 +248,52 @@ msgstr "Serwer X nie obsługuje ustawień lokalnych."
1844 msgid "Cannot set locale modifiers for the X server."
1845 msgstr "Nie można ustawić modyfikatorów lokalnych dla serwera X."
1846
1847-#: openbox/openbox.c:263
1848+#: openbox/openbox.c:265
1849 msgid "Unable to find a valid config file, using some simple defaults"
1850 msgstr ""
1851 "Nie można znaleźć prawidłowego pliku konfiguracyjnego, używanie "
1852 "domyślnychwartości"
1853
1854-#: openbox/openbox.c:297
1855+#: openbox/openbox.c:299
1856 msgid "Unable to load a theme."
1857 msgstr "Nie można wczytać motywu."
1858
1859-#: openbox/openbox.c:377
1860+#: openbox/openbox.c:379
1861 #, c-format
1862 msgid ""
1863 "One or more XML syntax errors were found while parsing the Openbox "
1864 "configuration files. See stdout for more information. The last error seen "
1865 "was in file \"%s\" line %d, with message: %s"
1866 msgstr ""
1867+"Jeden lub więcej błędów składniowych XML zostało znalezionych podczas "
1868+"sprawdzania plików konfiguracyjnych. Zobacz stdout aby uzyskać więcej "
1869+"informacji. Ostatnio błąd znaleziono w pliku \"%s\" linia %d, z wiadomością: "
1870+"%s"
1871
1872-#: openbox/openbox.c:379
1873+#: openbox/openbox.c:381
1874 msgid "Openbox Syntax Error"
1875-msgstr ""
1876+msgstr "Błąd składniowy Openboksa"
1877
1878-#: openbox/openbox.c:379
1879+#: openbox/openbox.c:381
1880 msgid "Close"
1881 msgstr "Zamknij"
1882
1883-#: openbox/openbox.c:448
1884+#: openbox/openbox.c:463
1885 #, c-format
1886 msgid "Restart failed to execute new executable \"%s\": %s"
1887 msgstr ""
1888 "Wykonanie nowego pliku wykonywalnego \"%s\" podczas ponownego "
1889 "uruchomienianie powiodło się: %s"
1890
1891-#: openbox/openbox.c:518 openbox/openbox.c:520
1892+#: openbox/openbox.c:533 openbox/openbox.c:535
1893 msgid "Copyright (c)"
1894 msgstr "Copyright (c)"
1895
1896-#: openbox/openbox.c:529
1897+#: openbox/openbox.c:544
1898 msgid "Syntax: openbox [options]\n"
1899 msgstr "Składnia: openbox [opcje]\n"
1900
1901-#: openbox/openbox.c:530
1902+#: openbox/openbox.c:545
1903 msgid ""
1904 "\n"
1905 "Options:\n"
1906@@ -303,30 +301,30 @@ msgstr ""
1907 "\n"
1908 "Opcje:\n"
1909
1910-#: openbox/openbox.c:531
1911+#: openbox/openbox.c:546
1912 msgid " --help Display this help and exit\n"
1913 msgstr " --help Wyświetla tę pomoc i kończy\n"
1914
1915-#: openbox/openbox.c:532
1916+#: openbox/openbox.c:547
1917 msgid " --version Display the version and exit\n"
1918 msgstr " --version Wyświetla wersję i kończy\n"
1919
1920-#: openbox/openbox.c:533
1921+#: openbox/openbox.c:548
1922 msgid " --replace Replace the currently running window manager\n"
1923 msgstr " --replace Zastępuje aktualnie działający menedżer okien\n"
1924
1925 #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..."
1926 #. aligned still, if you have to, make a new line with \n and 22 spaces. It's
1927 #. fine to leave it as FILE though.
1928-#: openbox/openbox.c:537
1929+#: openbox/openbox.c:552
1930 msgid " --config-file FILE Specify the path to the config file to use\n"
1931-msgstr ""
1932+msgstr " --config-file FILE Podaj ścieżkę do pliku konfiguracji\n"
1933
1934-#: openbox/openbox.c:538
1935+#: openbox/openbox.c:553
1936 msgid " --sm-disable Disable connection to the session manager\n"
1937 msgstr " --sm-disable Nie tworzy połączenia z menedżerem sesji\n"
1938
1939-#: openbox/openbox.c:539
1940+#: openbox/openbox.c:554
1941 msgid ""
1942 "\n"
1943 "Passing messages to a running Openbox instance:\n"
1944@@ -334,19 +332,19 @@ msgstr ""
1945 "\n"
1946 "Przekazywanie komunikatów do działającej instancji Openboksa:\n"
1947
1948-#: openbox/openbox.c:540
1949+#: openbox/openbox.c:555
1950 msgid " --reconfigure Reload Openbox's configuration\n"
1951 msgstr " --reconfigure Ponownie wczytuje pliki konfiguracyjne\n"
1952
1953-#: openbox/openbox.c:541
1954+#: openbox/openbox.c:556
1955 msgid " --restart Restart Openbox\n"
1956 msgstr " --restart Ponownie uruchamia Openboksa\n"
1957
1958-#: openbox/openbox.c:542
1959+#: openbox/openbox.c:557
1960 msgid " --exit Exit Openbox\n"
1961-msgstr ""
1962+msgstr " --exit Opuść Openbox\n"
1963
1964-#: openbox/openbox.c:543
1965+#: openbox/openbox.c:558
1966 msgid ""
1967 "\n"
1968 "Debugging options:\n"
1969@@ -354,24 +352,24 @@ msgstr ""
1970 "\n"
1971 "Opcje debugowania:\n"
1972
1973-#: openbox/openbox.c:544
1974+#: openbox/openbox.c:559
1975 msgid " --sync Run in synchronous mode\n"
1976 msgstr " --sync Uruchamia w trybie synchronicznym\n"
1977
1978-#: openbox/openbox.c:545
1979+#: openbox/openbox.c:560
1980 msgid " --debug Display debugging output\n"
1981 msgstr " --debug Wyświetla informacje o debugowaniu\n"
1982
1983-#: openbox/openbox.c:546
1984+#: openbox/openbox.c:561
1985 msgid " --debug-focus Display debugging output for focus handling\n"
1986 msgstr ""
1987 " --debug-focus Wyświetla wyjście debugowania obsługi aktywacji\n"
1988
1989-#: openbox/openbox.c:547
1990+#: openbox/openbox.c:562
1991 msgid " --debug-xinerama Split the display into fake xinerama screens\n"
1992 msgstr " --debug-xinerama Dzieli ekran na sztuczne ekrany xineramy\n"
1993
1994-#: openbox/openbox.c:548
1995+#: openbox/openbox.c:563
1996 #, c-format
1997 msgid ""
1998 "\n"
1999@@ -380,26 +378,26 @@ msgstr ""
2000 "\n"
2001 "Proszę zgłaszać błędy (w języku angielskim) pod adresem %s\n"
2002
2003-#: openbox/openbox.c:617
2004+#: openbox/openbox.c:645
2005 msgid "--config-file requires an argument\n"
2006-msgstr ""
2007+msgstr "--config-file wymaga argumentu\n"
2008
2009-#: openbox/openbox.c:660
2010+#: openbox/openbox.c:688
2011 #, c-format
2012 msgid "Invalid command line argument \"%s\"\n"
2013 msgstr "Nieprawidłowy argument wiersza poleceń \"%s\"\n"
2014
2015-#: openbox/screen.c:102 openbox/screen.c:190
2016+#: openbox/screen.c:103 openbox/screen.c:191
2017 #, c-format
2018 msgid "A window manager is already running on screen %d"
2019 msgstr "Menedżer okien jest już uruchomiony na ekranie %d"
2020
2021-#: openbox/screen.c:124
2022+#: openbox/screen.c:125
2023 #, c-format
2024 msgid "Could not acquire window manager selection on screen %d"
2025 msgstr "Nie można uzyskać wyboru menedżera okien na ekranie %d"
2026
2027-#: openbox/screen.c:145
2028+#: openbox/screen.c:146
2029 #, c-format
2030 msgid "The WM on screen %d is not exiting"
2031 msgstr "Menedżer okien na ekranie %d nie kończy działania"
2032@@ -408,7 +406,7 @@ msgstr "Menedżer okien na ekranie %d nie kończy działania"
2033 #. arguments, you can use %1$d for the first one and %2$d for the
2034 #. second one. For example,
2035 #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..."
2036-#: openbox/screen.c:412
2037+#: openbox/screen.c:421
2038 #, c-format
2039 msgid ""
2040 "Openbox is configured for %d desktop, but the current session has %d. "
2041@@ -419,29 +417,29 @@ msgid_plural ""
2042 msgstr[0] ""
2043 msgstr[1] ""
2044
2045-#: openbox/screen.c:1180
2046+#: openbox/screen.c:1203
2047 #, c-format
2048 msgid "desktop %i"
2049 msgstr "pulpit %i"
2050
2051-#: openbox/session.c:104
2052+#: openbox/session.c:105
2053 #, c-format
2054 msgid "Unable to make directory \"%s\": %s"
2055 msgstr "Nie można utworzyć katalogu \"%s\": %s"
2056
2057-#: openbox/session.c:466
2058+#: openbox/session.c:472
2059 #, c-format
2060 msgid "Unable to save the session to \"%s\": %s"
2061 msgstr "Nie można zapisać sesji do \"%s\": %s"
2062
2063-#: openbox/session.c:605
2064+#: openbox/session.c:611
2065 #, c-format
2066 msgid "Error while saving the session to \"%s\": %s"
2067 msgstr "Wystąpił błąd podczas zapisywania sesji do \"%s\": %s"
2068
2069-#: openbox/session.c:842
2070+#: openbox/session.c:848
2071 msgid "Not connected to a session manager"
2072-msgstr ""
2073+msgstr "Nie podłączono do menedżera sesji"
2074
2075 #: openbox/startupnotify.c:243
2076 #, c-format
2077@@ -476,7 +474,14 @@ msgstr "Błąd X: %s"
2078
2079 #: openbox/prompt.c:200
2080 msgid "OK"
2081-msgstr ""
2082+msgstr "OK"
2083+
2084+#~ msgid ""
2085+#~ "The SessionLogout action is not available since Openbox was built without "
2086+#~ "session management support"
2087+#~ msgstr ""
2088+#~ "SessionLogout jest niedostępne, ponieważ Openbox został stworzony bez "
2089+#~ "wsparcia dla zarządzania sesją"
2090
2091 #~ msgid "Failed to execute \"%s\": %s"
2092 #~ msgstr "Wykonanie \"%s\" nie powiodło się: %s"
2093diff --git a/po/pt.po b/po/pt.po
2094index f962756..e7504e9 100644
2095--- a/po/pt.po
2096+++ b/po/pt.po
2097@@ -1,30 +1,30 @@
2098 # Portuguese messages for openbox
2099-# Copyright (C) 2007 Mikael Magnusson
2100+# Copyright (C) 2010 Mikael Magnusson
2101 # This file is distributed under the same license as the openbox package.
2102-# Gonalo Ferreira <gonsas@gmail.com>, 2006.
2103-# althaser <althaser@gmail.com>, 2008.
2104+# Gonçalo Ferreira <gonsas@gmail.com>, 2006.
2105+# Pedro Beja <althaser@gmail.com>, 2007 2008 2010.
2106 #
2107 msgid ""
2108 msgstr ""
2109-"Project-Id-Version: Openbox 3.4.7\n"
2110+"Project-Id-Version: Openbox 3.4.11.2\n"
2111 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
2112-"POT-Creation-Date: 2008-11-15 22:28+0100\n"
2113-"PO-Revision-Date: 2008-03-16 15:46+0100\n"
2114-"Last-Translator: althaser <althaser@gmail.com>\n"
2115+"POT-Creation-Date: 2010-05-14 15:50+0200\n"
2116+"PO-Revision-Date: 2010-05-14 15:51+0100\n"
2117+"Last-Translator: Pedro Beja <althaser@gmail.com>\n"
2118 "Language-Team: None\n"
2119 "MIME-Version: 1.0\n"
2120-"Content-Type: text/plain; charset=ISO-8859-1\n"
2121+"Content-Type: text/plain; charset=UTF-8\n"
2122 "Content-Transfer-Encoding: 8bit\n"
2123 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
2124
2125 #: openbox/actions.c:149
2126 #, c-format
2127 msgid "Invalid action \"%s\" requested. No such action exists."
2128-msgstr "Pedido de aco \"%s\" invlido. No existem quaisquer aces."
2129+msgstr "Pedido de acção \"%s\" inválido. Não existem quaisquer acções."
2130
2131 #: openbox/actions/execute.c:128
2132 msgid "No"
2133-msgstr "No"
2134+msgstr "Não"
2135
2136 #: openbox/actions/execute.c:129
2137 msgid "Yes"
2138@@ -39,76 +39,64 @@ msgstr "Executar"
2139 msgid "Failed to convert the path \"%s\" from utf8"
2140 msgstr "Falha a converter o caminho \"%s\" do utf8"
2141
2142-#: openbox/actions/exit.c:52 openbox/actions/session.c:64
2143-#: openbox/client.c:3465
2144+#: openbox/actions/exit.c:62 openbox/client.c:3506
2145 msgid "Cancel"
2146 msgstr "Cancelar"
2147
2148-#: openbox/actions/exit.c:53
2149+#: openbox/actions/exit.c:63
2150 msgid "Exit"
2151 msgstr "Sair"
2152
2153-#: openbox/actions/exit.c:56
2154+#: openbox/actions/exit.c:67
2155+msgid "Are you sure you want to log out?"
2156+msgstr "Tem a certeza que pretende fazer log out?"
2157+
2158+#: openbox/actions/exit.c:68
2159+msgid "Log Out"
2160+msgstr "Log Out"
2161+
2162+#: openbox/actions/exit.c:71
2163 msgid "Are you sure you want to exit Openbox?"
2164 msgstr "Tem a certeza que pretende sair do Openbox?"
2165
2166-#: openbox/actions/exit.c:57
2167+#: openbox/actions/exit.c:72
2168 msgid "Exit Openbox"
2169 msgstr "Sair do Openbox"
2170
2171-#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the
2172-#. name of the action you write in rc.xml
2173-#: openbox/actions/session.c:43
2174-msgid ""
2175-"The SessionLogout action is not available since Openbox was built without "
2176-"session management support"
2177-msgstr ""
2178-"A aco SessoLogout no est disponvel visto que o Openbox foi construdo "
2179-"sem suporte a gesto de sesso"
2180-
2181-#: openbox/actions/session.c:65 openbox/actions/session.c:70
2182-msgid "Log Out"
2183-msgstr "Log Out"
2184-
2185-#: openbox/actions/session.c:69
2186-msgid "Are you sure you want to log out?"
2187-msgstr "Tem a certeza que pretende fazer log out?"
2188-
2189-#: openbox/client.c:2012
2190+#: openbox/client.c:2024
2191 msgid "Unnamed Window"
2192 msgstr "Janela sem nome"
2193
2194-#: openbox/client.c:2026 openbox/client.c:2058
2195+#: openbox/client.c:2038 openbox/client.c:2070
2196 msgid "Killing..."
2197 msgstr "Terminando..."
2198
2199-#: openbox/client.c:2028 openbox/client.c:2060
2200+#: openbox/client.c:2040 openbox/client.c:2072
2201 msgid "Not Responding"
2202-msgstr "No est a responder"
2203+msgstr "Não está a responder"
2204
2205-#: openbox/client.c:3454
2206+#: openbox/client.c:3495
2207 #, c-format
2208 msgid ""
2209 "The window \"%s\" does not seem to be responding. Do you want to force it "
2210 "to exit by sending the %s signal?"
2211 msgstr ""
2212-"A janela \"%s\" parece no estar a responder. Pretende for-la a sair "
2213-"enviando o sinal %s?"
2214+"A janela \"%s\" parece não estar a responder. Quer forçá-la a sair enviando "
2215+"o sinal %s?"
2216
2217-#: openbox/client.c:3456
2218+#: openbox/client.c:3497
2219 msgid "End Process"
2220 msgstr "Terminar Processo"
2221
2222-#: openbox/client.c:3460
2223+#: openbox/client.c:3501
2224 #, c-format
2225 msgid ""
2226 "The window \"%s\" does not seem to be responding. Do you want to disconnect "
2227 "it from the X server?"
2228 msgstr ""
2229-"A janela \"%s\" parece no estar a responder. Pretende deslig-la do "
2230-"servidor X?"
2231+"A janela \"%s\" parece não estar a responder. Quer desligá-la do servidor X?"
2232
2233-#: openbox/client.c:3462
2234+#: openbox/client.c:3503
2235 msgid "Disconnect"
2236 msgstr "Desligar"
2237
2238@@ -118,15 +106,15 @@ msgstr "Ir para..."
2239
2240 #: openbox/client_list_combined_menu.c:94
2241 msgid "Manage desktops"
2242-msgstr "Gerir reas de trabalho"
2243+msgstr "Gerir áreas de trabalho"
2244
2245 #: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155
2246 msgid "_Add new desktop"
2247-msgstr "_Adicionar nova rea de trabalho"
2248+msgstr "_Adicionar nova área de trabalho"
2249
2250 #: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156
2251 msgid "_Remove last desktop"
2252-msgstr "_Remover a ltima rea de trabalho"
2253+msgstr "_Remover última área de trabalho"
2254
2255 #: openbox/client_list_combined_menu.c:149
2256 msgid "Windows"
2257@@ -134,11 +122,11 @@ msgstr "Janelas"
2258
2259 #: openbox/client_list_menu.c:203
2260 msgid "Desktops"
2261-msgstr "reas de trabalho"
2262+msgstr "Áreas de trabalho"
2263
2264 #: openbox/client_menu.c:258
2265 msgid "All desktops"
2266-msgstr "Todas as reas de trabalho"
2267+msgstr "Todas as áreas de trabalho"
2268
2269 #: openbox/client_menu.c:370
2270 msgid "_Layer"
2271@@ -158,11 +146,11 @@ msgstr "Sempre no _fundo"
2272
2273 #: openbox/client_menu.c:379
2274 msgid "_Send to desktop"
2275-msgstr "Enviar para rea de _trabalho"
2276+msgstr "Enviar para área de _trabalho"
2277
2278 #: openbox/client_menu.c:383
2279 msgid "Client menu"
2280-msgstr "Menu do cliente"
2281+msgstr "Menu cliente"
2282
2283 #: openbox/client_menu.c:393
2284 msgid "R_estore"
2285@@ -196,57 +184,57 @@ msgstr "Des/_Decorar"
2286 msgid "_Close"
2287 msgstr "_Fechar"
2288
2289-#: openbox/config.c:781
2290+#: openbox/config.c:798
2291 #, c-format
2292 msgid "Invalid button \"%s\" specified in config file"
2293-msgstr "Boto invlido \"%s\" especificado no ficheiro de configurao"
2294+msgstr "Botão inválido \"%s\" especificado no ficheiro de configuração"
2295
2296 #: openbox/keyboard.c:157
2297 msgid "Conflict with key binding in config file"
2298-msgstr "Conflito com tecla de atalho no ficheiro de configurao"
2299+msgstr "Conflito com tecla de atalho no ficheiro de configuração"
2300
2301 #: openbox/menu.c:102 openbox/menu.c:110
2302 #, c-format
2303 msgid "Unable to find a valid menu file \"%s\""
2304-msgstr "Incapaz de encontrar um ficheiro de menu \"%s\" vlido"
2305+msgstr "Incapaz de encontrar um ficheiro de menu válido \"%s\""
2306
2307 #: openbox/menu.c:170
2308 #, c-format
2309 msgid "Failed to execute command for pipe-menu \"%s\": %s"
2310-msgstr "Falha no comando de execuo para o menu de processamento \"%s\": %s"
2311+msgstr "Falha a executar comando para o menu de processamento \"%s\": %s"
2312
2313 #: openbox/menu.c:184
2314 #, c-format
2315 msgid "Invalid output from pipe-menu \"%s\""
2316-msgstr "Resultado invlido do menu de processamento \"%s\""
2317+msgstr "Resultado inválido do menu de processamento \"%s\""
2318
2319 #: openbox/menu.c:197
2320 #, c-format
2321 msgid "Attempted to access menu \"%s\" but it does not exist"
2322-msgstr "Tentou aceder ao menu \"%s\" mas ele no existe"
2323+msgstr "Tentou aceder ao menu \"%s\" mas ele não existe"
2324
2325-#: openbox/menu.c:367 openbox/menu.c:368
2326+#: openbox/menu.c:370 openbox/menu.c:371
2327 msgid "More..."
2328 msgstr "Mais..."
2329
2330 #: openbox/mouse.c:373
2331 #, c-format
2332 msgid "Invalid button \"%s\" in mouse binding"
2333-msgstr "Boto invlido \"%s\" no atalho do rato"
2334+msgstr "Botão inválido \"%s\" no atalho do rato"
2335
2336 #: openbox/mouse.c:379
2337 #, c-format
2338 msgid "Invalid context \"%s\" in mouse binding"
2339-msgstr "Contexto invlido \"%s\" no atalho do rato"
2340+msgstr "Contexto inválido \"%s\" no atalho do rato"
2341
2342 #: openbox/openbox.c:133
2343 #, c-format
2344 msgid "Unable to change to home directory \"%s\": %s"
2345-msgstr "Incapaz de mudar para o directrio home \"%s\": %s"
2346+msgstr "Incapaz de mudar para o directório home \"%s\": %s"
2347
2348 #: openbox/openbox.c:152
2349 msgid "Failed to open the display from the DISPLAY environment variable."
2350-msgstr "Falha ao abrir o ecr da varivel de ambiente DISPLAY."
2351+msgstr "Falha ao abrir o ecrã da variável de ambiente DISPLAY."
2352
2353 #: openbox/openbox.c:183
2354 msgid "Failed to initialize the obrender library."
2355@@ -254,23 +242,23 @@ msgstr "Falha ao inicializar a biblioteca obrender"
2356
2357 #: openbox/openbox.c:194
2358 msgid "X server does not support locale."
2359-msgstr "O servidor X no suporta o locale."
2360+msgstr "O servidor X não suporta o locale."
2361
2362 #: openbox/openbox.c:196
2363 msgid "Cannot set locale modifiers for the X server."
2364-msgstr "No pode definir locales modificados para o servidor X."
2365+msgstr "Não é possível configurar modificadores de locale para o servidor X."
2366
2367-#: openbox/openbox.c:263
2368+#: openbox/openbox.c:265
2369 msgid "Unable to find a valid config file, using some simple defaults"
2370 msgstr ""
2371-"Incapaz de encontrar um ficheiro de configurao vlido, usando algumas "
2372-"configuraes simples de omisso"
2373+"Incapaz de encontrar um ficheiro de configuração válido, usando alguns "
2374+"valores simples de omissão"
2375
2376-#: openbox/openbox.c:297
2377+#: openbox/openbox.c:299
2378 msgid "Unable to load a theme."
2379 msgstr "Incapaz de carregar o tema."
2380
2381-#: openbox/openbox.c:377
2382+#: openbox/openbox.c:379
2383 #, c-format
2384 msgid ""
2385 "One or more XML syntax errors were found while parsing the Openbox "
2386@@ -278,111 +266,111 @@ msgid ""
2387 "was in file \"%s\" line %d, with message: %s"
2388 msgstr ""
2389 "Um ou mais erros de sintaxe do XML foram encontrados enquanto analizava os "
2390-"ficheiros de configurao do Openbox. Veja o stdout para mais informaes. "
2391-"O ltimo erro visto foi no ficheiro \"%s\" linha %d, com a mensagem: %s"
2392+"ficheiros de configuração do Openbox. Veja o stdout para mais informações. "
2393+"O último erro visto foi no ficheiro \"%s\" linha %d, com a mensagem: %s"
2394
2395-#: openbox/openbox.c:379
2396+#: openbox/openbox.c:381
2397 msgid "Openbox Syntax Error"
2398 msgstr "Erro de Sintaxe do Openbox"
2399
2400-#: openbox/openbox.c:379
2401+#: openbox/openbox.c:381
2402 msgid "Close"
2403 msgstr "Fechar"
2404
2405-#: openbox/openbox.c:448
2406+#: openbox/openbox.c:463
2407 #, c-format
2408 msgid "Restart failed to execute new executable \"%s\": %s"
2409-msgstr "Falha a reiniciar a execuo de um novo executvel \"%s\": %s"
2410+msgstr "Falha a reiniciar a execução de um novo executável \"%s\": %s"
2411
2412-#: openbox/openbox.c:518 openbox/openbox.c:520
2413+#: openbox/openbox.c:533 openbox/openbox.c:535
2414 msgid "Copyright (c)"
2415 msgstr "Direitos de autor (c)"
2416
2417-#: openbox/openbox.c:529
2418+#: openbox/openbox.c:544
2419 msgid "Syntax: openbox [options]\n"
2420-msgstr "Sintaxe: openbox [opes]\n"
2421+msgstr "Sintaxe: openbox [opções]\n"
2422
2423-#: openbox/openbox.c:530
2424+#: openbox/openbox.c:545
2425 msgid ""
2426 "\n"
2427 "Options:\n"
2428 msgstr ""
2429 "\n"
2430-"Opes:\n"
2431+"Opções:\n"
2432
2433-#: openbox/openbox.c:531
2434+#: openbox/openbox.c:546
2435 msgid " --help Display this help and exit\n"
2436 msgstr " --help Mostra esta ajuda e sai\n"
2437
2438-#: openbox/openbox.c:532
2439+#: openbox/openbox.c:547
2440 msgid " --version Display the version and exit\n"
2441-msgstr " --version Mostra a verso e sai\n"
2442+msgstr " --version Mostra a versão e sai\n"
2443
2444-#: openbox/openbox.c:533
2445+#: openbox/openbox.c:548
2446 msgid " --replace Replace the currently running window manager\n"
2447 msgstr " --replace Substitui o corrente gestor de janelas\n"
2448
2449 #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..."
2450 #. aligned still, if you have to, make a new line with \n and 22 spaces. It's
2451 #. fine to leave it as FILE though.
2452-#: openbox/openbox.c:537
2453+#: openbox/openbox.c:552
2454 msgid " --config-file FILE Specify the path to the config file to use\n"
2455 msgstr ""
2456-" --config-file FICHEIRO\n"
2457-" Especifica o caminho do ficheiro de configurao para "
2458+" --config-file ficheiro\n"
2459+" Especifica o caminho do ficheiro de configuração a "
2460 "usar\n"
2461
2462-#: openbox/openbox.c:538
2463+#: openbox/openbox.c:553
2464 msgid " --sm-disable Disable connection to the session manager\n"
2465-msgstr " --sm-disable Desactiva a ligao com o gestor de sesses\n"
2466+msgstr " --sm-disable Desactiva a ligação com o gestor de sessões\n"
2467
2468-#: openbox/openbox.c:539
2469+#: openbox/openbox.c:554
2470 msgid ""
2471 "\n"
2472 "Passing messages to a running Openbox instance:\n"
2473 msgstr ""
2474 "\n"
2475-"Passando mensagens para uma solicitao do Openbox em execuo\n"
2476+"Passando mensagens para uma instância do Openbox em execução:\n"
2477
2478-#: openbox/openbox.c:540
2479+#: openbox/openbox.c:555
2480 msgid " --reconfigure Reload Openbox's configuration\n"
2481-msgstr " --reconfigure Recarrega a configurao do Openbox\n"
2482+msgstr " --reconfigure Recarrega a configuração do Openbox\n"
2483
2484-#: openbox/openbox.c:541
2485+#: openbox/openbox.c:556
2486 msgid " --restart Restart Openbox\n"
2487 msgstr " --restart Reinicia o Openbox\n"
2488
2489-#: openbox/openbox.c:542
2490+#: openbox/openbox.c:557
2491 msgid " --exit Exit Openbox\n"
2492 msgstr " --sair Sai do Openbox\n"
2493
2494-#: openbox/openbox.c:543
2495+#: openbox/openbox.c:558
2496 msgid ""
2497 "\n"
2498 "Debugging options:\n"
2499 msgstr ""
2500 "\n"
2501-"Opes de depurao:\n"
2502+"Opções de depuração:\n"
2503
2504-#: openbox/openbox.c:544
2505+#: openbox/openbox.c:559
2506 msgid " --sync Run in synchronous mode\n"
2507 msgstr " --sync Executa em modo sincronizado\n"
2508
2509-#: openbox/openbox.c:545
2510+#: openbox/openbox.c:560
2511 msgid " --debug Display debugging output\n"
2512-msgstr " --debug Mostra o resultado da depurao\n"
2513+msgstr " --debug Mostra o resultado da depuração\n"
2514
2515-#: openbox/openbox.c:546
2516+#: openbox/openbox.c:561
2517 msgid " --debug-focus Display debugging output for focus handling\n"
2518 msgstr ""
2519-" --debug-focus Mostra o resultado da depurao para manipulao em "
2520+" --debug-focus Mostra o resultado de depuração para manipulação de "
2521 "foco\n"
2522
2523-#: openbox/openbox.c:547
2524+#: openbox/openbox.c:562
2525 msgid " --debug-xinerama Split the display into fake xinerama screens\n"
2526-msgstr " --debug-xinerama Divide o ecr em falsos ecrs xinerama\n"
2527+msgstr " --debug-xinerama Divide o ecrã em falsos ecrãs xinerama\n"
2528
2529-#: openbox/openbox.c:548
2530+#: openbox/openbox.c:563
2531 #, c-format
2532 msgid ""
2533 "\n"
2534@@ -391,35 +379,35 @@ msgstr ""
2535 "\n"
2536 "Por favor reporte os erros em %s\n"
2537
2538-#: openbox/openbox.c:617
2539+#: openbox/openbox.c:645
2540 msgid "--config-file requires an argument\n"
2541 msgstr "--config-file requer um argumento\n"
2542
2543-#: openbox/openbox.c:660
2544+#: openbox/openbox.c:688
2545 #, c-format
2546 msgid "Invalid command line argument \"%s\"\n"
2547-msgstr "Argumento invlido na linha de comandos \"%s\"\n"
2548+msgstr "Argumento inválido na linha de comandos \"%s\"\n"
2549
2550-#: openbox/screen.c:102 openbox/screen.c:190
2551+#: openbox/screen.c:103 openbox/screen.c:191
2552 #, c-format
2553 msgid "A window manager is already running on screen %d"
2554-msgstr "Um gestor de janelas j est em execuo no ecr %d"
2555+msgstr "Um gestor de janelas já está em execução no ecrã %d"
2556
2557-#: openbox/screen.c:124
2558+#: openbox/screen.c:125
2559 #, c-format
2560 msgid "Could not acquire window manager selection on screen %d"
2561-msgstr "No consegui adequirir o gestor de janelas selecionado no ecr %d"
2562+msgstr "Não consegui adequirir o gestor de janelas selecionado no ecrã %d"
2563
2564-#: openbox/screen.c:145
2565+#: openbox/screen.c:146
2566 #, c-format
2567 msgid "The WM on screen %d is not exiting"
2568-msgstr "O gestor de janelas no ecr %d no est a fechar"
2569+msgstr "O gestor de janelas no ecrã %d não está a fechar"
2570
2571 #. TRANSLATORS: If you need to specify a different order of the
2572 #. arguments, you can use %1$d for the first one and %2$d for the
2573 #. second one. For example,
2574 #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..."
2575-#: openbox/screen.c:412
2576+#: openbox/screen.c:421
2577 #, c-format
2578 msgid ""
2579 "Openbox is configured for %d desktop, but the current session has %d. "
2580@@ -428,35 +416,35 @@ msgid_plural ""
2581 "Openbox is configured for %d desktops, but the current session has %d. "
2582 "Overriding the Openbox configuration."
2583 msgstr[0] ""
2584-"O Openbox est configurado para %d rea de trabalho, mas a sesso corrente "
2585-"tem %d. Sobrescrevendo a configurao do Openbox."
2586+"O Openbox está configurado para %d área de trabalho, mas a sessão corrente "
2587+"tem %d. Sobrescrevendo a configuração do Openbox."
2588 msgstr[1] ""
2589-"O Openbox est configurado para %d reas de trabalho, mas a sesso corrente "
2590-"tem %d. Sobrescrevendo a configurao do Openbox."
2591+"O Openbox está configurado para %d áreas de trabalho, mas a sessão corrente "
2592+"tem %d. Sobrescrevendo a configuração do Openbox."
2593
2594-#: openbox/screen.c:1180
2595+#: openbox/screen.c:1203
2596 #, c-format
2597 msgid "desktop %i"
2598-msgstr "rea de trabalho %i"
2599+msgstr "área de trabalho %i"
2600
2601-#: openbox/session.c:104
2602+#: openbox/session.c:105
2603 #, c-format
2604 msgid "Unable to make directory \"%s\": %s"
2605-msgstr "Incapaz de criar o directrio \"%s\": %s "
2606+msgstr "Incapaz de criar o directório \"%s\": %s"
2607
2608-#: openbox/session.c:466
2609+#: openbox/session.c:472
2610 #, c-format
2611 msgid "Unable to save the session to \"%s\": %s"
2612-msgstr "Incapaz de guardar a sesso em \"%s\": %s"
2613+msgstr "Incapaz de guardar a sessão em \"%s\": %s"
2614
2615-#: openbox/session.c:605
2616+#: openbox/session.c:611
2617 #, c-format
2618 msgid "Error while saving the session to \"%s\": %s"
2619-msgstr "Erro enquanto guardava a sesso em \"%s\": %s"
2620+msgstr "Erro enquanto guardo a sessão em \"%s\": %s"
2621
2622-#: openbox/session.c:842
2623+#: openbox/session.c:848
2624 msgid "Not connected to a session manager"
2625-msgstr "Desligado do gestor de sesso"
2626+msgstr "Não está ligado a um gestor de sessões"
2627
2628 #: openbox/startupnotify.c:243
2629 #, c-format
2630@@ -466,22 +454,22 @@ msgstr "Executando %s"
2631 #: openbox/translate.c:59
2632 #, c-format
2633 msgid "Invalid modifier key \"%s\" in key/mouse binding"
2634-msgstr "Chave modificadora \"%s\" invlida no atalho de tecla/rato"
2635+msgstr "Chave modificadora inválida \"%s\" no atalho de tecla/rato"
2636
2637 #: openbox/translate.c:138
2638 #, c-format
2639 msgid "Invalid key code \"%s\" in key binding"
2640-msgstr "Cdigo chave \"%s\" invlido na tecla de atalho"
2641+msgstr "Código chave inválido \"%s\" na tecla de atalho"
2642
2643 #: openbox/translate.c:145
2644 #, c-format
2645 msgid "Invalid key name \"%s\" in key binding"
2646-msgstr "Nome de chave \"%s\" invlido na tecla de atalho"
2647+msgstr "Nome de chave inválido \"%s\" na tecla de atalho"
2648
2649 #: openbox/translate.c:151
2650 #, c-format
2651 msgid "Requested key \"%s\" does not exist on the display"
2652-msgstr "Chave requerida \"%s\" no existe no ecr"
2653+msgstr "Chave requerida \"%s\" não existe no ecrã"
2654
2655 #: openbox/xerror.c:40
2656 #, c-format
2657@@ -492,8 +480,15 @@ msgstr "Erro no X: %s"
2658 msgid "OK"
2659 msgstr "OK"
2660
2661+#~ msgid ""
2662+#~ "The SessionLogout action is not available since Openbox was built without "
2663+#~ "session management support"
2664+#~ msgstr ""
2665+#~ "A acção SessionLogout não está disponível visto que o Openbox foi "
2666+#~ "construído sem suporte à gestão de sessões"
2667+
2668 #~ msgid "Failed to execute \"%s\": %s"
2669 #~ msgstr "Falha a executar \"%s\": %s"
2670
2671 #~ msgid "Invalid use of action \"%s\". Action will be ignored."
2672-#~ msgstr "Uso invlido da aco \"%s\". A aco ser ignorada."
2673+#~ msgstr "Uso inválido da acção \"%s\". A acção será ignorada."
2674diff --git a/themes/Clearlooks/openbox-3/themerc b/themes/Clearlooks/openbox-3/themerc
2675index 1dde5fb..4663999 100644
2676--- a/themes/Clearlooks/openbox-3/themerc
2677+++ b/themes/Clearlooks/openbox-3/themerc
2678@@ -1,12 +1,12 @@
2679 !# Clearlooks-Evolving
2680-!# Clearlooks as it evolves in gnome-svn...
2681-!# Last updated 19/01/08
2682+!# Clearlooks as it evolves in gnome-git...
2683+!# Last updated 09/03/10
2684
2685 # Fonts
2686 # these are really halos, but who cares?
2687
2688 *.font: shadow=n
2689-window.active.label.text.font:shadow=y:shadowtint=25:shadowoffset=1
2690+window.active.label.text.font:shadow=y:shadowtint=30:shadowoffset=1
2691 window.inactive.label.text.font:shadow=y:shadowtint=00:shadowoffset=0
2692 menu.items.font:shadow=y:shadowtint=0:shadowoffset=1
2693
2694@@ -25,11 +25,11 @@ menu.overlap: 2
2695 *.bg.highlight: 50
2696 *.bg.shadow: 05
2697
2698-window.active.title.bg.highlight: 40
2699-window.active.title.bg.shadow: 00
2700+window.active.title.bg.highlight: 35
2701+window.active.title.bg.shadow: 05
2702
2703 window.inactive.title.bg.highlight: 30
2704-window.inactive.title.bg.shadow: 00
2705+window.inactive.title.bg.shadow: 05
2706
2707 window.*.grip.bg.highlight: 50
2708 window.*.grip.bg.shadow: 30
2709@@ -61,6 +61,11 @@ menu.items.active.bg.colorTo.splitTo: #80a7d6
2710 menu.items.active.bg.border.color: #4b6e99
2711 menu.items.active.text.color: #ffffff
2712
2713+menu.separator.width: 1
2714+menu.separator.padding.width: 0
2715+menu.separator.padding.height: 3
2716+menu.separator.color: #aaaaaa
2717+
2718 !# set handles here and only the once?
2719
2720 window.*.handle.bg: Raised solid
2721@@ -71,9 +76,6 @@ window.*.grip.bg.color: #eaebec
2722
2723 !# Active
2724
2725-!# no handles - kind of closer to the clearlooks border, maybe?
2726-!#window.active.border.color: #455d7c
2727-
2728 window.*.border.color: #585a5d
2729
2730 window.active.title.separator.color: #4e76a8
2731@@ -135,7 +137,7 @@ window.inactive.button.*.image.color: #6D6C6C
2732 !# osd (pop ups and what not, dock?)
2733
2734 osd.border.width: 1
2735-osd.border.color: #999
2736+osd.border.color: #aaaaaa
2737
2738 osd.bg: flat border gradient splitvertical
2739 osd.bg.color: #F0EFEE
diff --git a/meta-oe/recipes-graphics/openbox/openbox_3.4.11.2.bb b/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb
index e5d645d0d..ac00046b4 100644
--- a/meta-oe/recipes-graphics/openbox/openbox_3.4.11.2.bb
+++ b/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb
@@ -4,14 +4,10 @@ DEPENDS = "glib-2.0 pango libxml2 virtual/libx11"
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
6 6
7PR = "r1" 7SRC_URI = "http://icculus.org/openbox/releases/openbox-${PV}.tar.gz"
8 8
9SRC_URI = "http://icculus.org/openbox/releases/openbox-${PV}.tar.gz \ 9SRC_URI[md5sum] = "00441b53cf14c03566c8e82643544ff9"
10 file://fix-dialog-buttons.patch;patch=1 \ 10SRC_URI[sha256sum] = "6fa90016530b3aa6102e254079461977439398531fb23e7ec076ff2c140fea0a"
11 file://fix-decorations.patch;patch=1"
12
13SRC_URI[md5sum] = "30e669134fa81df810fe7d1dc59cd931"
14SRC_URI[sha256sum] = "2e7579389c30e6bb08cc721a2c1af512e049fec2670e71715aa1c4e129ec349d"
15 11
16inherit autotools gettext update-alternatives 12inherit autotools gettext update-alternatives
17 13
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 00:29:45 +0000