adding trunk

Signed-off-by: Dana Jansens <danakj@orodu.net>

diff --git a/.svnignore b/.svnignore
deleted file mode 100644 (file)
index 3481fc0..0000000
--- a/.svnignore
+++ /dev/null
@@ -1,20 +0,0 @@
-configure
-build-stamp
-Makefile.in
-config.rpath
-config.log
-depcomp
-compile
-config.guess
-ltmain.sh
-config.sub
-ABOUT-NLS
-config.status.lineno
-Makefile
-mkinstalldirs
-config.status
-libtool
-autom4te.cache
-missing
-version.h
-aclocal.m4

diff --git a/Makefile.am b/Makefile.am
index 8c6dc1c..27114f8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,9 +118,6 @@ openbox_openbox_CPPFLAGS = \
        $(XRANDR_CFLAGS) \
        $(XSHAPE_CFLAGS) \
        $(XSYNC_CFLAGS) \
        $(XRANDR_CFLAGS) \
        $(XSHAPE_CFLAGS) \
        $(XSYNC_CFLAGS) \

-       $(XRENDER_CFLAGS) \
-       $(XDAMAGE_CFLAGS) \
-       $(XCOMPOSITE_CFLAGS) \

        $(X_CFLAGS) \
        $(XCURSOR_CFLAGS) \
        $(SM_CFLAGS) \
        $(X_CFLAGS) \
        $(XCURSOR_CFLAGS) \
        $(SM_CFLAGS) \


@@ -140,9 +137,6 @@ openbox_openbox_LDADD = \
        $(XSHAPE_LIBS) \
        $(XSYNC_LIBS) \
        $(GLIB_LIBS) \
        $(XSHAPE_LIBS) \
        $(XSYNC_LIBS) \
        $(GLIB_LIBS) \

-       $(XRENDER_LIBS) \
-       $(XDAMAGE_LIBS) \
-       $(XCOMPOSITE_LIBS) \

        $(X_LIBS) \
        $(XCURSOR_LIBS) \
        $(LIBSN_LIBS) \
        $(X_LIBS) \
        $(XCURSOR_LIBS) \
        $(LIBSN_LIBS) \


@@ -205,8 +199,6 @@ openbox_openbox_SOURCES = \
        openbox/client_list_combined_menu.h \
        openbox/client_menu.c \
        openbox/client_menu.h \
        openbox/client_list_combined_menu.h \
        openbox/client_menu.c \
        openbox/client_menu.h \

-       openbox/composite.c \
-       openbox/composite.h \

        openbox/config.c \
        openbox/config.h \
        openbox/debug.c \
        openbox/config.c \
        openbox/config.h \
        openbox/debug.c \

diff --git a/configure.ac b/configure.ac
index 795b774..c06fdaa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -136,51 +136,6 @@ else
   xcursor_found=no
 fi
 
   xcursor_found=no
 fi
 

-AC_ARG_ENABLE(xcomposite,
-  AC_HELP_STRING(
-    [--disable-xcomposite],
-    [disable use of the X Composite library. [[default=enabled]]]
-  ),
-  [enable_xcomposite=$enableval],
-  [enable_xcomposite=yes]
-)
-
-if test "$enable_xcomposite" = yes; then
-PKG_CHECK_MODULES(XRENDER, [xrender],
-  [
-    AC_DEFINE(USE_XRENDER, [1], [Use X Render library])
-    AC_SUBST(XRENDER_CFLAGS)
-    AC_SUBST(XRENDER_LIBS)
-    PKG_CHECK_MODULES(XDAMAGE, [xdamage],
-      [
-        AC_DEFINE(USE_XDAMAGE, [1], [Use X Damage library])
-        AC_SUBST(XDAMAGE_CFLAGS)
-        AC_SUBST(XDAMAGE_LIBS)
-        PKG_CHECK_MODULES(XCOMPOSITE, [xcomposite],
-          [ 
-            AC_DEFINE(USE_XCOMPOSITE, [1], [Use X Composite library])  
-            AC_SUBST(XCOMPOSITE_CFLAGS)           
-            AC_SUBST(XCOMPOSITE_LIBS)
-            xcomposite_found=yes
-          ],
-          [
-            xcomposite_found=no
-          ]
-        )
-      ],
-      [
-        xcomposite_found=no
-      ]
-    )
-  ],
-  [
-    xcomposite_found=no
-  ]
-)
-else
-  xcomposite_found=no
-fi
-

 dnl Check for session management
 X11_SM
 
 dnl Check for session management
 X11_SM
 


@@ -215,7 +170,6 @@ AC_MSG_RESULT
 AC_MSG_RESULT([Compiling with these options:
                Startup Notification... $sn_found
                X Cursor Library... $xcursor_found
 AC_MSG_RESULT([Compiling with these options:
                Startup Notification... $sn_found
                X Cursor Library... $xcursor_found

-               X Composite Library... $xcomposite_found

                Session Management... $SM
                ])
 AC_MSG_RESULT([configure complete, now type "make"])
                Session Management... $SM
                ])
 AC_MSG_RESULT([configure complete, now type "make"])

diff --git a/data/xsession/.svnignore b/data/xsession/.svnignore
deleted file mode 100644 (file)
index f4018d6..0000000
--- a/data/xsession/.svnignore
+++ /dev/null
@@ -1,6 +0,0 @@
-openbox.desktop
-openbox-kde.desktop
-openbox-gnome.desktop
-openbox-session
-openbox-kde-session
-openbox-gnome-session

diff --git a/debian/.svnignore b/debian/.svnignore
deleted file mode 100644 (file)
index bb49320..0000000
--- a/debian/.svnignore
+++ /dev/null
@@ -1,6 +0,0 @@
-openbox.postinst.debhelper
-openbox.postrm.debhelper
-changelog
-files
-openbox.substvars
-openbox

diff --git a/doc/.svnignore b/doc/.svnignore
deleted file mode 100644 (file)
index cbbd841..0000000
--- a/doc/.svnignore
+++ /dev/null
@@ -1,4 +0,0 @@
-openbox-session.1
-openbox-kde-session.1
-openbox-gnome-session.1
-openbox.1

diff --git a/m4/.svnignore b/m4/.svnignore
deleted file mode 100644 (file)
index 423e303..0000000
--- a/m4/.svnignore
+++ /dev/null
@@ -1,37 +0,0 @@
-
-lib-link.m4
-printf-posix.m4
-Makefile.in
-intldir.m4
-uintmax_t.m4
-signed.m4
-iconv.m4
-inttypes.m4
-longlong.m4
-glibc21.m4
-codeset.m4
-inttypes_h.m4
-visibility.m4
-lock.m4
-longdouble.m4
-nls.m4
-Makefile
-intmax.m4
-lib-prefix.m4
-glibc2.m4
-xsize.m4
-lcmessage.m4
-lib-ld.m4
-ulonglong.m4
-wint_t.m4
-inttypes-h.m4
-intl.m4
-progtest.m4
-inttypes-pri.m4
-stdint_h.m4
-intdiv0.m4
-po.m4
-isc-posix.m4
-size_max.m4
-gettext.m4
-wchar_t.m4

diff --git a/openbox/client.c b/openbox/client.c
index 9378545..071ecc4 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -4175,30 +4175,3 @@ gboolean client_has_group_siblings(ObClient *self)
 {
     return self->group && self->group->members->next;
 }
 {
     return self->group && self->group->members->next;
 }

-
-ObClientIcon *client_thumbnail(ObClient *self, gint wantw, gint wanth)
-{
-    ObClientIcon *ret;
-    RrPixel32 *data;
-    gint w, h;
-
-    if (!self->frame->pixmap) return NULL;
-    if (!RrPixmapToRGBA(ob_rr_inst, self->frame->pixmap, None, &w, &h, &data))
-        return NULL;
-
-    /* resize the thumbnail (within aspect ratio) to the given sizes */
-
-    ret = g_new(ObClientIcon, 1);
-    ret->data = data;
-    ret->width = w;
-    ret->height = h;
-    return ret;
-}
-
-void clienticon_free(ObClientIcon *ci)
-{
-    if (ci) {
-        g_free(ci->data);
-        g_free(ci);
-    }
-}

diff --git a/openbox/client.h b/openbox/client.h
index 9f20859..e33b89e 100644 (file)
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -626,8 +626,6 @@ void client_get_type_and_transientness(ObClient *self);
 
 const ObClientIcon *client_icon(ObClient *self, gint w, gint h);
 
 
 const ObClientIcon *client_icon(ObClient *self, gint w, gint h);
 

-ObClientIcon *client_thumbnail(ObClient *self, gint w, gint h);
-

 /*! Return TRUE if the client is transient for some other window. Return
   FALSE if it's not transient or there is no window for it to be
   transient for */
 /*! Return TRUE if the client is transient for some other window. Return
   FALSE if it's not transient or there is no window for it to be
   transient for */


@@ -709,6 +707,4 @@ ObClient* client_under_pointer();
 
 gboolean client_has_group_siblings(ObClient *self);
 
 
 gboolean client_has_group_siblings(ObClient *self);
 

-void clienticon_free(ObClientIcon *ci);
-

 #endif
 #endif

diff --git a/openbox/composite.c b/openbox/composite.c
index deedf96..e69de29 100644 (file)
--- a/openbox/composite.c
+++ b/openbox/composite.c
@@ -1,75 +0,0 @@
-#include "composite.h"
-#include "openbox.h"
-#include "extensions.h"
-
-#ifndef USE_XCOMPOSITE
-void composite_startup(gboolean reconfig) {}
-void composite_shutdown(gboolean reconfig) {}
-gboolean composite_window_has_alpha(Visual *vis) { return FALSE; }
-XID composite_get_window_picture(Window win, Visual *vis) { return None; }
-Pixmap composite_get_window_pixmap(Window win) { return None; }
-void composite_setup_root_window() {}
-void composite_enable_for_window(Window win) {}
-#else
-
-static Picture root_picture = None;
-
-void composite_startup(gboolean reconfig)
-{
-    if (reconfig) return;
-    if (!extensions_comp) return;
-}
-
-void composite_shutdown(gboolean reconfig)
-{
-    if (reconfig) return;
-    if (!extensions_comp) return;
-}
-
-void composite_setup_root_window()
-{
-    if (root_picture)
-        XRenderFreePicture(ob_display, root_picture);
-
-    root_picture =
-        composite_get_window_picture(RootWindow(ob_display, ob_screen),
-                                     RrVisual(ob_rr_inst));
-}
-
-gboolean composite_window_has_alpha(Visual *vis)
-{
-    XRenderPictFormat *format;
-
-    if (!extensions_comp) return FALSE;
-
-    format = XRenderFindVisualFormat(ob_display, vis);
-    return format->type == PictTypeDirect && format->direct.alphaMask;
-}
-
-XID composite_get_window_picture(Window win, Visual *vis)
-{
-    XRenderPictureAttributes pa;
-    XRenderPictFormat *format;
-
-    if (!extensions_comp) return None;
-
-    format = XRenderFindVisualFormat(ob_display, vis);
-
-    pa.subwindow_mode = IncludeInferiors;
-    return XRenderCreatePicture(ob_display, win, format, CPSubwindowMode, &pa);
-}
-
-Pixmap composite_get_window_pixmap(Window win)
-{
-    if (!extensions_comp) return None;
-
-    return XCompositeNameWindowPixmap(ob_display, win);
-}
-
-void composite_enable_for_window(Window win)
-{
-    /* Redirect window contents to offscreen pixmaps */
-    XCompositeRedirectWindow(ob_display, win, CompositeRedirectAutomatic);
-}
-
-#endif

diff --git a/openbox/composite.h b/openbox/composite.h
index d20abac..e69de29 100644 (file)
--- a/openbox/composite.h
+++ b/openbox/composite.h
@@ -1,17 +0,0 @@
-#ifndef __composite_h
-#define __composite_h
-
-#include <glib.h>
-#include <X11/Xlib.h>
-
-void composite_startup(gboolean reconfig);
-void composite_shutdown(gboolean reconfig);
-
-void composite_setup_root_window();
-void composite_enable_for_window(Window win);
-
-gboolean composite_window_has_alpha(Visual *vis);
-XID composite_get_window_picture(Window win, Visual *vis);
-Pixmap composite_get_window_pixmap(Window win);
-
-#endif

diff --git a/openbox/event.c b/openbox/event.c
index ab4e8f9..c3a17fb 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1529,7 +1529,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
 #ifdef SHAPE
         if (extensions_shape && e->type == extensions_shape_event_basep) {
             client->shaped = ((XShapeEvent*)e)->shaped;
 #ifdef SHAPE
         if (extensions_shape && e->type == extensions_shape_event_basep) {
             client->shaped = ((XShapeEvent*)e)->shaped;

-            frame_adjust_area(client->frame, FALSE, TRUE, FALSE);
+            frame_adjust_shape(client->frame);

         }
 #endif
     }
         }
 #endif
     }

diff --git a/openbox/extensions.c b/openbox/extensions.c
index 2fdc686..b7d8e73 100644 (file)
--- a/openbox/extensions.c
+++ b/openbox/extensions.c
@@ -33,8 +33,6 @@ gboolean extensions_randr     = FALSE;
 gint     extensions_randr_event_basep;
 gboolean extensions_sync      = FALSE;
 gint     extensions_sync_event_basep;
 gint     extensions_randr_event_basep;
 gboolean extensions_sync      = FALSE;
 gint     extensions_sync_event_basep;

-gboolean extensions_comp      = FALSE;
-gint     extensions_comp_event_basep;

 
 void extensions_query_all()
 {
 
 void extensions_query_all()
 {


@@ -82,22 +80,6 @@ void extensions_query_all()
         ob_debug("X Sync extension is not present on the server or is an "
                  "incompatible version\n");
 #endif
         ob_debug("X Sync extension is not present on the server or is an "
                  "incompatible version\n");
 #endif

-
-#ifdef USE_XCOMPOSITE
-    if (XCompositeQueryExtension(ob_display, &extensions_comp_event_basep,
-                                 &junk))
-    {
-        gint major = 0, minor = 2;
-        XCompositeQueryVersion(ob_display, &major, &minor);
-        /* Version 0.2 is the first version to have the
-           XCompositeNameWindowPixmap() request. */
-        if (major > 0 || minor >= 2)
-            extensions_comp = TRUE;
-    }
-    if (!extensions_comp)
-        ob_debug("X Composite extension is not present on the server or is an "
-                 "incompatible version\n");
-#endif

 }
 
 void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
 }
 
 void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)


@@ -146,10 +128,3 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
     }
     RECT_SET((*xin_areas)[*nxin], l, t, r - l + 1, b - t + 1);
 }
     }
     RECT_SET((*xin_areas)[*nxin], l, t, r - l + 1, b - t + 1);
 }

-
-#ifdef USE_XCOMPOSITE
-Picture extensions_create_composite_picture(Window win, Visual *vis,
-                                            gboolean *has_alpha)
-{
-}
-#endif

diff --git a/openbox/extensions.h b/openbox/extensions.h
index 94bf0db..3fbac87 100644 (file)
--- a/openbox/extensions.h
+++ b/openbox/extensions.h
@@ -39,11 +39,6 @@
 #ifdef    SYNC
 #include <X11/extensions/sync.h>
 #endif
 #ifdef    SYNC
 #include <X11/extensions/sync.h>
 #endif

-#ifdef    USE_XCOMPOSITE
-#include <X11/extensions/Xcomposite.h>
-#include <X11/extensions/Xdamage.h>
-#include <X11/extensions/Xrender.h>
-#endif

 
 #include <glib.h>
 
 
 #include <glib.h>
 


@@ -72,13 +67,8 @@ extern gboolean extensions_sync;
 /*! Base for events for the Sync extension */
 extern gint extensions_sync_event_basep;
 
 /*! Base for events for the Sync extension */
 extern gint extensions_sync_event_basep;
 

-/*! Does the display have the Composite extension? */
-extern gboolean extensions_comp;
-/*! Base for events for the Composite extension */
-extern gint extensions_comp_event_basep;
-

 void extensions_query_all();
 
 void extensions_xinerama_screens(Rect **areas, guint *nxin);
 void extensions_query_all();
 
 void extensions_xinerama_screens(Rect **areas, guint *nxin);

-
+  

 #endif
 #endif

diff --git a/openbox/frame.c b/openbox/frame.c
index c53d51d..a4843d6 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -27,7 +27,6 @@
 #include "mainloop.h"
 #include "focus_cycle.h"
 #include "focus_cycle_indicator.h"
 #include "mainloop.h"
 #include "focus_cycle.h"
 #include "focus_cycle_indicator.h"

-#include "composite.h"

 #include "moveresize.h"
 #include "screen.h"
 #include "render/theme.h"
 #include "moveresize.h"
 #include "screen.h"
 #include "render/theme.h"


@@ -51,10 +50,7 @@ static void layout_title(ObFrame *self);
 static void set_theme_statics(ObFrame *self);
 static void free_theme_statics(ObFrame *self);
 static gboolean frame_animate_iconify(gpointer self);
 static void set_theme_statics(ObFrame *self);
 static void free_theme_statics(ObFrame *self);
 static gboolean frame_animate_iconify(gpointer self);

-static void frame_adjust_shape(ObFrame *self);

 static void frame_adjust_cursors(ObFrame *self);
 static void frame_adjust_cursors(ObFrame *self);

-static void frame_get_offscreen_buffer(ObFrame *self);
-static void frame_free_offscreen_buffer(ObFrame *self);

 
 static Window createWindow(Window parent, Visual *visual,
                            gulong mask, XSetWindowAttributes *attrib)
 
 static Window createWindow(Window parent, Visual *visual,
                            gulong mask, XSetWindowAttributes *attrib)


@@ -66,46 +62,58 @@ static Window createWindow(Window parent, Visual *visual,
                        
 }
 
                        
 }
 

+static Visual *check_32bit_client(ObClient *c)
+{
+    XWindowAttributes wattrib;
+    Status ret;
+
+    /* we're already running at 32 bit depth, yay. we don't need to use their
+       visual */
+    if (RrDepth(ob_rr_inst) == 32)
+        return NULL;
+
+    ret = XGetWindowAttributes(ob_display, c->window, &wattrib);
+    g_assert(ret != BadDrawable);
+    g_assert(ret != BadWindow);
+
+    if (wattrib.depth == 32)
+        return wattrib.visual;
+    return NULL;
+}
+

 ObFrame *frame_new(ObClient *client)
 {
     XSetWindowAttributes attrib;
     gulong mask;
     ObFrame *self;
 ObFrame *frame_new(ObClient *client)
 {
     XSetWindowAttributes attrib;
     gulong mask;
     ObFrame *self;

-    XWindowAttributes wattrib;
-    Status ret;
+    Visual *visual;

 
     self = g_new0(ObFrame, 1);
     self->client = client;
 
 
     self = g_new0(ObFrame, 1);
     self->client = client;
 

-    ret = XGetWindowAttributes(ob_display, client->window, &wattrib);
-    g_assert(ret != BadDrawable);
-    g_assert(ret != BadWindow);
-    self->has_alpha = composite_window_has_alpha(wattrib.visual);
+    visual = check_32bit_client(client);

 
     /* create the non-visible decor windows */
 
     mask = 0;
 
     /* create the non-visible decor windows */
 
     mask = 0;

-    if (self->has_alpha) {
-        /* the colormap/backpixel/borderpixel are required for supporting
-           windows with 32bit visuals */
-        mask = CWColormap | CWBackPixel | CWBorderPixel;
+    if (visual) {
+        /* client has a 32-bit visual */
+        mask |= CWColormap | CWBackPixel | CWBorderPixel;

         /* create a colormap with the visual */
         self->colormap = attrib.colormap =
             XCreateColormap(ob_display,
                             RootWindow(ob_display, ob_screen),
         /* create a colormap with the visual */
         self->colormap = attrib.colormap =
             XCreateColormap(ob_display,
                             RootWindow(ob_display, ob_screen),

-                            wattrib.visual, AllocNone);
+                            visual, AllocNone);

         attrib.background_pixel = BlackPixel(ob_display, ob_screen);
         attrib.border_pixel = BlackPixel(ob_display, ob_screen);
     }
         attrib.background_pixel = BlackPixel(ob_display, ob_screen);
         attrib.border_pixel = BlackPixel(ob_display, ob_screen);
     }

-
-    self->window = createWindow(RootWindow(ob_display, ob_screen),
-                                (self->has_alpha ? wattrib.visual : NULL),
+    self->window = createWindow(RootWindow(ob_display, ob_screen), visual,

                                 mask, &attrib);
 
     /* create the visible decor windows */
 
     mask = 0;
                                 mask, &attrib);
 
     /* create the visible decor windows */
 
     mask = 0;

-    if (self->has_alpha) {
+    if (visual) {

         /* client has a 32-bit visual */
         mask |= CWColormap | CWBackPixel | CWBorderPixel;
         attrib.colormap = RrColormap(ob_rr_inst);
         /* client has a 32-bit visual */
         mask |= CWColormap | CWBackPixel | CWBorderPixel;
         attrib.colormap = RrColormap(ob_rr_inst);


@@ -232,7 +240,6 @@ void frame_free(ObFrame *self)
     XDestroyWindow(ob_display, self->window);
     if (self->colormap)
         XFreeColormap(ob_display, self->colormap);
     XDestroyWindow(ob_display, self->window);
     if (self->colormap)
         XFreeColormap(ob_display, self->colormap);

-    frame_free_offscreen_buffer(self);

 
     g_free(self);
 }
 
     g_free(self);
 }


@@ -244,8 +251,6 @@ void frame_show(ObFrame *self)
         framerender_frame(self);
         XMapWindow(ob_display, self->client->window);
         XMapWindow(ob_display, self->window);
         framerender_frame(self);
         XMapWindow(ob_display, self->client->window);
         XMapWindow(ob_display, self->window);

-
-        frame_get_offscreen_buffer(self);

     }
 }
 
     }
 }
 


@@ -255,7 +260,6 @@ void frame_hide(ObFrame *self)
         self->visible = FALSE;
         if (!frame_iconify_animating(self))
             XUnmapWindow(ob_display, self->window);
         self->visible = FALSE;
         if (!frame_iconify_animating(self))
             XUnmapWindow(ob_display, self->window);

-

         /* we unmap the client itself so that we can get MapRequest
            events, and because the ICCCM tells us to! */
         XUnmapWindow(ob_display, self->client->window);
         /* we unmap the client itself so that we can get MapRequest
            events, and because the ICCCM tells us to! */
         XUnmapWindow(ob_display, self->client->window);


@@ -364,8 +368,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                   self->cbwidth_l + (!self->max_horz ? self->bwidth : 0),
                   self->cbwidth_t + self->bwidth,
                   self->cbwidth_r + (!self->max_horz ? self->bwidth : 0),
                   self->cbwidth_l + (!self->max_horz ? self->bwidth : 0),
                   self->cbwidth_t + self->bwidth,
                   self->cbwidth_r + (!self->max_horz ? self->bwidth : 0),

-                  self->cbwidth_b + (!self->max_horz || !self->max_vert ?
-                                     self->bwidth : 0));
+                  self->cbwidth_b + (!self->max_horz || !self->max_vert ? self->bwidth : 0));

 
         if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
             self->size.top += ob_rr_theme->title_height + self->bwidth;
 
         if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
             self->size.top += ob_rr_theme->title_height + self->bwidth;


@@ -783,9 +786,6 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
             self->need_render = TRUE;
             framerender_frame(self);
             frame_adjust_shape(self);
             self->need_render = TRUE;
             framerender_frame(self);
             frame_adjust_shape(self);

-
-            /* the offscreen buffer's shape needs to match */
-            frame_get_offscreen_buffer(self);

         }
 
         if (!STRUT_EQUAL(self->size, oldsize)) {
         }
 
         if (!STRUT_EQUAL(self->size, oldsize)) {


@@ -916,9 +916,6 @@ void frame_grab_client(ObFrame *self)
     /* reparent the client to the frame */
     XReparentWindow(ob_display, self->client->window, self->window, 0, 0);
 
     /* reparent the client to the frame */
     XReparentWindow(ob_display, self->client->window, self->window, 0, 0);
 

-    /* enable the offscreen composite buffer for the client window */
-    composite_enable_for_window(self->client->window);
-

     /*
       When reparenting the client window, it is usually not mapped yet, since
       this occurs from a MapRequest. However, in the case where Openbox is
     /*
       When reparenting the client window, it is usually not mapped yet, since
       this occurs from a MapRequest. However, in the case where Openbox is


@@ -1680,9 +1677,6 @@ void frame_end_iconify_animation(ObFrame *self)
            need to send the synthetic configurenotify, since apps may have
            read the position when the client mapped, apparently. */
         client_reconfigure(self->client, TRUE);
            need to send the synthetic configurenotify, since apps may have
            read the position when the client mapped, apparently. */
         client_reconfigure(self->client, TRUE);

-
-        /* the offscreen buffer is invalid when the window is resized */
-        frame_get_offscreen_buffer(self);

     }
 
     /* we're not animating any more ! */
     }
 
     /* we're not animating any more ! */


@@ -1747,34 +1741,3 @@ void frame_begin_iconify_animation(ObFrame *self, gboolean iconifying)
             XMapWindow(ob_display, self->window);
     }
 }
             XMapWindow(ob_display, self->window);
     }
 }

-
-static void frame_get_offscreen_buffer(ObFrame *self)
-{
-    frame_free_offscreen_buffer(self);
-
-    if (self->visible || frame_iconify_animating(self)) {
-        self->pixmap = composite_get_window_pixmap(self->client->window);
-
-#ifdef SHAPE
-        /* shape the offscreen buffer to match the window */
-        XShapeCombineShape(ob_display, self->pixmap, ShapeBounding,
-                           0, 0, self->client->window,
-                           ShapeBounding, ShapeSet);
-#endif
-
-        /*
-          self->picture = composite_create_picture(self->window,
-          wattrib.visual,
-          &self->has_alpha);
-        */
-    }
-
-}
-
-static void frame_free_offscreen_buffer(ObFrame *self)
-{
-    if (self->pixmap) {
-        XFreePixmap(ob_display, self->pixmap);
-        self->pixmap = None;
-    }
-}

diff --git a/openbox/frame.h b/openbox/frame.h
index f7adbfd..edf75b0 100644 (file)
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -78,10 +78,6 @@ struct _ObFrame
 
     Window    window;
 
 
     Window    window;
 

-    Pixmap    pixmap;    /* Offscreen buffer of the frame window's contents
-                            when Composite is enabled */
-    gboolean  has_alpha;
-

     Strut     size;
     Rect      area;
     gboolean  visible;
     Strut     size;
     Rect      area;
     gboolean  visible;


@@ -209,6 +205,7 @@ void frame_free(ObFrame *self);
 void frame_show(ObFrame *self);
 void frame_hide(ObFrame *self);
 void frame_adjust_theme(ObFrame *self);
 void frame_show(ObFrame *self);
 void frame_hide(ObFrame *self);
 void frame_adjust_theme(ObFrame *self);

+void frame_adjust_shape(ObFrame *self);

 void frame_adjust_area(ObFrame *self, gboolean moved,
                        gboolean resized, gboolean fake);
 void frame_adjust_client_area(ObFrame *self);
 void frame_adjust_area(ObFrame *self, gboolean moved,
                        gboolean resized, gboolean fake);
 void frame_adjust_client_area(ObFrame *self);

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 250ca6d..00fe6e6 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -35,7 +35,6 @@
 #include "focus_cycle_indicator.h"
 #include "focus_cycle_popup.h"
 #include "moveresize.h"
 #include "focus_cycle_indicator.h"
 #include "focus_cycle_popup.h"
 #include "moveresize.h"

-#include "composite.h"

 #include "frame.h"
 #include "keyboard.h"
 #include "mouse.h"
 #include "frame.h"
 #include "keyboard.h"
 #include "mouse.h"


@@ -301,7 +300,6 @@ gint main(gint argc, gchar **argv)
             window_startup(reconfigure);
             sn_startup(reconfigure);
             screen_startup(reconfigure);
             window_startup(reconfigure);
             sn_startup(reconfigure);
             screen_startup(reconfigure);

-            composite_startup(reconfigure);

             grab_startup(reconfigure);
             propwin_startup(reconfigure);
             group_startup(reconfigure);
             grab_startup(reconfigure);
             propwin_startup(reconfigure);
             group_startup(reconfigure);


@@ -367,7 +365,6 @@ gint main(gint argc, gchar **argv)
             group_shutdown(reconfigure);
             propwin_shutdown(reconfigure);
             grab_shutdown(reconfigure);
             group_shutdown(reconfigure);
             propwin_shutdown(reconfigure);
             grab_shutdown(reconfigure);

-            composite_shutdown(reconfigure);

             screen_shutdown(reconfigure);
             focus_cycle_popup_shutdown(reconfigure);
             focus_cycle_indicator_shutdown(reconfigure);
             screen_shutdown(reconfigure);
             focus_cycle_popup_shutdown(reconfigure);
             focus_cycle_indicator_shutdown(reconfigure);

diff --git a/openbox/screen.c b/openbox/screen.c
index de3c9fb..707d0b6 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -27,7 +27,6 @@
 #include "moveresize.h"
 #include "config.h"
 #include "screen.h"
 #include "moveresize.h"
 #include "config.h"
 #include "screen.h"

-#include "composite.h"

 #include "client.h"
 #include "session.h"
 #include "frame.h"
 #include "client.h"
 #include "session.h"
 #include "frame.h"


@@ -491,9 +490,6 @@ void screen_resize()
 
     for (it = client_list; it; it = g_list_next(it))
         client_move_onscreen(it->data, FALSE);
 
     for (it = client_list; it; it = g_list_next(it))
         client_move_onscreen(it->data, FALSE);

-
-    /* this needs to be setup whenever the root window's size changes */
-    composite_setup_root_window();

 }
 
 void screen_set_num_desktops(guint num)
 }
 
 void screen_set_num_desktops(guint num)

diff --git a/po/.svnignore b/po/.svnignore
deleted file mode 100644 (file)
index fb5e504..0000000
--- a/po/.svnignore
+++ /dev/null
@@ -1,14 +0,0 @@
-*.gmo
-Makefile.in
-remove-potcdate.sin
-Makefile.in.in
-quot.sed
-Makefile
-Rules-quot
-insert-header.sin
-Makevars.template
-POTFILES
-stamp-po
-en@quot.header
-en@boldquot.header
-boldquot.sed

diff --git a/po/ar.po b/po/ar.po
index 1540fb5..57d9c87 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -5,9 +5,9 @@
 # Khaled Hosny <khaledhosny@eglug.org>, 2007.
 msgid ""
 msgstr ""
 # Khaled Hosny <khaledhosny@eglug.org>, 2007.
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-05-26 03:11+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "PO-Revision-Date: 2007-05-26 03:11+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"


@@ -18,186 +18,184 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : "
 "3\n"
 
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : "
 "3\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "فشلت في تحويل المسار '%s' من utf8"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "طُلِب إجراء '%s' غير سليم. لا يوجد إجراء كهذا."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "استخدام غير سليم للإجراء '%s'. سيُتَجاهل هذا الإجراء."
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "فشلت في تنفيذ '%s': %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "فشلت في تنفيذ '%s': %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "فشلت في تحويل المسار '%s' من utf8"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "اذهب هناك..."
 
 msgid "Go there..."
 msgstr "اذهب هناك..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "نوافذ"
 
 msgid "Windows"
 msgstr "نوافذ"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "أسطح مكتب"
 
 msgid "Desktops"
 msgstr "أسطح مكتب"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "كل أسطح المكتب"
 
 msgid "All desktops"
 msgstr "كل أسطح المكتب"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "طبقة (_L)"
 
 msgid "_Layer"
 msgstr "طبقة (_L)"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "دائما على السطح (_T)"
 
 msgid "Always on _top"
 msgstr "دائما على السطح (_T)"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "طبيعي (_N)"
 
 msgid "_Normal"
 msgstr "طبيعي (_N)"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "دائما في القاع (_B)"
 
 msgid "Always on _bottom"
 msgstr "دائما في القاع (_B)"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "أرسِل إلى سطح المكتب (_S)"
 
 msgid "_Send to desktop"
 msgstr "أرسِل إلى سطح المكتب (_S)"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "قائمة العميل"
 
 msgid "Client menu"
 msgstr "قائمة العميل"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "استعِد (_E)"
 
 msgid "R_estore"
 msgstr "استعِد (_E)"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "انقل (_M)"
 
 msgid "_Move"
 msgstr "انقل (_M)"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "حجِّم (_Z)"
 
 msgid "Resi_ze"
 msgstr "حجِّم (_Z)"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "صغّر (_N)"
 
 msgid "Ico_nify"
 msgstr "صغّر (_N)"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "كبّر (_X)"
 
 msgid "Ma_ximize"
 msgstr "كبّر (_X)"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "لُف لأعلى/لأسفل (_R)"
 
 msgid "_Roll up/down"
 msgstr "لُف لأعلى/لأسفل (_R)"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "ضع/أزل الحواف (_D)"
 
 msgid "Un/_Decorate"
 msgstr "ضع/أزل الحواف (_D)"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "أغلق (_C)"
 
 msgid "_Close"
 msgstr "أغلق (_C)"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "زر غير صحيح '%s' محدد في ملف الإعدادات"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "زر غير صحيح '%s' محدد في ملف الإعدادات"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "يتعارض مع ارتباط المفاتيح في ملف الإعدادات"
 
 msgid "Conflict with key binding in config file"
 msgstr "يتعارض مع ارتباط المفاتيح في ملف الإعدادات"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "لم أعثر على ملف قائمة سليم '%s'"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "لم أعثر على ملف قائمة سليم '%s'"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "فشل تنفيذ أمر ل pipe-menu '%s': %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "فشل تنفيذ أمر ل pipe-menu '%s': %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "خرج غير سليم من pipe-menu '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "خرج غير سليم من pipe-menu '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "حاولت الوصول إلى القائمة '%s' لكنها غير موجودة"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "حاولت الوصول إلى القائمة '%s' لكنها غير موجودة"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "المزيد..."
 
 msgid "More..."
 msgstr "المزيد..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "زر غير صحيح '%s' في ارتباط الفأرة"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "زر غير صحيح '%s' في ارتباط الفأرة"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "سياق غير صحيح '%s' في ارتباط الفأرة"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "سياق غير صحيح '%s' في ارتباط الفأرة"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "لم أستطع تغيير المجلد المنزلي '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "لم أستطع تغيير المجلد المنزلي '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "تعذّر فتح العرض من متغير البيئة DISPLAY."
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "تعذّر فتح العرض من متغير البيئة DISPLAY."
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "تعذّر بدأ مكتبة obrender."
 
 msgid "Failed to initialize the obrender library."
 msgstr "تعذّر بدأ مكتبة obrender."
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "خادم إكس لا يدعم المحليّة."
 
 msgid "X server does not support locale."
 msgstr "خادم إكس لا يدعم المحليّة."
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr "لم أستطِع ضبط مُغيِّرات المحليّة لخادم إكس."
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr "لم أستطِع ضبط مُغيِّرات المحليّة لخادم إكس."
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "لم أعثر على ملف إعدادات سليم، سأستخدم بعض الإفتراضيات البسيطة"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "لم أعثر على ملف إعدادات سليم، سأستخدم بعض الإفتراضيات البسيطة"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "لم أستطِع تحميل سِمة."
 
 msgid "Unable to load a theme."
 msgstr "لم أستطِع تحميل سِمة."
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "فشلت إعادة التشغيل في تنفيذ مُنفّذ جديد '%s': %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "فشلت إعادة التشغيل في تنفيذ مُنفّذ جديد '%s': %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "حقوق النسخ"
 
 msgid "Copyright (c)"
 msgstr "حقوق النسخ"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "الصيغة: openbox [options]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "الصيغة: openbox [options]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -205,23 +203,23 @@ msgstr ""
 "\n"
 "الخيارات:\n"
 
 "\n"
 "الخيارات:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              اعرض هذه المساعدة ثم اخرج\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              اعرض هذه المساعدة ثم اخرج\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           اعرض النسخة ثم اخرج\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           اعرض النسخة ثم اخرج\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           استبدل مدير النوافذ الذي يعمل حاليا\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           استبدل مدير النوافذ الذي يعمل حاليا\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        عطِّل الإتصال بمدير الجلسة\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        عطِّل الإتصال بمدير الجلسة\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -229,15 +227,15 @@ msgstr ""
 "\n"
 "تمرير رسائل لمرّة تعمل من أوبن‌بوكس:\n"
 
 "\n"
 "تمرير رسائل لمرّة تعمل من أوبن‌بوكس:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       أعِد تحميل إعدادات أوبن‌بوكس\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       أعِد تحميل إعدادات أوبن‌بوكس\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           أعِد تشغيل أوبن‌بوكس\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           أعِد تشغيل أوبن‌بوكس\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -245,23 +243,23 @@ msgstr ""
 "\n"
 "خيارات التنقيح:\n"
 
 "\n"
 "خيارات التنقيح:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              شغّل في النمط المزامن\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              شغّل في النمط المزامن\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             اعرض خرْج التنقيح\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             اعرض خرْج التنقيح\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       اعرض خرج التنقيح للتعامل مع البؤرة\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       اعرض خرج التنقيح للتعامل مع البؤرة\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    شق العرض إلى شاشات xinerama زائفة\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    شق العرض إلى شاشات xinerama زائفة\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -270,27 +268,27 @@ msgstr ""
 "\n"
 "من فضلك أبلغ عن العلل إلى %s\n"
 
 "\n"
 "من فضلك أبلغ عن العلل إلى %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "معامل سطر أوامر غير سليم '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "معامل سطر أوامر غير سليم '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "يعمل مدير نوافذ بالفعل على الشاشة %Id"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "يعمل مدير نوافذ بالفعل على الشاشة %Id"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "تعذّر الحصول على انتقاء مدير النوافذ على الشاشة %Id"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "تعذّر الحصول على انتقاء مدير النوافذ على الشاشة %Id"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "مدير النوافذ على الشاشة %Id لا وجود له"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "مدير النوافذ على الشاشة %Id لا وجود له"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "سطح المكتب %Ii"
 #, c-format
 msgid "desktop %i"
 msgstr "سطح المكتب %Ii"


@@ -339,9 +337,3 @@ msgstr "المفتاح المطلوب '%s' لا وجود له في العرض"
 #, c-format
 msgid "X Error: %s"
 msgstr "خطأ إكس: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "خطأ إكس: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "طُلِب إجراء '%s' غير سليم. لا يوجد إجراء كهذا."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "استخدام غير سليم للإجراء '%s'. سيُتَجاهل هذا الإجراء."

diff --git a/po/bn_IN.po b/po/bn_IN.po
index e7df440..29102d4 100644 (file)
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -5,9 +5,9 @@
 # Runa Bhattacharjee <runabh@gmail.com>, 2007.
 msgid ""
 msgstr ""
 # Runa Bhattacharjee <runabh@gmail.com>, 2007.
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-06-01 19:02+0530\n"
 "Last-Translator: Runa Bhattacharjee <runabh@gmail.com>\n"
 "Language-Team: Bengali (India) <en@li.org>\n"
 "PO-Revision-Date: 2007-06-01 19:02+0530\n"
 "Last-Translator: Runa Bhattacharjee <runabh@gmail.com>\n"
 "Language-Team: Bengali (India) <en@li.org>\n"


@@ -17,186 +17,185 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "'%s' পাথটি utf8 থেকে রূপান্তর করতে ব্যর্থ"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr ""
+"অবৈধ কর্ম '%s'-র অনুরোধ জানানো হয়েছে। এই ধরনের কোনো কর্ম বর্তমানে উপস্থিত নেই।"
+
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "'%s' কর্মের অবৈধ ব্যবহার। কর্ম উপেক্ষা করা হবে।"

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "'%s' সঞ্চালন করতে ব্যর্থ: %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "'%s' সঞ্চালন করতে ব্যর্থ: %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "'%s' পাথটি utf8 থেকে রূপান্তর করতে ব্যর্থ"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "চিহ্নিত স্থানে চলুন..."
 
 msgid "Go there..."
 msgstr "চিহ্নিত স্থানে চলুন..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "উইন্ডো"
 
 msgid "Windows"
 msgstr "উইন্ডো"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "ডেস্কটপ"
 
 msgid "Desktops"
 msgstr "ডেস্কটপ"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "সর্বপ্রকার ডেস্কটপ"
 
 msgid "All desktops"
 msgstr "সর্বপ্রকার ডেস্কটপ"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "স্তর (_L)"
 
 msgid "_Layer"
 msgstr "স্তর (_L)"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "সর্বদা উপরে (_t)"
 
 msgid "Always on _top"
 msgstr "সর্বদা উপরে (_t)"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "স্বাভাবিক (_N)"
 
 msgid "_Normal"
 msgstr "স্বাভাবিক (_N)"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "সর্বদা নীচে (_b)"
 
 msgid "Always on _bottom"
 msgstr "সর্বদা নীচে (_b)"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "ডেস্কটপে পাঠানো হবে (_S)"
 
 msgid "_Send to desktop"
 msgstr "ডেস্কটপে পাঠানো হবে (_S)"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "ক্লায়েন্ট মেনু"
 
 msgid "Client menu"
 msgstr "ক্লায়েন্ট মেনু"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "পুনরুদ্ধার (_e)"
 
 msgid "R_estore"
 msgstr "পুনরুদ্ধার (_e)"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "স্থানান্তরণ (_M)"
 
 msgid "_Move"
 msgstr "স্থানান্তরণ (_M)"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "মাপ পরিবর্তন (_z)"
 
 msgid "Resi_ze"
 msgstr "মাপ পরিবর্তন (_z)"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "আইকন রূপে প্রদর্শন (_n)"
 
 msgid "Ico_nify"
 msgstr "আইকন রূপে প্রদর্শন (_n)"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "বড় করুন (_x)"
 
 msgid "Ma_ximize"
 msgstr "বড় করুন (_x)"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "উপরে/নীচে গুটিয়ে নিন (_R)"
 
 msgid "_Roll up/down"
 msgstr "উপরে/নীচে গুটিয়ে নিন (_R)"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "বিন্যাস পরিবর্তন (_D)"
 
 msgid "Un/_Decorate"
 msgstr "বিন্যাস পরিবর্তন (_D)"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "বন্ধ করুন (_C)"
 
 msgid "_Close"
 msgstr "বন্ধ করুন (_C)"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "কনফিগ ফাইলে অবৈধ বাটন '%s' উল্লিখিত হয়েছে"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "কনফিগ ফাইলে অবৈধ বাটন '%s' উল্লিখিত হয়েছে"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "কনফিগ ফাইলে কি-বাইন্ডিং সংক্রান্ত দ্বন্দ্ব"
 
 msgid "Conflict with key binding in config file"
 msgstr "কনফিগ ফাইলে কি-বাইন্ডিং সংক্রান্ত দ্বন্দ্ব"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "বৈধ মেনু ফাইল '%s' সনাক্ত করতে ব্যর্থ"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "বৈধ মেনু ফাইল '%s' সনাক্ত করতে ব্যর্থ"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "পাইপ-মেনু '%s'-র জন্য কমান্ড সঞ্চালন করতে ব্যর্থ: %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "পাইপ-মেনু '%s'-র জন্য কমান্ড সঞ্চালন করতে ব্যর্থ: %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "পাইপ-মেনু '%s' থেকে অবৈধ ফলাফল প্রাপ্ত হয়েছে"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "পাইপ-মেনু '%s' থেকে অবৈধ ফলাফল প্রাপ্ত হয়েছে"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "অনুপস্থিত মেনু '%s' ব্যবহারের প্রচেষ্টা হয়েছে"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "অনুপস্থিত মেনু '%s' ব্যবহারের প্রচেষ্টা হয়েছে"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "অতিরিক্ত..."
 
 msgid "More..."
 msgstr "অতিরিক্ত..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "মাউস বাইন্ডিং সংক্রান্ত অবৈধ বাটন '%s'"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "মাউস বাইন্ডিং সংক্রান্ত অবৈধ বাটন '%s'"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "মাউস বাইন্ডিং সংক্রান্ত অবৈধ কনটেক্সট '%s'"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "মাউস বাইন্ডিং সংক্রান্ত অবৈধ কনটেক্সট '%s'"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "ব্যক্তিগত ডিরেক্টরি '%s'-তে পরিবর্তন করতে ব্যর্থ: %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "ব্যক্তিগত ডিরেক্টরি '%s'-তে পরিবর্তন করতে ব্যর্থ: %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "DISPLAY এনভাশরনমেন্ট ভেরিয়েবলের মান প্রয়োগ করে প্রদর্শন আরম্ভ করতে ব্যর্থ।"
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "DISPLAY এনভাশরনমেন্ট ভেরিয়েবলের মান প্রয়োগ করে প্রদর্শন আরম্ভ করতে ব্যর্থ।"
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "obrender লাইব্রেরি আরম্ভ করতে ব্যর্থ।"
 
 msgid "Failed to initialize the obrender library."
 msgstr "obrender লাইব্রেরি আরম্ভ করতে ব্যর্থ।"
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "X সার্ভার দ্বারা লোকেইল সমর্থিতত হয় না।"
 
 msgid "X server does not support locale."
 msgstr "X সার্ভার দ্বারা লোকেইল সমর্থিতত হয় না।"
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr "X সার্ভারের জন্য লোকেইল মডিফায়ার নির্ধারণ করতে ব্যর্থ।"
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr "X সার্ভারের জন্য লোকেইল মডিফায়ার নির্ধারণ করতে ব্যর্থ।"
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "বৈধ কনফিগ ফাইল সনাক্ত করতে ব্যর্থ, কয়েকটি সাধারণ ডিফল্ট মান প্রয়োগ করা হবে।"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "বৈধ কনফিগ ফাইল সনাক্ত করতে ব্যর্থ, কয়েকটি সাধারণ ডিফল্ট মান প্রয়োগ করা হবে।"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "থিম লোড করতে ব্যর্থ।"
 
 msgid "Unable to load a theme."
 msgstr "থিম লোড করতে ব্যর্থ।"
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "পুনরাম্ভের পরে নতুন এক্সেকিউটেবল '%s' সঞ্চালন করতে ব্যর্থ: %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "পুনরাম্ভের পরে নতুন এক্সেকিউটেবল '%s' সঞ্চালন করতে ব্যর্থ: %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "স্বত্বাধিকার (c)"
 
 msgid "Copyright (c)"
 msgstr "স্বত্বাধিকার (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "ব্যবহারপ্রণালী: openbox [বিকল্প]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "ব্যবহারপ্রণালী: openbox [বিকল্প]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -204,25 +203,25 @@ msgstr ""
 "\n"
 "বিবিধ বিকল্প:\n"
 
 "\n"
 "বিবিধ বিকল্প:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              সহায়তা বার্তা প্রদর্শন করে প্রস্থান\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              সহায়তা বার্তা প্রদর্শন করে প্রস্থান\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           সংস্করণ প্রদর্শন করে প্রস্থান\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           সংস্করণ প্রদর্শন করে প্রস্থান\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           বর্তমানে চলমান উইন্ডো পরিচালন ব্যবস্থা পরিবর্তন করা হবে\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           বর্তমানে চলমান উইন্ডো পরিচালন ব্যবস্থা পরিবর্তন করা হবে\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 "  --sm-disable        সেশান পরিচালন ব্যবস্থার সাথে সংযোগ নিষ্ক্রিয় করা হবে\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 "  --sm-disable        সেশান পরিচালন ব্যবস্থার সাথে সংযোগ নিষ্ক্রিয় করা হবে\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -230,15 +229,15 @@ msgstr ""
 "\n"
 "চলমান Openbox ইনস্ট্যান্সে বার্তা প্রেরণ:\n"
 
 "\n"
 "চলমান Openbox ইনস্ট্যান্সে বার্তা প্রেরণ:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Openbox-র কনফিগারেশন পুনরায় লোড করে\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Openbox-র কনফিগারেশন পুনরায় লোড করে\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Openbox পুনরারম্ভ\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Openbox পুনরারম্ভ\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -246,24 +245,24 @@ msgstr ""
 "\n"
 "ডিবাগ করার বিভিন্ন বিকল্প:\n"
 
 "\n"
 "ডিবাগ করার বিভিন্ন বিকল্প:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              সিঙ্ক্রোনাস মোডে সঞ্চালিত হবে\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              সিঙ্ক্রোনাস মোডে সঞ্চালিত হবে\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             ডিবাগ-এর ফলাফল প্রদর্শন করে\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             ডিবাগ-এর ফলাফল প্রদর্শন করে\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       ফোকাস হ্যান্ডলিং সংক্রান্ত ডিবাগের ফলাফল প্রদর্শন করে\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       ফোকাস হ্যান্ডলিং সংক্রান্ত ডিবাগের ফলাফল প্রদর্শন করে\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    প্রদর্শন ক্ষেত্রটি নকল xinerama পর্দায় ভাগ করা হবে\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    প্রদর্শন ক্ষেত্রটি নকল xinerama পর্দায় ভাগ করা হবে\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -272,27 +271,27 @@ msgstr ""
 "\n"
 "অনুগ্রহ করে %s-এ বাগ সংক্রান্ত সূচনা দায়ের করুন\n"
 
 "\n"
 "অনুগ্রহ করে %s-এ বাগ সংক্রান্ত সূচনা দায়ের করুন\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "অবৈধ কমান্ড-লাইন আর্গুমেন্ট '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "অবৈধ কমান্ড-লাইন আর্গুমেন্ট '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "একটি উইন্ডো পরিচালন ব্যবস্থা বর্তমানে %d-এ চলছে"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "একটি উইন্ডো পরিচালন ব্যবস্থা বর্তমানে %d-এ চলছে"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "পর্দা %d-এ উইন্ডো পরিচালন ব্যবস্থার নির্বাচিত অংশ প্রাপ্ত করতে ব্যর্থ"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "পর্দা %d-এ উইন্ডো পরিচালন ব্যবস্থার নির্বাচিত অংশ প্রাপ্ত করতে ব্যর্থ"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "পর্দা %d-র উপর চলমান উইন্ডো পরিচালন ব্যবস্থাটি বন্ধ করতে ব্যর্থ"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "পর্দা %d-র উপর চলমান উইন্ডো পরিচালন ব্যবস্থাটি বন্ধ করতে ব্যর্থ"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"


@@ -341,10 +340,3 @@ msgstr "অনুরোধ করা কি '%s', প্রদর্শন ক
 #, c-format
 msgid "X Error: %s"
 msgstr "X সংক্রান্ত ত্রুটি: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "X সংক্রান্ত ত্রুটি: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr ""
-#~ "অবৈধ কর্ম '%s'-র অনুরোধ জানানো হয়েছে। এই ধরনের কোনো কর্ম বর্তমানে উপস্থিত নেই।"
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "'%s' কর্মের অবৈধ ব্যবহার। কর্ম উপেক্ষা করা হবে।"

diff --git a/po/ca.po b/po/ca.po
index fa1c378..e82c374 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-05-28 15:54+0200\n"
 "Last-Translator: David Majà Martínez <davidmaja@gmail.com>\n"
 "Language-Team: catalan\n"
 "PO-Revision-Date: 2007-05-28 15:54+0200\n"
 "Last-Translator: David Majà Martínez <davidmaja@gmail.com>\n"
 "Language-Team: catalan\n"


@@ -15,191 +15,189 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "No s'ha pogut convertir el camí '%s' des de utf8"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "L'acció sol·licitada '%s' no és vàlida. Aquesta acció no existeix."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "L'ús de l'acció '%s' no és vàlid. S'ignorarà aquesta acció."
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "No s'ha pogut executar '%s': %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "No s'ha pogut executar '%s': %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "No s'ha pogut convertir el camí '%s' des de utf8"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Vés aquí..."
 
 msgid "Go there..."
 msgstr "Vés aquí..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Finestres"
 
 msgid "Windows"
 msgstr "Finestres"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Escriptoris"
 
 msgid "Desktops"
 msgstr "Escriptoris"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Tots els escriptoris"
 
 msgid "All desktops"
 msgstr "Tots els escriptoris"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "_Capa"
 
 msgid "_Layer"
 msgstr "_Capa"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Sempre a so_bre"
 
 msgid "Always on _top"
 msgstr "Sempre a so_bre"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "_Normal"
 
 msgid "_Normal"
 msgstr "_Normal"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Sempre a so_ta"
 
 msgid "Always on _bottom"
 msgstr "Sempre a so_ta"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "A l'_escriptori"
 
 msgid "_Send to desktop"
 msgstr "A l'_escriptori"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Menú del client"
 
 msgid "Client menu"
 msgstr "Menú del client"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "Restaur_a"
 
 msgid "R_estore"
 msgstr "Restaur_a"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "_Mou"
 
 msgid "_Move"
 msgstr "_Mou"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "Redimen_siona"
 
 msgid "Resi_ze"
 msgstr "Redimen_siona"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "Mi_nimitza"
 
 msgid "Ico_nify"
 msgstr "Mi_nimitza"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Ma_ximitza"
 
 msgid "Ma_ximize"
 msgstr "Ma_ximitza"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "En/Desen_rotlla"
 
 msgid "_Roll up/down"
 msgstr "En/Desen_rotlla"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "Sense/Amb _decoració"
 
 msgid "Un/_Decorate"
 msgstr "Sense/Amb _decoració"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "_Tanca"
 
 msgid "_Close"
 msgstr "_Tanca"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "El botó especificat al fitxer de configuració '%s' no és vàlid."
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "El botó especificat al fitxer de configuració '%s' no és vàlid."
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "Conflicte amb la tecla vinculada en el fitxer de configuració"
 
 msgid "Conflict with key binding in config file"
 msgstr "Conflicte amb la tecla vinculada en el fitxer de configuració"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "No s'ha pogut trobar un fitxer de menú '%s' vàlid"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "No s'ha pogut trobar un fitxer de menú '%s' vàlid"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr ""
 "S'ha produït un error en executar l'ordre per al menú de conducte '%s': %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr ""
 "S'ha produït un error en executar l'ordre per al menú de conducte '%s': %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "La sortida del menú de conducte '%s' no és vàlida"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "La sortida del menú de conducte '%s' no és vàlida"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "S'ha intentat accedir al menú '%s' ja que no existeix"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "S'ha intentat accedir al menú '%s' ja que no existeix"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "Més..."
 
 msgid "More..."
 msgstr "Més..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "El botó '%s' no és vàlid en la vinculació del ratolí"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "El botó '%s' no és vàlid en la vinculació del ratolí"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "El context '%s' no és vàlid en la vinculació del ratolí"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "El context '%s' no és vàlid en la vinculació del ratolí"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "No s'ha pogut canviar al directori de l'usuari '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "No s'ha pogut canviar al directori de l'usuari '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "No s'ha pogut obrir la pantalla des de la variable d'entorn DISPLAY"
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "No s'ha pogut obrir la pantalla des de la variable d'entorn DISPLAY"
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "S'ha produït un error en inicialitza la llibreria obrender."
 
 msgid "Failed to initialize the obrender library."
 msgstr "S'ha produït un error en inicialitza la llibreria obrender."
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "El servidor X no te suport per a idiomes"
 
 msgid "X server does not support locale."
 msgstr "El servidor X no te suport per a idiomes"
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr "No s'ha pogut assignar els modificadors del locale per al servidor X."
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr "No s'ha pogut assignar els modificadors del locale per al servidor X."
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "No s'ha pogut trobat un fitxer de configuració vàlid, s'utilitzaran alguns "
 "valors predeterminats"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "No s'ha pogut trobat un fitxer de configuració vàlid, s'utilitzaran alguns "
 "valors predeterminats"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "No s'ha pogut carregar el tema."
 
 msgid "Unable to load a theme."
 msgstr "No s'ha pogut carregar el tema."
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr ""
 "S'ha produït un error en tornar a iniciar i executar el nou executable '%s': "
 "%s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr ""
 "S'ha produït un error en tornar a iniciar i executar el nou executable '%s': "
 "%s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Sintaxis: openbox [opcions]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Sintaxis: openbox [opcions]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -207,25 +205,25 @@ msgstr ""
 "\n"
 "Opcions:\n"
 
 "\n"
 "Opcions:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Visualitza aquesta ajuda i surt\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Visualitza aquesta ajuda i surt\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Visualitza la versió i surt\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Visualitza la versió i surt\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           Reemplaça el gestor de finestres que s'està executant "
 "actualment\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           Reemplaça el gestor de finestres que s'està executant "
 "actualment\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Inhabilita la connexió amb gestor de sessió\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Inhabilita la connexió amb gestor de sessió\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -234,15 +232,15 @@ msgstr ""
 "S'està transferint missatges a la instància del Openbox que s'està "
 "executant:\n"
 
 "S'està transferint missatges a la instància del Openbox que s'està "
 "executant:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Torna a carregar la configuració de Openbox\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Torna a carregar la configuració de Openbox\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Torna a iniciar Openbox\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Torna a iniciar Openbox\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -250,27 +248,27 @@ msgstr ""
 "\n"
 "Opcions de depuració:\n"
 
 "\n"
 "Opcions de depuració:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Executa en mode sincronitzat\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Executa en mode sincronitzat\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Mostra la sortida de depuració\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Mostra la sortida de depuració\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Mostra la sortida de depuració per a la gestió del "
 "focus\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Mostra la sortida de depuració per a la gestió del "
 "focus\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Divideix la visualització en pantalles xinerama "
 "falses\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Divideix la visualització en pantalles xinerama "
 "falses\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -279,28 +277,28 @@ msgstr ""
 "\n"
 "Informeu dels errors a %s\n"
 
 "\n"
 "Informeu dels errors a %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Opció '%s' no vàlida a la línia d'ordres\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Opció '%s' no vàlida a la línia d'ordres\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Encara s'està executant un gestor de finestres a la pantalla %d"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Encara s'està executant un gestor de finestres a la pantalla %d"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 "No s'ha pogut adquirir la selecció del gestor de finestres en la pantalla %d"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 "No s'ha pogut adquirir la selecció del gestor de finestres en la pantalla %d"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "El gestor de finestres de la pantalla %d no està sortint"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "El gestor de finestres de la pantalla %d no està sortint"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "escriptori %i"
 #, c-format
 msgid "desktop %i"
 msgstr "escriptori %i"


@@ -350,9 +348,3 @@ msgstr "La tecla seleccionada '%s' no existeix a la pantalla"
 #, c-format
 msgid "X Error: %s"
 msgstr "Error d'X: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "Error d'X: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "L'acció sol·licitada '%s' no és vàlida. Aquesta acció no existeix."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "L'ús de l'acció '%s' no és vàlid. S'ignorarà aquesta acció."

diff --git a/po/cs.po b/po/cs.po
index 5e0ca0f..b2ff125 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-06-04 12:46+0200\n"
 "Last-Translator: tezlo <tezlo@gmx.net>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "PO-Revision-Date: 2007-06-04 12:46+0200\n"
 "Last-Translator: tezlo <tezlo@gmx.net>\n"
 "Language-Team: Czech <cs@li.org>\n"


@@ -15,193 +15,191 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Nepodařilo se převést cestu '%s' z utf8"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Požadována neplatná akce '%s'. Žádná taková akce neexistuje."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Neplatné užití akce '%s'. Akce bude ignorována."
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Nepodařilo se spustit '%s': %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Nepodařilo se spustit '%s': %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Nepodařilo se převést cestu '%s' z utf8"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Jdi tam..."
 
 msgid "Go there..."
 msgstr "Jdi tam..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Okna"
 
 msgid "Windows"
 msgstr "Okna"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Plochy"
 
 msgid "Desktops"
 msgstr "Plochy"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Všechny plochy"
 
 # TODO: standart pro klavesy?
 msgid "All desktops"
 msgstr "Všechny plochy"
 
 # TODO: standart pro klavesy?

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "V_rstva"
 
 msgid "_Layer"
 msgstr "V_rstva"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Vždy na_vrchu"
 
 msgid "Always on _top"
 msgstr "Vždy na_vrchu"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "_Normální"
 
 msgid "_Normal"
 msgstr "_Normální"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Vždy ve_spodu"
 
 msgid "Always on _bottom"
 msgstr "Vždy ve_spodu"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "_Poslat na plochu"
 
 msgid "_Send to desktop"
 msgstr "_Poslat na plochu"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Menu klienta"
 
 msgid "Client menu"
 msgstr "Menu klienta"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "_Obnovit"
 
 msgid "R_estore"
 msgstr "_Obnovit"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "Přes_unout"
 
 msgid "_Move"
 msgstr "Přes_unout"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "Veli_kost"
 
 msgid "Resi_ze"
 msgstr "Veli_kost"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "Mi_nimalizovat"
 
 msgid "Ico_nify"
 msgstr "Mi_nimalizovat"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Ma_ximalizovat"
 
 # TODO: zavedeny termin?
 msgid "Ma_ximize"
 msgstr "Ma_ximalizovat"
 
 # TODO: zavedeny termin?

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "S_rolovat/Vyrolovat"
 
 # TODO: ditto
 msgid "_Roll up/down"
 msgstr "S_rolovat/Vyrolovat"
 
 # TODO: ditto

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "Oz_dobit/Odzdobit"
 
 msgid "Un/_Decorate"
 msgstr "Oz_dobit/Odzdobit"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "_Zavřít"
 
 msgid "_Close"
 msgstr "_Zavřít"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Neplatné tlačítko '%s' v konfiguračním souboru"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Neplatné tlačítko '%s' v konfiguračním souboru"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "Konflikt klávesových zkratek v konfiguračním souboru"
 
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt klávesových zkratek v konfiguračním souboru"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Nepodařilo se najít platný menu soubor '%s'"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Nepodařilo se najít platný menu soubor '%s'"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Nepodařilo se spustit příkaz pro pipe-menu '%s': %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Nepodařilo se spustit příkaz pro pipe-menu '%s': %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Neplatný výstup z pipe-menu '%s'"
 
 # TODO: heh
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Neplatný výstup z pipe-menu '%s'"
 
 # TODO: heh

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Pokus o přístup k menu '%s', ale ono neexistuje"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Pokus o přístup k menu '%s', ale ono neexistuje"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "Víc..."
 
 msgid "More..."
 msgstr "Víc..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Neplatné tlačítko '%s' v nastavení myši"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Neplatné tlačítko '%s' v nastavení myši"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Neplatný kontext '%s' v nastavení myši"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Neplatný kontext '%s' v nastavení myši"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Nepodařilo se přejít do domácího adresáře '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Nepodařilo se přejít do domácího adresáře '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Nepodařilo se otevřít displej z proměnné prostředí DISPLAY."
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Nepodařilo se otevřít displej z proměnné prostředí DISPLAY."
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Nepodařilo se inicializovat knihovnu obrender."
 
 msgid "Failed to initialize the obrender library."
 msgstr "Nepodařilo se inicializovat knihovnu obrender."
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "X server nepodporuje lokalizaci."
 
 # TODO: uff, fixme?
 msgid "X server does not support locale."
 msgstr "X server nepodporuje lokalizaci."
 
 # TODO: uff, fixme?

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr "Nelze nastavit modifikátory lokalizace pro X server."
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Nelze nastavit modifikátory lokalizace pro X server."
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Nepodařilo se najít platný konfigurační soubor, pokračuji s výchozím "
 "nastavením"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Nepodařilo se najít platný konfigurační soubor, pokračuji s výchozím "
 "nastavením"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "Nepodařilo se načíst motiv."
 
 msgid "Unable to load a theme."
 msgstr "Nepodařilo se načíst motiv."
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Při restartu se nepodařilo spustit nový program '%s': %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Při restartu se nepodařilo spustit nový program '%s': %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Syntaxe: openbox [přepínače]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntaxe: openbox [přepínače]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -209,23 +207,23 @@ msgstr ""
 "\n"
 "Přepínače:\n"
 
 "\n"
 "Přepínače:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Zobrazit tuto nápovědu a skončit\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Zobrazit tuto nápovědu a skončit\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Zobrazit verzi a skončit\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Zobrazit verzi a skončit\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Nahradit běžící window manager\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Nahradit běžící window manager\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Nepřipojovat se k session manageru\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Nepřipojovat se k session manageru\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -233,15 +231,15 @@ msgstr ""
 "\n"
 "Zasílání zpráv běžící instanci Openbox:\n"
 
 "\n"
 "Zasílání zpráv běžící instanci Openbox:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Znovu načíst konfiguraci Openbox\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Znovu načíst konfiguraci Openbox\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Restartovat Openbox\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Restartovat Openbox\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -249,24 +247,24 @@ msgstr ""
 "\n"
 "Ladící přepínače:\n"
 
 "\n"
 "Ladící přepínače:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Spustit v synchronním módu\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Spustit v synchronním módu\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Zobrazit ladící výstup\n"
 
 # TODO: fixme
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Zobrazit ladící výstup\n"
 
 # TODO: fixme

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Zobrazit ladící výstup pro správu oken\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Zobrazit ladící výstup pro správu oken\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Rozdělit displej na falešné obrazovky xinerama\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Rozdělit displej na falešné obrazovky xinerama\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -275,27 +273,27 @@ msgstr ""
 "\n"
 "Prosím hlašte chyby na %s\n"
 
 "\n"
 "Prosím hlašte chyby na %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Neplatný argument příkazové řádky '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Neplatný argument příkazové řádky '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Na obrazovce %d již nějaký window manager běží"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Na obrazovce %d již nějaký window manager běží"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Nepodařilo se získat výseč pro window manager na obrazovce %d"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Nepodařilo se získat výseč pro window manager na obrazovce %d"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Window manager na obrazovce %d ne a ne skončit"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Window manager na obrazovce %d ne a ne skončit"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "plochu %i"
 #, c-format
 msgid "desktop %i"
 msgstr "plochu %i"


@@ -345,9 +343,3 @@ msgstr "Požadovaná klávesa '%s' na displeji neexistuje"
 #, c-format
 msgid "X Error: %s"
 msgstr "X Chyba: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "X Chyba: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Požadována neplatná akce '%s'. Žádná taková akce neexistuje."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Neplatné užití akce '%s'. Akce bude ignorována."

diff --git a/po/de.po b/po/de.po
index c8e5eb4..fa1b516 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -5,9 +5,9 @@
 # Simon A. Wilper <simonaw@openoffice.org>, Apr 2007
 msgid ""
 msgstr ""
 # Simon A. Wilper <simonaw@openoffice.org>, Apr 2007
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-06-04 00:47+0200\n"
 "Last-Translator: Sebastian Sareyko <public@nooms.de>\n"
 "Language-Team:  <de@li.org>\n"
 "PO-Revision-Date: 2007-06-04 00:47+0200\n"
 "Last-Translator: Sebastian Sareyko <public@nooms.de>\n"
 "Language-Team:  <de@li.org>\n"


@@ -15,189 +15,187 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Konnte Pfad '%s' nicht von utf8 konvertieren"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Unzulässige Aktion '%s' angefordert. Diese Aktion existiert nicht."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Unzulässiger Einsatz der Aktion '%s'. Aktion wird ignoriert."
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Konnte '%s' nicht ausführen: %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Konnte '%s' nicht ausführen: %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Konnte Pfad '%s' nicht von utf8 konvertieren"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Gehe zu..."
 
 msgid "Go there..."
 msgstr "Gehe zu..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Fenster"
 
 msgid "Windows"
 msgstr "Fenster"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Desktops"
 
 msgid "Desktops"
 msgstr "Desktops"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Alle Desktops"
 
 msgid "All desktops"
 msgstr "Alle Desktops"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "_Layer"
 
 msgid "_Layer"
 msgstr "_Layer"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Immer im _Vordergrund"
 
 msgid "Always on _top"
 msgstr "Immer im _Vordergrund"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "_Normal"
 
 msgid "_Normal"
 msgstr "_Normal"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Immer im _Hintergrund"
 
 msgid "Always on _bottom"
 msgstr "Immer im _Hintergrund"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "_An Desktop senden"
 
 msgid "_Send to desktop"
 msgstr "_An Desktop senden"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Client menu"
 
 msgid "Client menu"
 msgstr "Client menu"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "Wi_ederherstellen"
 
 msgid "R_estore"
 msgstr "Wi_ederherstellen"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "Vers_chieben"
 
 msgid "_Move"
 msgstr "Vers_chieben"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "_Größe ändern"
 
 msgid "Resi_ze"
 msgstr "_Größe ändern"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "Mi_nimieren"
 
 msgid "Ico_nify"
 msgstr "Mi_nimieren"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Ma_ximieren"
 
 msgid "Ma_ximize"
 msgstr "Ma_ximieren"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "Auf/Ab_rollen"
 
 msgid "_Roll up/down"
 msgstr "Auf/Ab_rollen"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "Dekoration entfernen/_Dekorieren"
 
 msgid "Un/_Decorate"
 msgstr "Dekoration entfernen/_Dekorieren"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "_Schließen"
 
 msgid "_Close"
 msgstr "_Schließen"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Unzulässiger Knopf '%s' in der Konfigurationsdatei angegeben"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Unzulässiger Knopf '%s' in der Konfigurationsdatei angegeben"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "Konflikt mit Tastenkombination in der Konfigurationsdatei"
 
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt mit Tastenkombination in der Konfigurationsdatei"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Konnte keine gültige Menü-Datei '%s' finden"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Konnte keine gültige Menü-Datei '%s' finden"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Konnte Befehl '%s' für pipe-menu nicht ausführen: %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Konnte Befehl '%s' für pipe-menu nicht ausführen: %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Ungültige Ausgabe vom pipe-menu '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Ungültige Ausgabe vom pipe-menu '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Das Menü '%s' wurde bei dem Versuch darauf zuzugreifen nicht gefunden"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Das Menü '%s' wurde bei dem Versuch darauf zuzugreifen nicht gefunden"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "Mehr..."
 
 msgid "More..."
 msgstr "Mehr..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Maus-Binding enthält ungültigen Button '%s'"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Maus-Binding enthält ungültigen Button '%s'"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Maus-Binding enthält ungültigen Kontext '%s'"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Maus-Binding enthält ungültigen Kontext '%s'"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Konnte nicht in das Heimatverzeichnis '%s' wechseln: %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Konnte nicht in das Heimatverzeichnis '%s' wechseln: %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Konnte das display aus der Umgebungsvariable DISPLAY nicht öffnen."
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Konnte das display aus der Umgebungsvariable DISPLAY nicht öffnen."
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Konnte die obrender Bibliothek nicht initialisieren."
 
 msgid "Failed to initialize the obrender library."
 msgstr "Konnte die obrender Bibliothek nicht initialisieren."
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "Die gewählte Lokalisierung wird vom X-Server nicht unterstützt."
 
 msgid "X server does not support locale."
 msgstr "Die gewählte Lokalisierung wird vom X-Server nicht unterstützt."
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 "Die Lokalisierungsmodifizierer für den X-Server konnten nicht gesetzt werden."
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 "Die Lokalisierungsmodifizierer für den X-Server konnten nicht gesetzt werden."
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Es wurde keine gültige Konfigurationsdatei gefunden, benutze einfache "
 "Standardwerte."
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Es wurde keine gültige Konfigurationsdatei gefunden, benutze einfache "
 "Standardwerte."
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "Konnte kein Thema laden."
 
 msgid "Unable to load a theme."
 msgstr "Konnte kein Thema laden."
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Neustart fehlgeschlagen, um die ausführbare Datei '%s' zu starten: %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Neustart fehlgeschlagen, um die ausführbare Datei '%s' zu starten: %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [Optionen]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [Optionen]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -205,23 +203,23 @@ msgstr ""
 "\n"
 "Optionen:\n"
 
 "\n"
 "Optionen:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Diese Hilfe anzeigen und beenden\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Diese Hilfe anzeigen und beenden\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Version anzeigen und beenden\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Version anzeigen und beenden\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Den aktuell laufenden Fenstermanager ersetzen\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Den aktuell laufenden Fenstermanager ersetzen\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Keine Verbindung zum Sitzungsmanager aufbauen\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Keine Verbindung zum Sitzungsmanager aufbauen\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -229,15 +227,15 @@ msgstr ""
 "\n"
 "Nachrichten an eine laufende Openbox-Instanz weiterleiten:\n"
 
 "\n"
 "Nachrichten an eine laufende Openbox-Instanz weiterleiten:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Openbox's Konfiguration neu laden\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Openbox's Konfiguration neu laden\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Openbox neu starten\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Openbox neu starten\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -245,25 +243,25 @@ msgstr ""
 "\n"
 "Debugging Optionen:\n"
 
 "\n"
 "Debugging Optionen:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              im Synchronisierungsmodus starten\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              im Synchronisierungsmodus starten\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Debugging-Informationen anzeigen\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Debugging-Informationen anzeigen\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Debugging-Informationen fürs Fokus-Handling anzeigen\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Debugging-Informationen fürs Fokus-Handling anzeigen\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Anzeige in künstliche Xinerama Bildschirme aufteilen\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Anzeige in künstliche Xinerama Bildschirme aufteilen\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -272,27 +270,27 @@ msgstr ""
 "\n"
 "Bitte melden Sie Bugreports an: %s\n"
 
 "\n"
 "Bitte melden Sie Bugreports an: %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Ungültiges Kommandozeilen Argument '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Ungültiges Kommandozeilen Argument '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Ein Fenstermanager läuft bereits auf Bildschirm %d"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Ein Fenstermanager läuft bereits auf Bildschirm %d"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Konnte die Fenstermanager auswahl auf Bildschirm %d nicht reservieren"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Konnte die Fenstermanager auswahl auf Bildschirm %d nicht reservieren"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Der Fenstermanager auf Bildschirm %d beendet sich nicht"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Der Fenstermanager auf Bildschirm %d beendet sich nicht"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"


@@ -341,9 +339,3 @@ msgstr "Angeforderte Taste '%s' existiert nicht auf dem Display"
 #, c-format
 msgid "X Error: %s"
 msgstr "X Fehler: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "X Fehler: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Unzulässige Aktion '%s' angefordert. Diese Aktion existiert nicht."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Unzulässiger Einsatz der Aktion '%s'. Aktion wird ignoriert."

diff --git a/po/es.po b/po/es.po
index b693a50..43e33dd 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -5,9 +5,9 @@
 # Gustavo Varela <gustavo.varela [en] gmail [punto] com>, 2007
 msgid ""
 msgstr ""
 # Gustavo Varela <gustavo.varela [en] gmail [punto] com>, 2007
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-05-22 20:48+0200\n"
 "Last-Translator:  Gustavo Varela <gustavo.varela [en] gmail [punto] com>\n"
 "Language-Team: None\n"
 "PO-Revision-Date: 2007-05-22 20:48+0200\n"
 "Last-Translator:  Gustavo Varela <gustavo.varela [en] gmail [punto] com>\n"
 "Language-Team: None\n"


@@ -15,188 +15,186 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Falló al convertir el path '%s' desde utf8"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "La acción '%s' solicitada es inválida. No existe tal acción."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Uso inválido de la acción '%s'. La acción sera ignorada."
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Falló al ejecutar '%s': %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Falló al ejecutar '%s': %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Falló al convertir el path '%s' desde utf8"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Ir ahí..."
 
 msgid "Go there..."
 msgstr "Ir ahí..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Ventanas"
 
 msgid "Windows"
 msgstr "Ventanas"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Escritorios"
 
 msgid "Desktops"
 msgstr "Escritorios"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Todos los escritorios"
 
 msgid "All desktops"
 msgstr "Todos los escritorios"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "_Capa"
 
 msgid "_Layer"
 msgstr "_Capa"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Siempre _encima"
 
 msgid "Always on _top"
 msgstr "Siempre _encima"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "_Normal"
 
 msgid "_Normal"
 msgstr "_Normal"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Siempre _debajo"
 
 msgid "Always on _bottom"
 msgstr "Siempre _debajo"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "_Enviar a escritorio"
 
 msgid "_Send to desktop"
 msgstr "_Enviar a escritorio"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Menú del cliente"
 
 msgid "Client menu"
 msgstr "Menú del cliente"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "Rest_aurar"
 
 msgid "R_estore"
 msgstr "Rest_aurar"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "_Mover"
 
 msgid "_Move"
 msgstr "_Mover"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "Redimen_sionar"
 
 msgid "Resi_ze"
 msgstr "Redimen_sionar"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "Mi_nimizar"
 
 msgid "Ico_nify"
 msgstr "Mi_nimizar"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Ma_ximizar"
 
 msgid "Ma_ximize"
 msgstr "Ma_ximizar"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "En/Desen_rollar"
 
 msgid "_Roll up/down"
 msgstr "En/Desen_rollar"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "_Decorar"
 
 msgid "Un/_Decorate"
 msgstr "_Decorar"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "_Cerrar"
 
 msgid "_Close"
 msgstr "_Cerrar"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Botón invalido '%s' especificado en el archivo de configuración"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Botón invalido '%s' especificado en el archivo de configuración"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "Conflicto con la combinación de teclas en el archivo de configuración"
 
 msgid "Conflict with key binding in config file"
 msgstr "Conflicto con la combinación de teclas en el archivo de configuración"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "No es posible encontrar un archivo de menú '%s' valido"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "No es posible encontrar un archivo de menú '%s' valido"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Falló al ejecutar el comando para el pipe-menu '%s': '%s'"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Falló al ejecutar el comando para el pipe-menu '%s': '%s'"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Salida inválida del pipe-menu '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Salida inválida del pipe-menu '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Intentó acceder al menú '%s' pero este no existe"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Intentó acceder al menú '%s' pero este no existe"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "Más..."
 
 msgid "More..."
 msgstr "Más..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Botón inválido '%s' en mouse binding"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Botón inválido '%s' en mouse binding"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Contexto inválido '%s' en mouse binding"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Contexto inválido '%s' en mouse binding"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "No es posible cambiar al directorio home '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "No es posible cambiar al directorio home '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Falló abrir la pantalla desde la variable de entorno DISPLAY"
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Falló abrir la pantalla desde la variable de entorno DISPLAY"
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Falló la inicialización de la librería obrender"
 
 msgid "Failed to initialize the obrender library."
 msgstr "Falló la inicialización de la librería obrender"
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "El servidor X no soporta locale."
 
 msgid "X server does not support locale."
 msgstr "El servidor X no soporta locale."
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr "No se puede establecer los modificadores locale para el servidor X."
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr "No se puede establecer los modificadores locale para el servidor X."
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "No es posible encontrar un archivo de configuración valido, usando algunos "
 "por defecto"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "No es posible encontrar un archivo de configuración valido, usando algunos "
 "por defecto"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "No es posible cargar el tema."
 
 msgid "Unable to load a theme."
 msgstr "No es posible cargar el tema."
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Reiniciada falló en ejecutar nuevo ejecutable '%s': %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Reiniciada falló en ejecutar nuevo ejecutable '%s': %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Sintaxis: openbox [opciones]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Sintaxis: openbox [opciones]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -204,26 +202,26 @@ msgstr ""
 "\n"
 "Opciones\n"
 
 "\n"
 "Opciones\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Muestra esta ayuda y sale\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Muestra esta ayuda y sale\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Muestra la versión y sale\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Muestra la versión y sale\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace            Remplaza el gestor de ventanas que esta corriendo "
 "actualmente\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace            Remplaza el gestor de ventanas que esta corriendo "
 "actualmente\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 "  --sm-disable        Deshabilita la conexión con el gestor de sesión\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 "  --sm-disable        Deshabilita la conexión con el gestor de sesión\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -231,15 +229,15 @@ msgstr ""
 "\n"
 "Pasando mensajes a la instancia que esta corriendo de Openbox:\n"
 
 "\n"
 "Pasando mensajes a la instancia que esta corriendo de Openbox:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Recarga la configuración de Openbox\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Recarga la configuración de Openbox\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Reinicia Openbox\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Reinicia Openbox\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -247,25 +245,25 @@ msgstr ""
 "\n"
 "Opciones de depuración:\n"
 
 "\n"
 "Opciones de depuración:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Correr en modo sincrónico\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Correr en modo sincrónico\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Mostrar salida del depurador\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Mostrar salida del depurador\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Mostrar salida del depurador para focus handling\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Mostrar salida del depurador para focus handling\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Separar la pantalla en pantallas de xinerama falsas\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Separar la pantalla en pantallas de xinerama falsas\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -274,28 +272,28 @@ msgstr ""
 "\n"
 "Por favor reportar errores a %s\n"
 
 "\n"
 "Por favor reportar errores a %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Argumento de linea de comando inválido '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Argumento de linea de comando inválido '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Un gestor de ventanas ya esta corriendo en la pantalla %d"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Un gestor de ventanas ya esta corriendo en la pantalla %d"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 "No se pudo obtener el gestor de ventanas para la selección de pantalla %d"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 "No se pudo obtener el gestor de ventanas para la selección de pantalla %d"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "El WM en la pantalla %d no esta saliendo"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "El WM en la pantalla %d no esta saliendo"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "Escritorio %i"
 #, c-format
 msgid "desktop %i"
 msgstr "Escritorio %i"


@@ -344,9 +342,3 @@ msgstr "Tecla solicitada '%s' no existe en la pantalla"
 #, c-format
 msgid "X Error: %s"
 msgstr "Error en X: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "Error en X: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "La acción '%s' solicitada es inválida. No existe tal acción."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Uso inválido de la acción '%s'. La acción sera ignorada."

diff --git a/po/et.po b/po/et.po
index e1b4e29..28aa10c 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -5,9 +5,9 @@
 # Andres Järv <andresjarv@gmail.com>, 2007.
 msgid ""
 msgstr ""
 # Andres Järv <andresjarv@gmail.com>, 2007.
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-05-21 20:11+0300\n"
 "Last-Translator: Andres Järv <andresjarv@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "PO-Revision-Date: 2007-05-21 20:11+0300\n"
 "Last-Translator: Andres Järv <andresjarv@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"


@@ -17,188 +17,186 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Raja '%s' ümberkodeerimine UTF8-st ebaõnnestus"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Taotleti kehtetut käsklust '%s'. Sellist käsklust pole olemas."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Käskluse '%s' kasutus on kehtetu. Käsklust ignoreeritakse."
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "'%s' käivitamine ebaõnnestus: %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "'%s' käivitamine ebaõnnestus: %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Raja '%s' ümberkodeerimine UTF8-st ebaõnnestus"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Mine sinna..."
 
 msgid "Go there..."
 msgstr "Mine sinna..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Aknad"
 
 msgid "Windows"
 msgstr "Aknad"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Töölauad"
 
 msgid "Desktops"
 msgstr "Töölauad"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Kõik töölauad"
 
 msgid "All desktops"
 msgstr "Kõik töölauad"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "_Kiht"
 
 msgid "_Layer"
 msgstr "_Kiht"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Aken teiste _peal"
 
 msgid "Always on _top"
 msgstr "Aken teiste _peal"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "_Normaalne"
 
 msgid "_Normal"
 msgstr "_Normaalne"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Aken teiste _all"
 
 msgid "Always on _bottom"
 msgstr "Aken teiste _all"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "_Saada töölauale"
 
 msgid "_Send to desktop"
 msgstr "_Saada töölauale"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Kliendi menüü"
 
 msgid "Client menu"
 msgstr "Kliendi menüü"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "_Taasta"
 
 msgid "R_estore"
 msgstr "_Taasta"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "_Liiguta"
 
 msgid "_Move"
 msgstr "_Liiguta"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "Muuda _suurust"
 
 msgid "Resi_ze"
 msgstr "Muuda _suurust"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "Muuda _ikooniks"
 
 msgid "Ico_nify"
 msgstr "Muuda _ikooniks"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Ma_ksimeeri"
 
 msgid "Ma_ximize"
 msgstr "Ma_ksimeeri"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "_Rulli üles/alla"
 
 msgid "_Roll up/down"
 msgstr "_Rulli üles/alla"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "Äär_ed sisse/välja"
 
 msgid "Un/_Decorate"
 msgstr "Äär_ed sisse/välja"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "S_ulge"
 
 msgid "_Close"
 msgstr "S_ulge"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Vigane nupp '%s' määratletud konfiguratsioonifailis"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Vigane nupp '%s' määratletud konfiguratsioonifailis"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "Konflikt kiirklahviga konfiguratsioonifailis"
 
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt kiirklahviga konfiguratsioonifailis"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Ei suudetud leida kehtivat menüüfaili '%s'"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Ei suudetud leida kehtivat menüüfaili '%s'"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Ei suudetud käivitada torumenüü '%s' käsku: %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Ei suudetud käivitada torumenüü '%s' käsku: %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Vigane väljund torumenüüst '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Vigane väljund torumenüüst '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Üritati ligi pääseda menüüle '%s', aga seda pole olemas"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Üritati ligi pääseda menüüle '%s', aga seda pole olemas"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "Rohkem..."
 
 msgid "More..."
 msgstr "Rohkem..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Vigane nupp '%s' hiire kiirklahvides"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Vigane nupp '%s' hiire kiirklahvides"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Vigane kontekst '%s' hiire kiirklahvides"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Vigane kontekst '%s' hiire kiirklahvides"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Ei suudetud siseneda kodukataloogi '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Ei suudetud siseneda kodukataloogi '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "DISPLAY keskkonnamuutujas oleva ekraani avamine ebaõnnestus."
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "DISPLAY keskkonnamuutujas oleva ekraani avamine ebaõnnestus."
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Obrender-damisteegi käivitamine ebaõnnestus."
 
 msgid "Failed to initialize the obrender library."
 msgstr "Obrender-damisteegi käivitamine ebaõnnestus."
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "X server ei toeta lokaati."
 
 msgid "X server does not support locale."
 msgstr "X server ei toeta lokaati."
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr "Ei suudetud sättida lokaadimuutujaid X serveri jaoks."
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Ei suudetud sättida lokaadimuutujaid X serveri jaoks."
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Ei suudetud leida kehtivat konfiguratsioonifaili, kasutatakse lihtsaid "
 "vaikimisi seadeid"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Ei suudetud leida kehtivat konfiguratsioonifaili, kasutatakse lihtsaid "
 "vaikimisi seadeid"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "Ei suudetud laadida teemat."
 
 msgid "Unable to load a theme."
 msgstr "Ei suudetud laadida teemat."
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Taaskäivitusel ebaõnnestus uue käivitusfaili '%s' käivitamine: %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Taaskäivitusel ebaõnnestus uue käivitusfaili '%s' käivitamine: %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Autoriõigused (c)"
 
 msgid "Copyright (c)"
 msgstr "Autoriõigused (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Süntaks: openbox [seaded]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Süntaks: openbox [seaded]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -206,23 +204,23 @@ msgstr ""
 "\n"
 "Seaded:\n"
 
 "\n"
 "Seaded:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Selle abi kuvamine ja väljumine\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Selle abi kuvamine ja väljumine\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Versiooni kuvamine ja väljumine\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Versiooni kuvamine ja väljumine\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Hetkel töötava aknahalduri asendamine\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Hetkel töötava aknahalduri asendamine\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Seansihalduriga ühenduse keelamine\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Seansihalduriga ühenduse keelamine\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -230,15 +228,15 @@ msgstr ""
 "\n"
 "Jooksvale Openboxi seansile sõnumite edastamine:\n"
 
 "\n"
 "Jooksvale Openboxi seansile sõnumite edastamine:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Openboxi konfiguratsioon uuesti laadimine\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Openboxi konfiguratsioon uuesti laadimine\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Openboxi taaskäivitamine\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Openboxi taaskäivitamine\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -246,23 +244,23 @@ msgstr ""
 "\n"
 "Silumise seaded:\n"
 
 "\n"
 "Silumise seaded:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Sünkroonselt jooksutamine\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Sünkroonselt jooksutamine\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Silumisväljundi kuvamine\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Silumisväljundi kuvamine\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Fookusekäsitluse siluriväljundi kuvamine\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Fookusekäsitluse siluriväljundi kuvamine\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Ekraani võlts-Xinerama ekraanideks jagamine\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Ekraani võlts-Xinerama ekraanideks jagamine\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -271,27 +269,27 @@ msgstr ""
 "\n"
 "Palun teata vigadest siia %s\n"
 
 "\n"
 "Palun teata vigadest siia %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Vigane käsurea argument '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Vigane käsurea argument '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Ekraanil %d juba jookseb aknahaldur"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Ekraanil %d juba jookseb aknahaldur"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Ei suuda hankida aknahaldurite loetelu ekraanil %d"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Ei suuda hankida aknahaldurite loetelu ekraanil %d"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Aknahaldur ekraanil %d ei sulgu"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Aknahaldur ekraanil %d ei sulgu"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "töölaud %i"
 #, c-format
 msgid "desktop %i"
 msgstr "töölaud %i"


@@ -340,9 +338,3 @@ msgstr "Soovitud klahvi '%s' ei ole sellel ekraanil"
 #, c-format
 msgid "X Error: %s"
 msgstr "X-i viga: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "X-i viga: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Taotleti kehtetut käsklust '%s'. Sellist käsklust pole olemas."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Käskluse '%s' kasutus on kehtetu. Käsklust ignoreeritakse."

diff --git a/po/fi.po b/po/fi.po
index 7d78345..10e17b1 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: openbox 3.4.2\n"
+"Project-Id-Version: openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-05-21 00:06+0200\n"
 "Last-Translator: Lauri Hakko\n"
 "Language-Team: None\n"
 "PO-Revision-Date: 2007-05-21 00:06+0200\n"
 "Last-Translator: Lauri Hakko\n"
 "Language-Team: None\n"


@@ -16,188 +16,186 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Polun muuntaminen utf8:sta epäonnistui: '%s'"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Virheellinen toiminto '%s'. Toimintoa ei ole olemassa"

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Toiminnon virheellinen käyttö '%s'. Toiminto ohitetaan"
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Ohjelman suorittaminen epäonnistui '%s': %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Ohjelman suorittaminen epäonnistui '%s': %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Polun muuntaminen utf8:sta epäonnistui: '%s'"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Näytä tämä..."
 
 msgid "Go there..."
 msgstr "Näytä tämä..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Ikkunat"
 
 msgid "Windows"
 msgstr "Ikkunat"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Työtilat"
 
 msgid "Desktops"
 msgstr "Työtilat"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Kaikkiin työtiloihin"
 
 msgid "All desktops"
 msgstr "Kaikkiin työtiloihin"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "_Kerros"
 
 msgid "_Layer"
 msgstr "_Kerros"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Aina _päällimmäinen"
 
 msgid "Always on _top"
 msgstr "Aina _päällimmäinen"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "_Tavallinen"
 
 msgid "_Normal"
 msgstr "_Tavallinen"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Aina _alimmainen"
 
 msgid "Always on _bottom"
 msgstr "Aina _alimmainen"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "_Lähetä työtilaan"
 
 msgid "_Send to desktop"
 msgstr "_Lähetä työtilaan"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Ikkunan valikko"
 
 msgid "Client menu"
 msgstr "Ikkunan valikko"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "_Palauta"
 
 msgid "R_estore"
 msgstr "_Palauta"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "S_iirrä"
 
 msgid "_Move"
 msgstr "S_iirrä"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "_Muuta kokoa"
 
 msgid "Resi_ze"
 msgstr "_Muuta kokoa"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "Pie_nennä"
 
 msgid "Ico_nify"
 msgstr "Pie_nennä"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Suurenn_a"
 
 msgid "Ma_ximize"
 msgstr "Suurenn_a"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "Rullaa ylös/alas"
 
 msgid "_Roll up/down"
 msgstr "Rullaa ylös/alas"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "(Epä)reunusta"
 
 msgid "Un/_Decorate"
 msgstr "(Epä)reunusta"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "_Sulje"
 
 msgid "_Close"
 msgstr "_Sulje"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Virheellinen painike '%s' määritelty konfiguraatio tiedostossa"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Virheellinen painike '%s' määritelty konfiguraatio tiedostossa"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "Päällekäisiä key bindejä konfiguraatio tiedostossa"
 
 msgid "Conflict with key binding in config file"
 msgstr "Päällekäisiä key bindejä konfiguraatio tiedostossa"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Toimivaa menu tiedostoa ei löytynyt '%s'"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Toimivaa menu tiedostoa ei löytynyt '%s'"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Putki-menun komennon suorittaminen epäonnistui '%s': %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Putki-menun komennon suorittaminen epäonnistui '%s': %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Virheellinen tulos putki-menusta '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Virheellinen tulos putki-menusta '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Menun '%s' lukemista yritettiin mutta sitä ei ole olemassa"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Menun '%s' lukemista yritettiin mutta sitä ei ole olemassa"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "Lisää..."
 
 msgid "More..."
 msgstr "Lisää..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Virheellinen nappi '%s' hiiribindeissä"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Virheellinen nappi '%s' hiiribindeissä"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Virheellinen asiayhteys '%s' hiiribindeissä"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Virheellinen asiayhteys '%s' hiiribindeissä"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Kotihakemistoon vaihtaminen epäonnistui '%s': '%s'"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Kotihakemistoon vaihtaminen epäonnistui '%s': '%s'"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr ""
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr ""
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Obrender kirjaston käynnistäminen epäonnistui"
 
 msgid "Failed to initialize the obrender library."
 msgstr "Obrender kirjaston käynnistäminen epäonnistui"
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "X serveri ei tue localea"
 
 msgid "X server does not support locale."
 msgstr "X serveri ei tue localea"
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Oikeanlaista konfiguraation tiedostoa ei löytynyt, käytetään joitain "
 "yksinkertaisia oletusarvoja"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Oikeanlaista konfiguraation tiedostoa ei löytynyt, käytetään joitain "
 "yksinkertaisia oletusarvoja"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "Teeman lataaminen epäonnistui"
 
 msgid "Unable to load a theme."
 msgstr "Teeman lataaminen epäonnistui"
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Uudelleenkäynnistyi epäonnistui käynnistämään uutta ohjelmaa '%s': %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Uudelleenkäynnistyi epäonnistui käynnistämään uutta ohjelmaa '%s': %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Tekijänoikeudet (c)"
 
 msgid "Copyright (c)"
 msgstr "Tekijänoikeudet (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Syntaksi: openbox [ominaisuudet]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntaksi: openbox [ominaisuudet]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -205,23 +203,23 @@ msgstr ""
 "\n"
 "Ominaisuudet:\n"
 
 "\n"
 "Ominaisuudet:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Näytä tämä apu ja sulje\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Näytä tämä apu ja sulje\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Näytä versio ja sulje\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Näytä versio ja sulje\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Korvaa päällä oleva window manager\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Korvaa päällä oleva window manager\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Estä yhteys session manageriin\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Estä yhteys session manageriin\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -229,37 +227,37 @@ msgstr ""
 "\n"
 "Lähetetään viestejä päällä olevaan Openboxiin\n"
 
 "\n"
 "Lähetetään viestejä päällä olevaan Openboxiin\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Lataa Openboxin konfiguraation uudelleen\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Lataa Openboxin konfiguraation uudelleen\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Käynnistä Openbox uudelleen\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Käynnistä Openbox uudelleen\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              aja synkroni tilassa\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              aja synkroni tilassa\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -268,27 +266,27 @@ msgstr ""
 "\n"
 "Ilmoita virheistä: %s\n"
 
 "\n"
 "Ilmoita virheistä: %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Virheellinen komentorivi käsky '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Virheellinen komentorivi käsky '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr ""
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr ""
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "työtila %i"
 #, c-format
 msgid "desktop %i"
 msgstr "työtila %i"


@@ -337,9 +335,3 @@ msgstr ""
 #, c-format
 msgid "X Error: %s"
 msgstr "X virhe: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "X virhe: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Virheellinen toiminto '%s'. Toimintoa ei ole olemassa"
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Toiminnon virheellinen käyttö '%s'. Toiminto ohitetaan"

diff --git a/po/fr.po b/po/fr.po
index 937573c..5842fe0 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,9 +6,9 @@
 # 
 msgid ""
 msgstr ""
 # 
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-05-21 00:53+0200\n"
 "Last-Translator: Cyrille Bagard <nocbos@gmail.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "PO-Revision-Date: 2007-05-21 00:53+0200\n"
 "Last-Translator: Cyrille Bagard <nocbos@gmail.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"


@@ -16,191 +16,189 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Echec de la conversion du chemin '%s' depuis l'UTF-8"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Action demandée '%s' invalide. Aucune action de ce type n'existe."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Utilisation invalide de l'action '%s'. L'action sera ignorée."
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Echec de l'exécution de '%s': %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Echec de l'exécution de '%s': %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Echec de la conversion du chemin '%s' depuis l'UTF-8"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Aller à..."
 
 msgid "Go there..."
 msgstr "Aller à..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Fenêtres"
 
 msgid "Windows"
 msgstr "Fenêtres"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Bureaux"
 
 msgid "Desktops"
 msgstr "Bureaux"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Tous les bureaux"
 
 msgid "All desktops"
 msgstr "Tous les bureaux"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "Disp_osition"
 
 msgid "_Layer"
 msgstr "Disp_osition"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Toujours au _premier plan"
 
 msgid "Always on _top"
 msgstr "Toujours au _premier plan"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "_Normal"
 
 msgid "_Normal"
 msgstr "_Normal"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Toujours en _arrière plan"
 
 msgid "Always on _bottom"
 msgstr "Toujours en _arrière plan"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "Envoyer vers le _bureau"
 
 msgid "_Send to desktop"
 msgstr "Envoyer vers le _bureau"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Menu de la fenêtre"
 
 msgid "Client menu"
 msgstr "Menu de la fenêtre"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "R_estaurer"
 
 msgid "R_estore"
 msgstr "R_estaurer"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "_Déplacer"
 
 msgid "_Move"
 msgstr "_Déplacer"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "Redimen_sionner"
 
 msgid "Resi_ze"
 msgstr "Redimen_sionner"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "Ico_nifier"
 
 msgid "Ico_nify"
 msgstr "Ico_nifier"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Ma_ximiser"
 
 msgid "Ma_ximize"
 msgstr "Ma_ximiser"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "En/Dé_rouler"
 
 msgid "_Roll up/down"
 msgstr "En/Dé_rouler"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "Ne pas/Dé_corer"
 
 msgid "Un/_Decorate"
 msgstr "Ne pas/Dé_corer"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "_Fermer"
 
 msgid "_Close"
 msgstr "_Fermer"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Bouton indiqué dans le fichier de configuration '%s' invalide"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Bouton indiqué dans le fichier de configuration '%s' invalide"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "Conflit entre les raccourcis clavier dans le fichier de configuration"
 
 msgid "Conflict with key binding in config file"
 msgstr "Conflit entre les raccourcis clavier dans le fichier de configuration"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Impossible de trouver un fichier de menus valide '%s'"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Impossible de trouver un fichier de menus valide '%s'"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Echec lors de l'exécution de la commande pour un pipe-menu '%s': %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Echec lors de l'exécution de la commande pour un pipe-menu '%s': %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Sortie du pipe-menu invalide '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Sortie du pipe-menu invalide '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Tentative d'accès au menu '%s' qui n'existe pas"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Tentative d'accès au menu '%s' qui n'existe pas"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "D'avantage..."
 
 msgid "More..."
 msgstr "D'avantage..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Bouton '%s' invalide dans le paramétrage de la souris"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Bouton '%s' invalide dans le paramétrage de la souris"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Contexte '%s' invalide dans le paramétrage de la souris"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Contexte '%s' invalide dans le paramétrage de la souris"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Impossible de changer vers le répertoire de l'utilisateur '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Impossible de changer vers le répertoire de l'utilisateur '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr ""
 "Echec de l'ouverture de l'affichage depuis la variable d'environnement "
 "DISPLAY."
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr ""
 "Echec de l'ouverture de l'affichage depuis la variable d'environnement "
 "DISPLAY."
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Echec de l'initialisation de la bibliothèque obrender."
 
 msgid "Failed to initialize the obrender library."
 msgstr "Echec de l'initialisation de la bibliothèque obrender."
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "Le serveur X ne supporte pas la localisation."
 
 msgid "X server does not support locale."
 msgstr "Le serveur X ne supporte pas la localisation."
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 "Impossible d'appliquer les modifications de localisation pour le serveur X."
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 "Impossible d'appliquer les modifications de localisation pour le serveur X."
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Impossible de trouver un fichier de configuration valide ; utilisation de "
 "défauts simples"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Impossible de trouver un fichier de configuration valide ; utilisation de "
 "défauts simples"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "Impossible de charger un thème."
 
 msgid "Unable to load a theme."
 msgstr "Impossible de charger un thème."
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Le redémarrage n'a pas réussi à exécuter le nouvel exécutable '%s': %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Le redémarrage n'a pas réussi à exécuter le nouvel exécutable '%s': %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Syntaxe: openbox [options]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntaxe: openbox [options]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -208,26 +206,26 @@ msgstr ""
 "\n"
 "Options:\n"
 
 "\n"
 "Options:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Affiche cette aide et quitte\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Affiche cette aide et quitte\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Affiche la version et quitte\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Affiche la version et quitte\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           Remplace le gestionnaire de fenêtres actuellement en "
 "usage\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           Remplace le gestionnaire de fenêtres actuellement en "
 "usage\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 "  --sm-disable        Désactive la connexion au gestionnaire de sessions\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 "  --sm-disable        Désactive la connexion au gestionnaire de sessions\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -235,15 +233,15 @@ msgstr ""
 "\n"
 "Passage de messages à l'instance d'Openbox en marche:\n"
 
 "\n"
 "Passage de messages à l'instance d'Openbox en marche:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Recharge la configuration d'Openbox\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Recharge la configuration d'Openbox\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Redémarre Openbox\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Redémarre Openbox\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -251,26 +249,26 @@ msgstr ""
 "\n"
 "Options de déboguage:\n"
 
 "\n"
 "Options de déboguage:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Exécute en mode synchrone\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Exécute en mode synchrone\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Affiche la sortie de déboguage\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Affiche la sortie de déboguage\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Affiche la sortie de déboguage pour la gestion du "
 "focus\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Affiche la sortie de déboguage pour la gestion du "
 "focus\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Découpe l'affichage en écrans xinerama factices\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Découpe l'affichage en écrans xinerama factices\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -279,30 +277,30 @@ msgstr ""
 "\n"
 "Veuillez soumettre les rapports de bogues à %s\n"
 
 "\n"
 "Veuillez soumettre les rapports de bogues à %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Argument de la ligne de commande invalide '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Argument de la ligne de commande invalide '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Un gestionnaire de fenêtres est déjà lancé sur l'écran %d"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Un gestionnaire de fenêtres est déjà lancé sur l'écran %d"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 "Impossible d'acquérir la sélection du gestionnaire de fenêtres pour l'écran %"
 "d"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 "Impossible d'acquérir la sélection du gestionnaire de fenêtres pour l'écran %"
 "d"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 "Le gestionnaire de fenêtres sur l'écran %d n'est pas en train de quitter"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 "Le gestionnaire de fenêtres sur l'écran %d n'est pas en train de quitter"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "bureau %i"
 #, c-format
 msgid "desktop %i"
 msgstr "bureau %i"


@@ -353,9 +351,3 @@ msgstr "La touche demand
 #, c-format
 msgid "X Error: %s"
 msgstr "Erreur X: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "Erreur X: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Action demandée '%s' invalide. Aucune action de ce type n'existe."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Utilisation invalide de l'action '%s'. L'action sera ignorée."

diff --git a/po/it.po b/po/it.po
index 876b9ec..63b9948 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -4,9 +4,9 @@
 # Davide Truffa <davide@catoblepa.org>, 2007.
 msgid ""
 msgstr ""
 # Davide Truffa <davide@catoblepa.org>, 2007.
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-06-04 03:06+0200\n"
 "Last-Translator: Davide Truffa <davide@catoblepa.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "PO-Revision-Date: 2007-06-04 03:06+0200\n"
 "Last-Translator: Davide Truffa <davide@catoblepa.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"


@@ -14,192 +14,190 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Impossibile convertire il percorso '%s' da utf8"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Il comando '%s' è inesistente o non valido."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Uso non corretto del comando '%s'. Il comando verrà ignorato."
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Impossibile eseguire il comando '%s': %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Impossibile eseguire il comando '%s': %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Impossibile convertire il percorso '%s' da utf8"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Vai a..."
 
 msgid "Go there..."
 msgstr "Vai a..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Finestre"
 
 msgid "Windows"
 msgstr "Finestre"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Desktop"
 
 msgid "Desktops"
 msgstr "Desktop"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Tutti i desktop"
 
 msgid "All desktops"
 msgstr "Tutti i desktop"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "_Livello"
 
 msgid "_Layer"
 msgstr "_Livello"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Sempre _sopra"
 
 msgid "Always on _top"
 msgstr "Sempre _sopra"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "_Normale"
 
 msgid "_Normal"
 msgstr "_Normale"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Sempre s_otto"
 
 msgid "Always on _bottom"
 msgstr "Sempre s_otto"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "Invia al _desktop"
 
 msgid "_Send to desktop"
 msgstr "Invia al _desktop"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Menu della finestra"
 
 msgid "Client menu"
 msgstr "Menu della finestra"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "_Ripristina"
 
 msgid "R_estore"
 msgstr "_Ripristina"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "_Muovi"
 
 msgid "_Move"
 msgstr "_Muovi"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "Ridime_nsiona"
 
 msgid "Resi_ze"
 msgstr "Ridime_nsiona"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "Mi_nimizza"
 
 msgid "Ico_nify"
 msgstr "Mi_nimizza"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Ma_ssimizza"
 
 msgid "Ma_ximize"
 msgstr "Ma_ssimizza"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "A_rrotola"
 
 msgid "_Roll up/down"
 msgstr "A_rrotola"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "Si/No _Decorazioni"
 
 msgid "Un/_Decorate"
 msgstr "Si/No _Decorazioni"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "_Chiudi"
 
 msgid "_Close"
 msgstr "_Chiudi"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Il pulsante '%s' specificato nel file di configurazione non è valido"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Il pulsante '%s' specificato nel file di configurazione non è valido"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr ""
 "Conflitto con la scorciatoia da tastiera specificata nel file di "
 "configurazione"
 
 msgid "Conflict with key binding in config file"
 msgstr ""
 "Conflitto con la scorciatoia da tastiera specificata nel file di "
 "configurazione"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Impossibile trovare il file di menu '%s'"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Impossibile trovare il file di menu '%s'"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Impossibile eseguire il comando nel pipe-menu '%s': %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Impossibile eseguire il comando nel pipe-menu '%s': %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "L'output del pipe-menu '%s' non è valido"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "L'output del pipe-menu '%s' non è valido"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Tentativo di accedere al menu '%s'. Il menu non esiste"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Tentativo di accedere al menu '%s'. Il menu non esiste"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "Ancora..."
 
 msgid "More..."
 msgstr "Ancora..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Il pulsante del mouse '%s' specificato non è valido"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Il pulsante del mouse '%s' specificato non è valido"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Il contesto del mouse '%s' specificato non è valido"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Il contesto del mouse '%s' specificato non è valido"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Impossibile accedere alla home directory '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Impossibile accedere alla home directory '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Impossibile accedere al display specificato nella variabile DISPLAY."
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Impossibile accedere al display specificato nella variabile DISPLAY."
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Impossibile inizializzare la libreria obrender."
 
 msgid "Failed to initialize the obrender library."
 msgstr "Impossibile inizializzare la libreria obrender."
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "Il server X non ha il supporto per la localizzazione."
 
 msgid "X server does not support locale."
 msgstr "Il server X non ha il supporto per la localizzazione."
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 "Impossibile impostare la localizzazione dei tasti modificatori per il server "
 "X."
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 "Impossibile impostare la localizzazione dei tasti modificatori per il server "
 "X."
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Impossibile trovare un file di configurazione valido, verranno utilizzate le "
 "impostazioni predefinite"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Impossibile trovare un file di configurazione valido, verranno utilizzate le "
 "impostazioni predefinite"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "Impossibile caricare un tema."
 
 msgid "Unable to load a theme."
 msgstr "Impossibile caricare un tema."
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Non è stato possibile riavviare il nuovo eseguibile '%s': %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Non è stato possibile riavviare il nuovo eseguibile '%s': %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Sintassi: openbox [opzioni]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Sintassi: openbox [opzioni]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -207,23 +205,23 @@ msgstr ""
 "\n"
 "Opzioni:\n"
 
 "\n"
 "Opzioni:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Mostra questo messaggio di aiuto ed esce\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Mostra questo messaggio di aiuto ed esce\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Mostra il numero di versione ed esce\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Mostra il numero di versione ed esce\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Sostituisce l'attuale window manager attivo\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Sostituisce l'attuale window manager attivo\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Disabilita la connessione al session manager\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Disabilita la connessione al session manager\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -231,15 +229,15 @@ msgstr ""
 "\n"
 "Inviare messaggi ad un'istanza di openbox attiva:\n"
 
 "\n"
 "Inviare messaggi ad un'istanza di openbox attiva:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Ricarica la configurazione di Openbox\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Ricarica la configurazione di Openbox\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Riavvia Openbox\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Riavvia Openbox\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -247,25 +245,25 @@ msgstr ""
 "\n"
 "Opzioni di debug:\n"
 
 "\n"
 "Opzioni di debug:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Esegui in modalità sincrona\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Esegui in modalità sincrona\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Mostra le informazioni di debug\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Mostra le informazioni di debug\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Mostra le informazioni di debug sulla gestione del "
 "focus\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Mostra le informazioni di debug sulla gestione del "
 "focus\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Dividi lo schermo per simulare xinerama\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Dividi lo schermo per simulare xinerama\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -274,27 +272,27 @@ msgstr ""
 "\n"
 "Per piacere inviate i bug a %s\n"
 
 "\n"
 "Per piacere inviate i bug a %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Argomento da linea di comando non valido '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Argomento da linea di comando non valido '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Un window manager è già attivo sullo schermo %d"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Un window manager è già attivo sullo schermo %d"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Impossibile acquisire la selezione del window manager sullo schermo %d"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Impossibile acquisire la selezione del window manager sullo schermo %d"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Il WM sullo schermo %d non sta terminando"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Il WM sullo schermo %d non sta terminando"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"


@@ -345,9 +343,3 @@ msgstr "La chiave richiesta '%s' non esiste sul display"
 #, c-format
 msgid "X Error: %s"
 msgstr "Errore del server X: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "Errore del server X: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Il comando '%s' è inesistente o non valido."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Uso non corretto del comando '%s'. Il comando verrà ignorato."

diff --git a/po/ja.po b/po/ja.po
index c9f1961..8c41fed 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.3\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-07-05 16:00+0200\n"

 "PO-Revision-Date: 2007-06-07 14:49+0200\n"
 "Last-Translator: Ryoichiro Suzuki <ryoichiro.suzuki@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "PO-Revision-Date: 2007-06-07 14:49+0200\n"
 "Last-Translator: Ryoichiro Suzuki <ryoichiro.suzuki@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"


@@ -112,7 +112,7 @@ msgstr "非/装飾(_D)"
 msgid "_Close"
 msgstr "閉じる(_C)"
 
 msgid "_Close"
 msgstr "閉じる(_C)"
 

-#: openbox/config.c:737
+#: openbox/config.c:718

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "不正なボタン'%s'が設定ファイルで指定されています。"
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "不正なボタン'%s'が設定ファイルで指定されています。"


@@ -141,7 +141,7 @@ msgstr "パイプメニュー'%s'からの不正な出力です。"
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "メニュー'%s'へのアクセスを試みましたが、それは存在しません。"
 
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "メニュー'%s'へのアクセスを試みましたが、それは存在しません。"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:362 openbox/menu.c:363

 msgid "More..."
 msgstr "もっと..."
 
 msgid "More..."
 msgstr "もっと..."
 

diff --git a/po/nl.po b/po/nl.po
index 786e44a..a9c8b62 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -2,202 +2,200 @@
 # Copyright (C) 2007 Mark Pustjens
 # This file is distributed under the same license as the openbox package.
 # Mark Pustjens <pustjens@dds.nl>, 2007.
 # Copyright (C) 2007 Mark Pustjens
 # This file is distributed under the same license as the openbox package.
 # Mark Pustjens <pustjens@dds.nl>, 2007.

-# Jochem Kossen <jkossen@xs4all.nl>, 2007.
+# 

 # 
 msgid ""
 msgstr ""
 # 
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.3\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
-"PO-Revision-Date: 2007-07-12 13:01+0200\n"
-"Last-Translator: Jochem Kossen <jkossen@xs4all.nl>\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"
+"PO-Revision-Date: 2007-05-24 16:39+0200\n"
+"Last-Translator: Mark Pustjens <pustjens@dds.nl>\n"

 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Converteren van het pad '%s' vanuit utf8 mislukt"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Ongeldige actie '%s' gevraagd. Deze actie bestaat niet"
+
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Ongeldig gebruik van actie '%s'. Actie wordt genegeerd."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Uitvoeren van '%s' mislukt: %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Uitvoeren van '%s' mislukt: %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Converteren van het pad '%s' vanuit utf8 mislukt"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Ga hierheen..."
 
 msgid "Go there..."
 msgstr "Ga hierheen..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr "Beheer bureaubladen"
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr "_Voeg nieuw bureaublad toe"
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr "V_erwijder laatste bureaublad"
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Vensters"
 
 msgid "Windows"
 msgstr "Vensters"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Bureaubladen"
 
 msgid "Desktops"
 msgstr "Bureaubladen"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Alle bureaubladen"
 
 msgid "All desktops"
 msgstr "Alle bureaubladen"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "_Laag"
 
 msgid "_Layer"
 msgstr "_Laag"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Altijd _bovenop"
 
 msgid "Always on _top"
 msgstr "Altijd _bovenop"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "_Normaal"
 
 msgid "_Normal"
 msgstr "_Normaal"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Altijd _onderop"
 
 msgid "Always on _bottom"
 msgstr "Altijd _onderop"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "Verplaats _naar bureaublad"
 
 msgid "_Send to desktop"
 msgstr "Verplaats _naar bureaublad"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Venster menu"
 
 msgid "Client menu"
 msgstr "Venster menu"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "_Herstellen"
 
 msgid "R_estore"
 msgstr "_Herstellen"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "_Verplaatsen"
 
 msgid "_Move"
 msgstr "_Verplaatsen"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "_Grootte aanpassen"
 
 msgid "Resi_ze"
 msgstr "_Grootte aanpassen"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "_Iconificeren"
 
 msgid "Ico_nify"
 msgstr "_Iconificeren"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "_Maximaliseren"
 
 msgid "Ma_ximize"
 msgstr "_Maximaliseren"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "_Op/neerklappen"
 
 msgid "_Roll up/down"
 msgstr "_Op/neerklappen"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "_Vensterrand weghalen/toevoegen"
 
 msgid "Un/_Decorate"
 msgstr "_Vensterrand weghalen/toevoegen"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "_Sluiten"
 
 msgid "_Close"
 msgstr "_Sluiten"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 #, c-format
 msgid "Invalid button '%s' specified in config file"

-msgstr "Ongeldige knop '%s' gespecificeerd in het configuratiebestand"
+msgstr "Ongeldige knop '%s' gespecificeerd in het configuratie bestand"

 
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgid "Conflict with key binding in config file"

-msgstr "Conflict met toetsenbinding in het configuratiebestand"
+msgstr "Conflict met toetsen binding in het configuratie bestand"

 
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 #, c-format
 msgid "Unable to find a valid menu file '%s'"

-msgstr "Het vinden van een geldig menubestand '%s' is mislukt"
+msgstr "Het vinden van een geldig menu bestand '%s' is mislukt"

 
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Uitvoeren mislukt van het commando '%s' voor pipe-menu: %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Uitvoeren mislukt van het commando '%s' voor pipe-menu: %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Ongeldige uitvoer van pipe-menu '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Ongeldige uitvoer van pipe-menu '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"

-msgstr "Toegang gevraagd tot menu '%s' maar het bestaat niet"
+msgstr "Toegang gevraagd tot menu '%s' maar het besstaat niet"

 
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "Meer..."
 
 msgid "More..."
 msgstr "Meer..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Ongeldige knop '%s' in muis binding"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Ongeldige knop '%s' in muis binding"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Ongeldige context '%s' in muis binding"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Ongeldige context '%s' in muis binding"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 #, c-format
 msgid "Unable to change to home directory '%s': %s"

-msgstr "Pad instellen mislukt naar de thuismap '%s': %s"
+msgstr "Mislukt om het pad in te stellen naar de thuis map '%s': %s"

 
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgid "Failed to open the display from the DISPLAY environment variable."

-msgstr "Scherm van de DISPLAY omgevingsvariabele te openen mislukt."
+msgstr "Mislukt om het scherm van de DISPLAY omgevings variabele te openen."

 
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Initialiseren van de obrender bibliotheek mislukt."
 
 msgid "Failed to initialize the obrender library."
 msgstr "Initialiseren van de obrender bibliotheek mislukt."
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "X server ondersteunt locale niet"
 
 msgid "X server does not support locale."
 msgstr "X server ondersteunt locale niet"
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgid "Cannot set locale modifiers for the X server."

-msgstr "Kan de locale bepaling van de X server niet instellen"
+msgstr "Kan de locale bepalinging van de X server niet instellen"

 
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""

-"Kon geen geldig configuratiebestand vinden, simpele standaardinstellingen "
-"worden gebruikt"
+"Mislukt om een geldig configuratie bestand te vinden, eenvoudige standaard "
+"instellingen worden gebruikt"

 
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgid "Unable to load a theme."

-msgstr "Thema laden mislukt."
+msgstr "Mislukt om een theme te laden."

 
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Uitvoeren van nieuw programma '%s' tijdens herstart miskukt: %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Uitvoeren van nieuw programma '%s' tijdens herstart miskukt: %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [opties]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [opties]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -205,23 +203,24 @@ msgstr ""
 "\n"
 "Opties:\n"
 
 "\n"
 "Opties:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgid "  --help              Display this help and exit\n"

-msgstr "  --help              Toon deze helptekst en sluit af\n"
+msgstr "  --help              Toont deze helptext en sluit af\n"

 
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgid "  --version           Display the version and exit\n"

-msgstr "  --version           Toon versie en sluit af\n"
+msgstr "  --version           Toont versie en sluit af\n"

 
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Vervang de huidig draaiende window manager\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Vervang de huidig draaiende window manager\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgid "  --sm-disable        Disable connection to the session manager\n"

-msgstr "  --sm-disable        Verbinding met de sessiebeheerder uitschakelen\n"
+msgstr ""
+"  --sm-disable        Verbinding met de sessie beheerder uitschakelen\n"

 
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -229,15 +228,15 @@ msgstr ""
 "\n"
 "Berichten worden naar een draaiende Openbox instantie gestuurd:\n"
 
 "\n"
 "Berichten worden naar een draaiende Openbox instantie gestuurd:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Openbox configuratie opnieuw laden\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Openbox configuratie opnieuw laden\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Herstart Openbox\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Herstart Openbox\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -245,52 +244,52 @@ msgstr ""
 "\n"
 "Debugging opties:\n"
 
 "\n"
 "Debugging opties:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Start in synchrone modus\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Start in synchrone modus\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgid "  --debug             Display debugging output\n"

-msgstr "  --debug             Debuguitvoer weergeven\n"
+msgstr "  --debug             Debug uitvoer weergeven\n"

 
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgid "  --debug-focus       Display debugging output for focus handling\n"

-msgstr "  --debug-focus       Debug uitvoer voor focusafhandeling weergeven\n"
+msgstr "  --debug-focus       Debug uitvoer voor focus afhandeling weergeven\n"

 
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Splits het scherm in nep xinerama schermen\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Splits het scherm in nep xinerama schermen\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 "\n"
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 "\n"

-"Gelieve bugs te melden bij %s\n"
+"Geliever bugs te melden bij %s\n"

 
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Onbekende optie '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Onbekende optie '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 #, c-format
 msgid "A window manager is already running on screen %d"

-msgstr "Er draait al een window manager op scherm %d"
+msgstr "Een window manager draait al op scherm %d"

 
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Kon window manager selectie op scherm %d niet verkrijgen"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Kon window manager selectie op scherm %d niet verkrijgen"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "De window manager op scherm %d sluit zichzelf niet af"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "De window manager op scherm %d sluit zichzelf niet af"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "bureaublad %i"
 #, c-format
 msgid "desktop %i"
 msgstr "bureaublad %i"


@@ -318,17 +317,17 @@ msgstr "Starten %s\n"
 #: openbox/translate.c:58
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 #: openbox/translate.c:58
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"

-msgstr "Ongeldige modificatietoets '%s' in toetsen-/muisbinding"
+msgstr "Ongeldige modificatie-toets '%s' in toetsen/muis binding"

 
 #: openbox/translate.c:135
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 
 #: openbox/translate.c:135
 #, c-format
 msgid "Invalid key code '%s' in key binding"

-msgstr "Ongeldige toetscode '%s' in toetsenbinding"
+msgstr "Ongeldige toest code '%s' in toetsen binding"

 
 #: openbox/translate.c:142
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 
 #: openbox/translate.c:142
 #, c-format
 msgid "Invalid key name '%s' in key binding"

-msgstr "Ongeldige toetsnaam '%s' in toetsenbinding"
+msgstr "Ongeldige toest naam '%s' in toetsen binding"

 
 #: openbox/translate.c:148
 #, c-format
 
 #: openbox/translate.c:148
 #, c-format


@@ -339,9 +338,3 @@ msgstr "Aangevraagde toets '%s' bestaat niet op het scherm"
 #, c-format
 msgid "X Error: %s"
 msgstr "X Fout: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "X Fout: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Ongeldige actie '%s' gevraagd. Deze actie bestaat niet"
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Ongeldig gebruik van actie '%s'. Actie wordt genegeerd."

diff --git a/po/no.po b/po/no.po
index 25baa93..47f8ccc 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -5,9 +5,9 @@
 # Michael Kjelbergvik Thung <postlogic@switch-case.org>, 2007.
 msgid ""
 msgstr ""
 # Michael Kjelbergvik Thung <postlogic@switch-case.org>, 2007.
 msgid ""
 msgstr ""

-"Project-Id-Version: openbox 3.4.2\n"
+"Project-Id-Version: openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-05-20 18:41+0200\n"
 "Last-Translator: Michael Kjelbergvik Thung <postlogic@switch-case.org>\n"
 "Language-Team: None\n"
 "PO-Revision-Date: 2007-05-20 18:41+0200\n"
 "Last-Translator: Michael Kjelbergvik Thung <postlogic@switch-case.org>\n"
 "Language-Team: None\n"


@@ -15,186 +15,184 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Feil ved konvertering av '%s' fra utf8 "
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Ugyldig operasjon '%s' etterspurt. Operasjonen finnes ikke."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Ugyldig bruk av aksjonen '%s'. Aksjonen vil bli ignorert."
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Kunne ikke kjøre '%s': %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Kunne ikke kjøre '%s': %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Feil ved konvertering av '%s' fra utf8 "
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Gå dit..."
 
 msgid "Go there..."
 msgstr "Gå dit..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Vinduer"
 
 msgid "Windows"
 msgstr "Vinduer"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Skrivebord"
 
 msgid "Desktops"
 msgstr "Skrivebord"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Alle skrivebord"
 
 msgid "All desktops"
 msgstr "Alle skrivebord"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "La_g"
 
 msgid "_Layer"
 msgstr "La_g"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Alltid ø_verst"
 
 msgid "Always on _top"
 msgstr "Alltid ø_verst"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "Nor_mal"
 
 msgid "_Normal"
 msgstr "Nor_mal"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Alltid _nederst"
 
 msgid "Always on _bottom"
 msgstr "Alltid _nederst"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "_Send til"
 
 msgid "_Send to desktop"
 msgstr "_Send til"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Klient-meny"
 
 msgid "Client menu"
 msgstr "Klient-meny"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "Tilbak_estill"
 
 msgid "R_estore"
 msgstr "Tilbak_estill"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "_Flytt"
 
 msgid "_Move"
 msgstr "_Flytt"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "Endre s_tørrelse"
 
 msgid "Resi_ze"
 msgstr "Endre s_tørrelse"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "_Minimer"
 
 msgid "Ico_nify"
 msgstr "_Minimer"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Ma_ximer"
 
 msgid "Ma_ximize"
 msgstr "Ma_ximer"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "_Rull opp/ned"
 
 msgid "_Roll up/down"
 msgstr "_Rull opp/ned"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "Fjern/Legg til _dekorasjon"
 
 msgid "Un/_Decorate"
 msgstr "Fjern/Legg til _dekorasjon"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "_Lukk"
 
 msgid "_Close"
 msgstr "_Lukk"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Ugyldig tast '%s' spesifisert i konfigurasjonsfilen"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Ugyldig tast '%s' spesifisert i konfigurasjonsfilen"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "Konflikt med hurtigtastbinding i konfigurasjonsfilen"
 
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt med hurtigtastbinding i konfigurasjonsfilen"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Kan ikke finne en gyldig menyfil '%s'"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Kan ikke finne en gyldig menyfil '%s'"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Kunne ikke kjøre kommando for pipe-meny '%s': %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Kunne ikke kjøre kommando for pipe-meny '%s': %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Ugyldig utdata fra pipe-menyen '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Ugyldig utdata fra pipe-menyen '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Forsøkte å åpne menyen '%s', men denne finnes ikke"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Forsøkte å åpne menyen '%s', men denne finnes ikke"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "Mer..."
 
 msgid "More..."
 msgstr "Mer..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Ugyldig knapp '%s' i binding for mus"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Ugyldig knapp '%s' i binding for mus"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Ugyldig innhold '%s' i binding for mus"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Ugyldig innhold '%s' i binding for mus"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Kan ikke endre til hjemmekatalogen '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Kan ikke endre til hjemmekatalogen '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Kunne ikke åpne displayet fra DISPLAY-miljøvariabelen"
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Kunne ikke åpne displayet fra DISPLAY-miljøvariabelen"
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Kunne ikke starte obrender-biblioteket."
 
 msgid "Failed to initialize the obrender library."
 msgstr "Kunne ikke starte obrender-biblioteket."
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "X-serveren støtter ikke lokalisering."
 
 msgid "X server does not support locale."
 msgstr "X-serveren støtter ikke lokalisering."
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr "Kan ikke stille inn lokaliseringsmodifikatorene for X-serveren."
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Kan ikke stille inn lokaliseringsmodifikatorene for X-serveren."
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "Kunne ikke finne en gyldig konfigurasjonsfil, bruker standardverdier"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "Kunne ikke finne en gyldig konfigurasjonsfil, bruker standardverdier"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "Kan ikke laste et tema."
 
 msgid "Unable to load a theme."
 msgstr "Kan ikke laste et tema."
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Restart kunne ikke starte nytt program '%s': %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Restart kunne ikke starte nytt program '%s': %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr ""
 
 msgid "Copyright (c)"
 msgstr ""
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [alternativer\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [alternativer\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -202,23 +200,23 @@ msgstr ""
 "\n"
 "Alternativ:\n"
 
 "\n"
 "Alternativ:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Vise denne hjelpeteksten og avslutt\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Vise denne hjelpeteksten og avslutt\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Vis versjonsnummeret og avslutt\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Vis versjonsnummeret og avslutt\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Erstatt den kjørende vindusbehandleren\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Erstatt den kjørende vindusbehandleren\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Deaktiver tilkobling til sesjonsbehandleren\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Deaktiver tilkobling til sesjonsbehandleren\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -226,15 +224,15 @@ msgstr ""
 "\n"
 "Sender beskjeder til en kjørende Openbox-instans:\n"
 
 "\n"
 "Sender beskjeder til en kjørende Openbox-instans:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Oppdater Openbox' konfigurasjon\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Oppdater Openbox' konfigurasjon\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Start Openbox på nytt\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Start Openbox på nytt\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -242,23 +240,23 @@ msgstr ""
 "\n"
 "Debug-alternativ:\n"
 
 "\n"
 "Debug-alternativ:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Kjør i synkron-modus\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Kjør i synkron-modus\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Vis debuggingsinformasjon\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Vis debuggingsinformasjon\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Vis debuggingsinformasjon for fokus-håndtering\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Vis debuggingsinformasjon for fokus-håndtering\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  -debug-xinerama    Splitt displayet for falske xinerama-skjermer\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  -debug-xinerama    Splitt displayet for falske xinerama-skjermer\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -267,27 +265,27 @@ msgstr ""
 "\n"
 "Vennligst rapporter bugs til %s\n"
 
 "\n"
 "Vennligst rapporter bugs til %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Ugyldig kommandolinje-argument '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Ugyldig kommandolinje-argument '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "En vindusbehandler kjører allerede på skjerm %d"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "En vindusbehandler kjører allerede på skjerm %d"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Kunne ikke hendte vindusbehandlerens markering på skjerm %d"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Kunne ikke hendte vindusbehandlerens markering på skjerm %d"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Vindusbehandleren på skjerm %d vil ikke avslutte"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Vindusbehandleren på skjerm %d vil ikke avslutte"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "skrivebord %i"
 #, c-format
 msgid "desktop %i"
 msgstr "skrivebord %i"


@@ -336,9 +334,3 @@ msgstr "Ønsket tast '%s' eksisterer ikke i displayet"
 #, c-format
 msgid "X Error: %s"
 msgstr "Feil i X: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "Feil i X: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Ugyldig operasjon '%s' etterspurt. Operasjonen finnes ikke."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Ugyldig bruk av aksjonen '%s'. Aksjonen vil bli ignorert."

diff --git a/po/pl.po b/po/pl.po
index f7d27e4..5d04cfd 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-05-21 18:09+0100\n"
 "Last-Translator: Paweł Rusinek <p.rusinek@gmail.com>\n"
 "Language-Team: None\n"
 "PO-Revision-Date: 2007-05-21 18:09+0100\n"
 "Last-Translator: Paweł Rusinek <p.rusinek@gmail.com>\n"
 "Language-Team: None\n"


@@ -16,188 +16,186 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Nie można przekonwertować ścieżki '%s' z kodowania utf8"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Wywołano niepoprawną akcję '%s'. Taka akcja nie istnieje."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Niepoprawne użycie akcji '%s'. Akcja zostanie pominięta."
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Nie udało się uruchomić '%s': %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Nie udało się uruchomić '%s': %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Nie można przekonwertować ścieżki '%s' z kodowania utf8"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Przejdź..."
 
 msgid "Go there..."
 msgstr "Przejdź..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Okna"
 
 msgid "Windows"
 msgstr "Okna"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Pulpity"
 
 msgid "Desktops"
 msgstr "Pulpity"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Wszystkie pulpity"
 
 msgid "All desktops"
 msgstr "Wszystkie pulpity"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "_Warstwa"
 
 msgid "_Layer"
 msgstr "_Warstwa"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Zawsze na _wierzchu"
 
 msgid "Always on _top"
 msgstr "Zawsze na _wierzchu"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "_Normalnie"
 
 msgid "_Normal"
 msgstr "_Normalnie"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Zawsze pod _spodem"
 
 msgid "Always on _bottom"
 msgstr "Zawsze pod _spodem"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "Wyślij na p_ulpit"
 
 msgid "_Send to desktop"
 msgstr "Wyślij na p_ulpit"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Menu klienta"
 
 msgid "Client menu"
 msgstr "Menu klienta"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "_Przywróć"
 
 msgid "R_estore"
 msgstr "_Przywróć"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "Prze_suń"
 
 msgid "_Move"
 msgstr "Prze_suń"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "Zmień _rozmiar"
 
 msgid "Resi_ze"
 msgstr "Zmień _rozmiar"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "Mi_nimalizuj"
 
 msgid "Ico_nify"
 msgstr "Mi_nimalizuj"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Ma_ksymalizuj"
 
 msgid "Ma_ximize"
 msgstr "Ma_ksymalizuj"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "_Zwiń/Rozwiń"
 
 msgid "_Roll up/down"
 msgstr "_Zwiń/Rozwiń"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "Pokaż/Ukryj _dekoracje"
 
 msgid "Un/_Decorate"
 msgstr "Pokaż/Ukryj _dekoracje"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "Z_amknij"
 
 msgid "_Close"
 msgstr "Z_amknij"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Niepoprawny klawisz '%s' użyty w pliku konfiguracyjnym"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Niepoprawny klawisz '%s' użyty w pliku konfiguracyjnym"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "Konflikt z powiązaniem klawiaturowym w pliku konfiguracyjnym"
 
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt z powiązaniem klawiaturowym w pliku konfiguracyjnym"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Nie można odnaleźć poprawnego pliku menu '%s'"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Nie można odnaleźć poprawnego pliku menu '%s'"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Nie udało się wykonać polecenia dla pipe-menu '%s': %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Nie udało się wykonać polecenia dla pipe-menu '%s': %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Niepoprawny wynik z pipe-menu '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Niepoprawny wynik z pipe-menu '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Plik menu '%s' nie istnieje"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Plik menu '%s' nie istnieje"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "Więcej..."
 
 msgid "More..."
 msgstr "Więcej..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Niepoprawny klawisz '%s' w powiązaniu myszy"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Niepoprawny klawisz '%s' w powiązaniu myszy"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Niepoprawny kontekst '%s' w powiązaniu myszy"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Niepoprawny kontekst '%s' w powiązaniu myszy"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Nie można przejść do katalogu domowego '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Nie można przejść do katalogu domowego '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr ""
 "Nie udało się otworzyć ekranu na podstawie zmiennej środowiskowej DISPLAY."
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr ""
 "Nie udało się otworzyć ekranu na podstawie zmiennej środowiskowej DISPLAY."
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Nie udało się zainicjować biblioteki obrender."
 
 msgid "Failed to initialize the obrender library."
 msgstr "Nie udało się zainicjować biblioteki obrender."
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "Serwer X nie obsługuje ustawień lokalnych."
 
 msgid "X server does not support locale."
 msgstr "Serwer X nie obsługuje ustawień lokalnych."
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr "Nie można ustawić modyfikatorów lokalnych dla serwera X."
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Nie można ustawić modyfikatorów lokalnych dla serwera X."
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Nie można odnaleźć poprawnego pliku konfiguracyjnego, użyte domyślne wartości"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Nie można odnaleźć poprawnego pliku konfiguracyjnego, użyte domyślne wartości"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "Nie można załadować motywu."
 
 msgid "Unable to load a theme."
 msgstr "Nie można załadować motywu."
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Podczas restartu nie udało się uruchomić nowego pliku '%s': %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Podczas restartu nie udało się uruchomić nowego pliku '%s': %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Składnia: openbox [opcje]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Składnia: openbox [opcje]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -205,23 +203,23 @@ msgstr ""
 "\n"
 "Opcje:\n"
 
 "\n"
 "Opcje:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Wypisuje tę pomoc i kończy\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Wypisuje tę pomoc i kończy\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Wypisuje informację o wersji i kończy\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Wypisuje informację o wersji i kończy\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Zastępuje aktualnie działający menedżer okien\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Zastępuje aktualnie działający menedżer okien\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Nie tworzy połączenia z menedżerem sesji\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Nie tworzy połączenia z menedżerem sesji\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -229,15 +227,15 @@ msgstr ""
 "\n"
 "Przekazywanie komunikatów do działającej instancji Openboksa:\n"
 
 "\n"
 "Przekazywanie komunikatów do działającej instancji Openboksa:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Ponownie odczytuje pliki konfiguracyjne\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Ponownie odczytuje pliki konfiguracyjne\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Ponownie uruchamia Openboksa\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Ponownie uruchamia Openboksa\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -245,27 +243,27 @@ msgstr ""
 "\n"
 "Opcje debugowania:\n"
 
 "\n"
 "Opcje debugowania:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Uruchamia w trybie synchronicznym\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Uruchamia w trybie synchronicznym\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Wypisuje informacje dotyczące debugowania\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Wypisuje informacje dotyczące debugowania\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Wypisuje informacje dotyczące debugowania, związane z "
 "obsługą aktywacji\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Wypisuje informacje dotyczące debugowania, związane z "
 "obsługą aktywacji\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Dzieli obszar wyświetlania na sztuczne ekrany "
 "xineramy\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Dzieli obszar wyświetlania na sztuczne ekrany "
 "xineramy\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -274,27 +272,27 @@ msgstr ""
 "\n"
 "Proszę zgłaszać błędy (w języku angielskim) w serwisie %s\n"
 
 "\n"
 "Proszę zgłaszać błędy (w języku angielskim) w serwisie %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Niepoprawny argument '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Niepoprawny argument '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Menedżer okien jest już uruchomiony na ekranie %d"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Menedżer okien jest już uruchomiony na ekranie %d"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Nie można uzyskać wyboru menedżera okien na ekranie %d"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Nie można uzyskać wyboru menedżera okien na ekranie %d"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Menedżer okien na ekranie %d nie kończy działania"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Menedżer okien na ekranie %d nie kończy działania"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "pulpit %i"
 #, c-format
 msgid "desktop %i"
 msgstr "pulpit %i"


@@ -343,9 +341,3 @@ msgstr "Żądany klawisz '%s' nie istnieje na ekranie"
 #, c-format
 msgid "X Error: %s"
 msgstr "Błąd serwera X: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "Błąd serwera X: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Wywołano niepoprawną akcję '%s'. Taka akcja nie istnieje."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Niepoprawne użycie akcji '%s'. Akcja zostanie pominięta."

diff --git a/po/pt.po b/po/pt.po
index aaf249c..4085c13 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-05-23 00:34+0200\n"
 "Last-Translator: Althaser <Althaser@gmail.com>\n"
 "Language-Team: None\n"
 "PO-Revision-Date: 2007-05-23 00:34+0200\n"
 "Last-Translator: Althaser <Althaser@gmail.com>\n"
 "Language-Team: None\n"


@@ -16,188 +16,186 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Falha a converter o caminho '%s' do utf8"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Pedido de acção '%s' inválido. Não existem quaisquer acções."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Uso inválido da acção '%s'. A acção será ignorada."
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Falha a executar '%s': %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Falha a executar '%s': %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Falha a converter o caminho '%s' do utf8"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Ir para..."
 
 msgid "Go there..."
 msgstr "Ir para..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Janelas"
 
 msgid "Windows"
 msgstr "Janelas"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Áreas de trabalho"
 
 msgid "Desktops"
 msgstr "Áreas de trabalho"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Todas as áreas de trabalho"
 
 msgid "All desktops"
 msgstr "Todas as áreas de trabalho"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "_Camada"
 
 msgid "_Layer"
 msgstr "_Camada"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Sempre em _cima"
 
 msgid "Always on _top"
 msgstr "Sempre em _cima"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "_Normal"
 
 msgid "_Normal"
 msgstr "_Normal"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Sempre no _fundo"
 
 msgid "Always on _bottom"
 msgstr "Sempre no _fundo"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "Enviar para área de _trabalho"
 
 msgid "_Send to desktop"
 msgstr "Enviar para área de _trabalho"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Menu de clientes"
 
 msgid "Client menu"
 msgstr "Menu de clientes"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "R_estaurar"
 
 msgid "R_estore"
 msgstr "R_estaurar"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "_Mover"
 
 msgid "_Move"
 msgstr "_Mover"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "Redimen_sionar"
 
 msgid "Resi_ze"
 msgstr "Redimen_sionar"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "Mi_nimizar"
 
 msgid "Ico_nify"
 msgstr "Mi_nimizar"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Ma_ximizar"
 
 msgid "Ma_ximize"
 msgstr "Ma_ximizar"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "En/Desen_rolar"
 
 msgid "_Roll up/down"
 msgstr "En/Desen_rolar"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "Des/_Decorar"
 
 msgid "Un/_Decorate"
 msgstr "Des/_Decorar"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "_Fechar"
 
 msgid "_Close"
 msgstr "_Fechar"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Botão inválido '%s' especificado no ficheiro de configuração"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Botão inválido '%s' especificado no ficheiro de configuração"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "Conflito com tecla de atalho no ficheiro de configuração"
 
 msgid "Conflict with key binding in config file"
 msgstr "Conflito com tecla de atalho no ficheiro de configuração"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Incapaz de encontrar um ficheiro de menu válido '%s'"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Incapaz de encontrar um ficheiro de menu válido '%s'"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Falha no comando de execução para o menu de processamento '%s': %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Falha no comando de execução para o menu de processamento '%s': %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Resultado inválido do menu de processamento '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Resultado inválido do menu de processamento '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Tentei aceder ao menu '%s' mas ele não existe"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Tentei aceder ao menu '%s' mas ele não existe"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "Mais..."
 
 msgid "More..."
 msgstr "Mais..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Botão inválido '%s' no atalho do rato"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Botão inválido '%s' no atalho do rato"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Contexto inválido '%s' no atalho do rato"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Contexto inválido '%s' no atalho do rato"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Incapaz de mudar para o directório home '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Incapaz de mudar para o directório home '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Falha a abrir o ecrã pela variável de ambiente DISPLAY."
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Falha a abrir o ecrã pela variável de ambiente DISPLAY."
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Falha a inicializar a biblioteca obrender"
 
 msgid "Failed to initialize the obrender library."
 msgstr "Falha a inicializar a biblioteca obrender"
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "O servidor X não suporta o locale."
 
 msgid "X server does not support locale."
 msgstr "O servidor X não suporta o locale."
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr "Não pode definir locales modificados para o servidor X."
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Não pode definir locales modificados para o servidor X."
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Incapaz de encontrar um ficheiro de configuração válido, usando algumas "
 "configurações simples de omissão"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Incapaz de encontrar um ficheiro de configuração válido, usando algumas "
 "configurações simples de omissão"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "Incapaz de carregar o tema."
 
 msgid "Unable to load a theme."
 msgstr "Incapaz de carregar o tema."
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Falha a reiniciar a execução de um novo executável '%s': %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Falha a reiniciar a execução de um novo executável '%s': %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Direitos de autor (c)"
 
 msgid "Copyright (c)"
 msgstr "Direitos de autor (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Sintaxe: openbox [opções]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Sintaxe: openbox [opções]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -205,23 +203,23 @@ msgstr ""
 "\n"
 "Opções:\n"
 
 "\n"
 "Opções:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Mostra este help e sai\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Mostra este help e sai\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Mostra a versão e sai\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Mostra a versão e sai\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Substitui o corrente gestor de janelas\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Substitui o corrente gestor de janelas\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Desactiva a ligação com o gestor de sessões\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Desactiva a ligação com o gestor de sessões\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -229,15 +227,15 @@ msgstr ""
 "\n"
 "Passando mensagens para a solicitação do Openbox em execução\n"
 
 "\n"
 "Passando mensagens para a solicitação do Openbox em execução\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Recarrega a configuração do Openbox\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Recarrega a configuração do Openbox\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Reinicia o Openbox\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Reinicia o Openbox\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -245,25 +243,25 @@ msgstr ""
 "\n"
 "Opções de depuração\n"
 
 "\n"
 "Opções de depuração\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Executa em modo sincronizado\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Executa em modo sincronizado\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Mostra o resultado da depuração\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Mostra o resultado da depuração\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Mostra o resultado da depuração para manipulação em "
 "foco\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Mostra o resultado da depuração para manipulação em "
 "foco\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Divide o ecrã em falsos ecrãs xinerama\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Divide o ecrã em falsos ecrãs xinerama\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -272,27 +270,27 @@ msgstr ""
 "\n"
 "Por favor reporte erros em %s\n"
 
 "\n"
 "Por favor reporte erros em %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Argumento inválido na linha de comandos '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Argumento inválido na linha de comandos '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "O gestor de janelas já está em execução no ecrã %d"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "O gestor de janelas já está em execução no ecrã %d"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Não consegui adequirir o gestor de janelas selecionado no ecrã %d"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Não consegui adequirir o gestor de janelas selecionado no ecrã %d"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "O gestor de janelas no ecrã %d não está fechando"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "O gestor de janelas no ecrã %d não está fechando"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "área de trabalho %i"
 #, c-format
 msgid "desktop %i"
 msgstr "área de trabalho %i"


@@ -341,9 +339,3 @@ msgstr "Chave pedida '%s' n
 #, c-format
 msgid "X Error: %s"
 msgstr "Erro no X: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "Erro no X: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Pedido de acção '%s' inválido. Não existem quaisquer acções."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Uso inválido da acção '%s'. A acção será ignorada."

diff --git a/po/pt_BR.po b/po/pt_BR.po
index bb39142..dc9d940 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-05-22 19:35+0200\n"
 "Last-Translator: Og Maciel <ogmaciel@ubuntu.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
 "PO-Revision-Date: 2007-05-22 19:35+0200\n"
 "Last-Translator: Og Maciel <ogmaciel@ubuntu.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"


@@ -17,189 +17,187 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Falha ao converter o caminho '%s' do utf8"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Ação inválida '%s' requisitada. Ação não existe."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Uso inválido da ação '%s'. Ação será ignorada."
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Falha ao executar '%s': %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Falha ao executar '%s': %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Falha ao converter o caminho '%s' do utf8"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Ir lá..."
 
 msgid "Go there..."
 msgstr "Ir lá..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Janelas"
 
 msgid "Windows"
 msgstr "Janelas"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Áreas de trabalho"
 
 msgid "Desktops"
 msgstr "Áreas de trabalho"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Todas as áreas de trabalho"
 
 msgid "All desktops"
 msgstr "Todas as áreas de trabalho"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "_Camada"
 
 msgid "_Layer"
 msgstr "_Camada"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Sempre no _topo"
 
 msgid "Always on _top"
 msgstr "Sempre no _topo"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "_Normal"
 
 msgid "_Normal"
 msgstr "_Normal"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Sempre no _fundo"
 
 msgid "Always on _bottom"
 msgstr "Sempre no _fundo"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "Enviar para área de _trabalho"
 
 msgid "_Send to desktop"
 msgstr "Enviar para área de _trabalho"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Menu do cliente"
 
 msgid "Client menu"
 msgstr "Menu do cliente"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "R_estaurar"
 
 msgid "R_estore"
 msgstr "R_estaurar"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "_Mover"
 
 msgid "_Move"
 msgstr "_Mover"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "Redimen_sionar"
 
 msgid "Resi_ze"
 msgstr "Redimen_sionar"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "Mi_nimizar"
 
 msgid "Ico_nify"
 msgstr "Mi_nimizar"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Ma_ximizar"
 
 msgid "Ma_ximize"
 msgstr "Ma_ximizar"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "(Des)en_rolar"
 
 msgid "_Roll up/down"
 msgstr "(Des)en_rolar"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "(Não) _Decorar"
 
 msgid "Un/_Decorate"
 msgstr "(Não) _Decorar"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "_Fechar"
 
 msgid "_Close"
 msgstr "_Fechar"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Botão inválido '%s' especificado no arquivo de configuração"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Botão inválido '%s' especificado no arquivo de configuração"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "Conflito com associação de chave no arquivo de configuração"
 
 msgid "Conflict with key binding in config file"
 msgstr "Conflito com associação de chave no arquivo de configuração"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Não foi possível encontrar um arquivo de menu '%s' válido"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Não foi possível encontrar um arquivo de menu '%s' válido"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Falha ao executar comando para menu de processamento '%s': %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Falha ao executar comando para menu de processamento '%s': %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Saída inválida do menu de processamento '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Saída inválida do menu de processamento '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Tentou acessar menu '%s' mas ele não existe"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Tentou acessar menu '%s' mas ele não existe"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "Mais.."
 
 msgid "More..."
 msgstr "Mais.."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Botão inválido '%s' na associação do mouse"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Botão inválido '%s' na associação do mouse"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Contexto '%s' inválido na associação do mouse"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Contexto '%s' inválido na associação do mouse"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Não foi possível mudar para o diretório pessoal '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Não foi possível mudar para o diretório pessoal '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Falha ao abrir a tela da variavel de ambiente DISPLAY"
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Falha ao abrir a tela da variavel de ambiente DISPLAY"
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Falha ao iniciar a biblioteca obrender."
 
 msgid "Failed to initialize the obrender library."
 msgstr "Falha ao iniciar a biblioteca obrender."
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "Servidor X não suporta localização."
 
 msgid "X server does not support locale."
 msgstr "Servidor X não suporta localização."
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 "Não foi possível configurar modificadores de localização para o servidor X."
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 "Não foi possível configurar modificadores de localização para o servidor X."
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Não foi possível encontrar um arquivo de configuração válido, usando alguns "
 "valores padrão simples."
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Não foi possível encontrar um arquivo de configuração válido, usando alguns "
 "valores padrão simples."
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "Não foi possível carregar um tema."
 
 msgid "Unable to load a theme."
 msgstr "Não foi possível carregar um tema."
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "O comando de reiniciar falhou ao executar novo executável '%s': %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "O comando de reiniciar falhou ao executar novo executável '%s': %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Sintaxe: openbox [opções]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Sintaxe: openbox [opções]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -207,24 +205,24 @@ msgstr ""
 "\n"
 "Opções:\n"
 
 "\n"
 "Opções:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Mostra esta ajuda e sai\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Mostra esta ajuda e sai\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Mostra a versão e sai\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Mostra a versão e sai\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Substitui o gerenciador de janelas ativo\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Substitui o gerenciador de janelas ativo\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 "  --sm-disable        Desabilita conexão com o gerenciador de sessões\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 "  --sm-disable        Desabilita conexão com o gerenciador de sessões\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -232,15 +230,15 @@ msgstr ""
 "\n"
 "Passando mensagens para uma instância do Openbox em execução:\n"
 
 "\n"
 "Passando mensagens para uma instância do Openbox em execução:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Recarrega a configuração do Openbox\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Recarrega a configuração do Openbox\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Reinicia o Openbox\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Reinicia o Openbox\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -248,26 +246,26 @@ msgstr ""
 "\n"
 "Opções de depuração:\n"
 
 "\n"
 "Opções de depuração:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Executa em modo sincronizado\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Executa em modo sincronizado\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Mostra saida de depuração\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Mostra saida de depuração\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Mostra saída de depuração para manipulação de foco\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Mostra saída de depuração para manipulação de foco\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Divide a exibição de telas em telas de xinerama "
 "falsas\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Divide a exibição de telas em telas de xinerama "
 "falsas\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -276,28 +274,28 @@ msgstr ""
 "\n"
 "Por favor reporte erros em %s\n"
 
 "\n"
 "Por favor reporte erros em %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Argumento de linha de comando inválido '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Argumento de linha de comando inválido '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Um gerenciador de janelas já está em execução na tela %d"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Um gerenciador de janelas já está em execução na tela %d"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 "Não foi possível adquirir a seleção do gerenciador de janelas na tela %d"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 "Não foi possível adquirir a seleção do gerenciador de janelas na tela %d"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "O gerenciador de janelas na tela %d não está saindo"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "O gerenciador de janelas na tela %d não está saindo"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "área de trabalho %i"
 #, c-format
 msgid "desktop %i"
 msgstr "área de trabalho %i"


@@ -346,9 +344,3 @@ msgstr "Chave requerida '%s' não existe na tela"
 #, c-format
 msgid "X Error: %s"
 msgstr "Erro no X: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "Erro no X: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Ação inválida '%s' requisitada. Ação não existe."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Uso inválido da ação '%s'. Ação será ignorada."

diff --git a/po/ru.po b/po/ru.po
index e9e175e..ad6813b 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: openbox 3.4.2\n"
+"Project-Id-Version: openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-05-24 19:41+0100\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
 "PO-Revision-Date: 2007-05-24 19:41+0100\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"


@@ -15,188 +15,187 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Не удалось сконвертировать путь '%s' из utf8"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Запрошено некорректное действие '%s'. Нет такого действия."
+
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr ""
+"Некорректное использование действия '%s'. Действие будет проигнорировано."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Не удалось запустить '%s': %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Не удалось запустить '%s': %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Не удалось сконвертировать путь '%s' из utf8"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Перейти..."
 
 msgid "Go there..."
 msgstr "Перейти..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Окна"
 
 msgid "Windows"
 msgstr "Окна"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Рабочие столы"
 
 msgid "Desktops"
 msgstr "Рабочие столы"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Все рабочие столы"
 
 msgid "All desktops"
 msgstr "Все рабочие столы"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "Слой(_L)"
 
 msgid "_Layer"
 msgstr "Слой(_L)"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Поверх всех окон(_T)"
 
 msgid "Always on _top"
 msgstr "Поверх всех окон(_T)"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "Обычное поведение(_N)"
 
 msgid "_Normal"
 msgstr "Обычное поведение(_N)"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Под всеми окнами(_B)"
 
 msgid "Always on _bottom"
 msgstr "Под всеми окнами(_B)"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "Отправить на рабочий стол(_S)"
 
 msgid "_Send to desktop"
 msgstr "Отправить на рабочий стол(_S)"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Меню клиентов"
 
 msgid "Client menu"
 msgstr "Меню клиентов"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "Восстановить(_E)"
 
 msgid "R_estore"
 msgstr "Восстановить(_E)"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "Переместить(_M)"
 
 msgid "_Move"
 msgstr "Переместить(_M)"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "Изменить размер(_Z)"
 
 msgid "Resi_ze"
 msgstr "Изменить размер(_Z)"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "Свернуть(_N)"
 
 msgid "Ico_nify"
 msgstr "Свернуть(_N)"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Развернуть(_X)"
 
 msgid "Ma_ximize"
 msgstr "Развернуть(_X)"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "Скрутить/Раскрутить(_R)"
 
 msgid "_Roll up/down"
 msgstr "Скрутить/Раскрутить(_R)"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "(От)декорировать(_D)"
 
 msgid "Un/_Decorate"
 msgstr "(От)декорировать(_D)"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "Закрыть(_C)"
 
 msgid "_Close"
 msgstr "Закрыть(_C)"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Некорректная клавиша '%s' упомянута в конфигурационном файле"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Некорректная клавиша '%s' упомянута в конфигурационном файле"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "Конфликт привязок клавиш в конфигурационном файле"
 
 msgid "Conflict with key binding in config file"
 msgstr "Конфликт привязок клавиш в конфигурационном файле"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Не могу найти корректный файл меню '%s'"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Не могу найти корректный файл меню '%s'"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Не могу запустить команду pipe-меню '%s': %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Не могу запустить команду pipe-меню '%s': %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Некорректный вывод pipe-меню '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Некорректный вывод pipe-меню '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Попытка доступа к несуществующему меню '%s'."
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Попытка доступа к несуществующему меню '%s'."
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "Больше..."
 
 msgid "More..."
 msgstr "Больше..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Некорректная кнопка '%s' в привязке мыши"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Некорректная кнопка '%s' в привязке мыши"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Некорректный контекст '%s' в привязке мыши"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Некорректный контекст '%s' в привязке мыши"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Не могу перейти в домашнюю директорию '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Не могу перейти в домашнюю директорию '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Не могу открыть экран из переменной окружения DISPLAY."
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Не могу открыть экран из переменной окружения DISPLAY."
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Не могу инициализировать библиотеку obrender."
 
 msgid "Failed to initialize the obrender library."
 msgstr "Не могу инициализировать библиотеку obrender."
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "X-сервер не поддерживает локали."
 
 msgid "X server does not support locale."
 msgstr "X-сервер не поддерживает локали."
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr "Не могу установить модификаторы локали X-сервера."
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Не могу установить модификаторы локали X-сервера."
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Не могу найти корректный конфигурационный файл, использую значения по-"
 "умолчанию"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Не могу найти корректный конфигурационный файл, использую значения по-"
 "умолчанию"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "Не могу загрузить тему."
 
 msgid "Unable to load a theme."
 msgstr "Не могу загрузить тему."
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "При перезапуске не удалось запустить исполняемый файл '%s': %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "При перезапуске не удалось запустить исполняемый файл '%s': %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Синтаксис: openbox [параметры]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Синтаксис: openbox [параметры]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -204,23 +203,23 @@ msgstr ""
 "\n"
 "Параметры:\n"
 
 "\n"
 "Параметры:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Показать эту справку и выйти\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Показать эту справку и выйти\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Показать версию и выйти\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Показать версию и выйти\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Заменить текущий менеджер окон\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Заменить текущий менеджер окон\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Не соединяться с менеджером сессий\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Не соединяться с менеджером сессий\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -228,15 +227,15 @@ msgstr ""
 "\n"
 "Передаю сообщения запущенной инстанции Openbox:\n"
 
 "\n"
 "Передаю сообщения запущенной инстанции Openbox:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Перезагрузить конфигурацию Openbox\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Перезагрузить конфигурацию Openbox\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Перезапустить Openbox\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Перезапустить Openbox\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -244,25 +243,25 @@ msgstr ""
 "\n"
 "Отладочные параметры:\n"
 
 "\n"
 "Отладочные параметры:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Запустить в синхронном режиме\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Запустить в синхронном режиме\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Отображать отладочную информацию\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Отображать отладочную информацию\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Отображать отладочную информацию об управлении "
 "фокусом\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Отображать отладочную информацию об управлении "
 "фокусом\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Разбить экран на фальшивые экраны xinerama\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Разбить экран на фальшивые экраны xinerama\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -271,27 +270,27 @@ msgstr ""
 "\n"
 "Пожалуйста, сообщайте об ошибках на %s\n"
 
 "\n"
 "Пожалуйста, сообщайте об ошибках на %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Некорректный командный параметр '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Некорректный командный параметр '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "На экране %d уже запущен менеджер окон"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "На экране %d уже запущен менеджер окон"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Не могу получить выбор менеджера окон на экране %d"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Не могу получить выбор менеджера окон на экране %d"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Менеджер окон на экране %d не завершается"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Менеджер окон на экране %d не завершается"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "рабочий стол %i"
 #, c-format
 msgid "desktop %i"
 msgstr "рабочий стол %i"


@@ -340,10 +339,3 @@ msgstr "Запрошенная клавиша '%s' не существует н
 #, c-format
 msgid "X Error: %s"
 msgstr "Ошибка X-сервера: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "Ошибка X-сервера: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Запрошено некорректное действие '%s'. Нет такого действия."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr ""
-#~ "Некорректное использование действия '%s'. Действие будет проигнорировано."

diff --git a/po/sk.po b/po/sk.po
index 3560f41..292a1b9 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox-3.4.2\n"
+"Project-Id-Version: Openbox-3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-05-27 13:43Central Europe Daylight Time\n"
 "Last-Translator: Jozef Riha <jose1711@gmail.com\n"
 "Language-Team: Slovak <LL@li.org>\n"
 "PO-Revision-Date: 2007-05-27 13:43Central Europe Daylight Time\n"
 "Last-Translator: Jozef Riha <jose1711@gmail.com\n"
 "Language-Team: Slovak <LL@li.org>\n"


@@ -15,188 +15,186 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Nepodarilo sa skonvertovať cestu '%s' z utf8"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Vyžiadaná neplatná akcia '%s'. Takáto akcia neexistuje."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Neplatné použitie akcie '%s'. Akcia bude ignorovaná."
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Nepodarilo sa spustiť '%s': %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Nepodarilo sa spustiť '%s': %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Nepodarilo sa skonvertovať cestu '%s' z utf8"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Prejsť na..."
 
 msgid "Go there..."
 msgstr "Prejsť na..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Okná"
 
 msgid "Windows"
 msgstr "Okná"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Plochy"
 
 msgid "Desktops"
 msgstr "Plochy"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Všetky plochy"
 
 msgid "All desktops"
 msgstr "Všetky plochy"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "_Vrstva"
 
 msgid "_Layer"
 msgstr "_Vrstva"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Vždy _navrchu"
 
 msgid "Always on _top"
 msgstr "Vždy _navrchu"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "Nor_málna"
 
 msgid "_Normal"
 msgstr "Nor_málna"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Vždy _dole"
 
 msgid "Always on _bottom"
 msgstr "Vždy _dole"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "_Poslať na plochu"
 
 msgid "_Send to desktop"
 msgstr "_Poslať na plochu"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Menu klienta"
 
 msgid "Client menu"
 msgstr "Menu klienta"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "_Obnoviť"
 
 msgid "R_estore"
 msgstr "_Obnoviť"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "Pre_sunúť"
 
 msgid "_Move"
 msgstr "Pre_sunúť"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "Z_mena veľkosti"
 
 msgid "Resi_ze"
 msgstr "Z_mena veľkosti"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "Do iko_ny"
 
 msgid "Ico_nify"
 msgstr "Do iko_ny"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Ma_ximalizovať"
 
 msgid "Ma_ximize"
 msgstr "Ma_ximalizovať"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "Ro/_Zvinúť"
 
 msgid "_Roll up/down"
 msgstr "Ro/_Zvinúť"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "(Ne)_Dekorovať"
 
 msgid "Un/_Decorate"
 msgstr "(Ne)_Dekorovať"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "Z_avrieť"
 
 msgid "_Close"
 msgstr "Z_avrieť"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Neplatné tlačidlo '%s' špecifikované v konfiguračnom súbore"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Neplatné tlačidlo '%s' špecifikované v konfiguračnom súbore"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "Konflikt priradenie klávesov v konfiguračnom súbore"
 
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt priradenie klávesov v konfiguračnom súbore"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Nepodarilo sa nájsť platný súbor menu '%s'"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Nepodarilo sa nájsť platný súbor menu '%s'"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Nepodarilo sa spustiť príkaz pre pipe-menu '%s': %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Nepodarilo sa spustiť príkaz pre pipe-menu '%s': %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Neplatný výstup z pipe-menu '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Neplatný výstup z pipe-menu '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Pokus o sprístupnenie menu '%s', ale to neexistuje"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Pokus o sprístupnenie menu '%s', ale to neexistuje"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "Viac..."
 
 msgid "More..."
 msgstr "Viac..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Neplatné tlačidlo '%s' v priradení myši"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Neplatné tlačidlo '%s' v priradení myši"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Neplatný kontext '%s' v priradení myši"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Neplatný kontext '%s' v priradení myši"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Nepodarilo sa prejsť do domovského adresára '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Nepodarilo sa prejsť do domovského adresára '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Nepodarilo sa otvoriť displej z premennej prostredia DISPLAY"
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Nepodarilo sa otvoriť displej z premennej prostredia DISPLAY"
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Nepodarilo sa inicializovať knižnicu obrender."
 
 msgid "Failed to initialize the obrender library."
 msgstr "Nepodarilo sa inicializovať knižnicu obrender."
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "X server nepodporuje locale."
 
 msgid "X server does not support locale."
 msgstr "X server nepodporuje locale."
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr "Nemôžem nastaviť locale pre X server."
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Nemôžem nastaviť locale pre X server."
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Nepodarilo sa nájsť platný konfiguračný súbor, použijem jednoduché "
 "implicitné nastavenia"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Nepodarilo sa nájsť platný konfiguračný súbor, použijem jednoduché "
 "implicitné nastavenia"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "Nepodarilo sa nahrať tému."
 
 msgid "Unable to load a theme."
 msgstr "Nepodarilo sa nahrať tému."
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Reštart zlyhal pri spúšťaní novej binárky '%s': %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Reštart zlyhal pri spúšťaní novej binárky '%s': %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [volby]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [volby]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -204,24 +202,24 @@ msgstr ""
 "\n"
 "Volby:\n"
 
 "\n"
 "Volby:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Zobrazi tuto napovedu a skonci\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Zobrazi tuto napovedu a skonci\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Zobrazi cislo verzie a skonci\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Zobrazi cislo verzie a skonci\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           Nahradi momentalne beziace sedenie window manazera\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           Nahradi momentalne beziace sedenie window manazera\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Vypne spojenie k manazerovi sedenia\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Vypne spojenie k manazerovi sedenia\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -229,15 +227,15 @@ msgstr ""
 "\n"
 "Predavanie sprav beziacej instancii Openboxu:\n"
 
 "\n"
 "Predavanie sprav beziacej instancii Openboxu:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Opatovne nacita konfiguraciu Openboxu\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Opatovne nacita konfiguraciu Openboxu\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Restartuje Openbox\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Restartuje Openbox\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -245,24 +243,24 @@ msgstr ""
 "\n"
 "Volby ladenia:\n"
 
 "\n"
 "Volby ladenia:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Spustit v synchronnom mode\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Spustit v synchronnom mode\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Zobrazit ladiaci vystup\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Zobrazit ladiaci vystup\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Zobrazit ladiaci vystup pre manipulaciu s fokusom\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Zobrazit ladiaci vystup pre manipulaciu s fokusom\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Rozdelit displej na neprave obrazovky xineramy\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Rozdelit displej na neprave obrazovky xineramy\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -271,27 +269,27 @@ msgstr ""
 "\n"
 "Prosim hlaste chyby na %s\n"
 
 "\n"
 "Prosim hlaste chyby na %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Neplatny parameter prikazoveho riadku '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Neplatny parameter prikazoveho riadku '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Okenny manazer uz bezi na obrazovke %d"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Okenny manazer uz bezi na obrazovke %d"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Nepodarilo sa získať výber okenného manažéra na obrazovke %d"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Nepodarilo sa získať výber okenného manažéra na obrazovke %d"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Okenný manažér na obrazovke %d sa neukončuje"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Okenný manažér na obrazovke %d sa neukončuje"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "plocha %i"
 #, c-format
 msgid "desktop %i"
 msgstr "plocha %i"


@@ -340,9 +338,3 @@ msgstr "Požadovaný kláves '%s' na displeji neexistuje"
 #, c-format
 msgid "X Error: %s"
 msgstr "Chyba X: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "Chyba X: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Vyžiadaná neplatná akcia '%s'. Takáto akcia neexistuje."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Neplatné použitie akcie '%s'. Akcia bude ignorovaná."

diff --git a/po/sv.po b/po/sv.po
index dc504bb..265e6bf 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: openbox 3.4.3\n"
+"Project-Id-Version: openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-07-05 16:00+0200\n"

 "PO-Revision-Date: 2007-05-22 00:29+0200\n"
 "Last-Translator: Mikael Magnusson <mikachu@icculus.org>\n"
 "Language-Team: None\n"
 "PO-Revision-Date: 2007-05-22 00:29+0200\n"
 "Last-Translator: Mikael Magnusson <mikachu@icculus.org>\n"
 "Language-Team: None\n"


@@ -109,7 +109,7 @@ msgstr "_Dekorationer"
 msgid "_Close"
 msgstr "Stän_g"
 
 msgid "_Close"
 msgstr "Stän_g"
 

-#: openbox/config.c:737
+#: openbox/config.c:718

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Ogiltig knapp '%s' angiven i konfigurationsfilen"
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Ogiltig knapp '%s' angiven i konfigurationsfilen"


@@ -138,7 +138,7 @@ msgstr "Ogiltig utdata fr
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Försökte öppna menyn '%s', men den finns inte"
 
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Försökte öppna menyn '%s', men den finns inte"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:362 openbox/menu.c:363

 msgid "More..."
 msgstr "Mer..."
 
 msgid "More..."
 msgstr "Mer..."
 

diff --git a/po/ua.po b/po/ua.po
index ff8610a..ab1f634 100644 (file)
--- a/po/ua.po
+++ b/po/ua.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.4.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 msgstr ""
 "Project-Id-Version: openbox 3.4.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-16 15:02+0200\n"

 "PO-Revision-Date: 2007-06-16 13:02+0200\n"
 "Last-Translator: Dmitriy Moroz <zux@dimaka.org.ua>\n"
 "Language-Team: Ukrainian <root@archlinux.org.ua>\n"
 "PO-Revision-Date: 2007-06-16 13:02+0200\n"
 "Last-Translator: Dmitriy Moroz <zux@dimaka.org.ua>\n"
 "Language-Team: Ukrainian <root@archlinux.org.ua>\n"


@@ -15,189 +15,187 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:991

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Ð\9dе вдалоÑ\81Ñ\8f Ñ\81конвеÑ\80Ñ\82Ñ\83ваÑ\82и Ñ\88лÑ\8fÑ\85 '%s' з utf8"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Ð\97дÑ\96йÑ\81нено запиÑ\82 на некоÑ\80екÑ\82нÑ\83 дÑ\96Ñ\8e '%s'. Ð\9dема Ñ\82акоÑ\97 дÑ\96Ñ\97."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:994
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Некоректне викристання дії '%s'. Дія буде проігнорована."
+
+#: openbox/action.c:1261 openbox/action.c:1279 openbox/action.c:1292

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Невдалося виконати '%s': %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Невдалося виконати '%s': %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1300
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Не вдалося сконвертувати шлях '%s' з utf8"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Перейти...."
 
 msgid "Go there..."
 msgstr "Перейти...."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Вікна"
 
 msgid "Windows"
 msgstr "Вікна"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Стільниці"
 
 msgid "Desktops"
 msgstr "Стільниці"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Всі стільниці"
 
 msgid "All desktops"
 msgstr "Всі стільниці"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "Шар(_L)"
 
 msgid "_Layer"
 msgstr "Шар(_L)"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Зверху всіх вікон(_T)"
 
 msgid "Always on _top"
 msgstr "Зверху всіх вікон(_T)"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "Звичайне положення(_N)"
 
 msgid "_Normal"
 msgstr "Звичайне положення(_N)"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Знизу всіх вікон(_B)"
 
 msgid "Always on _bottom"
 msgstr "Знизу всіх вікон(_B)"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "Відправити на стільницю(_S)"
 
 msgid "_Send to desktop"
 msgstr "Відправити на стільницю(_S)"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Меню клієнтів"
 
 msgid "Client menu"
 msgstr "Меню клієнтів"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "Відновити(_E)"
 
 msgid "R_estore"
 msgstr "Відновити(_E)"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "Перемістити(_M)"
 
 msgid "_Move"
 msgstr "Перемістити(_M)"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "Змінити розмір(_Z)"
 
 msgid "Resi_ze"
 msgstr "Змінити розмір(_Z)"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "Згорнути(_N)"
 
 msgid "Ico_nify"
 msgstr "Згорнути(_N)"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Розгорнути(_X)"
 
 msgid "Ma_ximize"
 msgstr "Розгорнути(_X)"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "Скрутити/Розкрутити(_R)"
 
 msgid "_Roll up/down"
 msgstr "Скрутити/Розкрутити(_R)"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "(Від)декорувати(_D)"
 
 msgid "Un/_Decorate"
 msgstr "(Від)декорувати(_D)"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "Закрити(_C)"
 
 msgid "_Close"
 msgstr "Закрити(_C)"
 

-#: openbox/config.c:737
+#: openbox/config.c:719

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Некоректна клавіша '%s' вказана у файлі конфігурації"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Некоректна клавіша '%s' вказана у файлі конфігурації"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:164

 msgid "Conflict with key binding in config file"
 msgstr "Конфлікт прив'язки клавіш у файлі конфігурації"
 
 msgid "Conflict with key binding in config file"
 msgstr "Конфлікт прив'язки клавіш у файлі конфігурації"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Не вдалося знайти коректний файл меню '%s'"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Не вдалося знайти коректний файл меню '%s'"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:168

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Не вдалося виконати команду для pipe-меню '%s': %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Не вдалося виконати команду для pipe-меню '%s': %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:182

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Некоректний вивід з pipe-меню '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Некоректний вивід з pipe-меню '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:195

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Спроба доступа до меню '%s' якого не існує"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Спроба доступа до меню '%s' якого не існує"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:356 openbox/menu.c:357

 msgid "More..."
 msgstr "Більше..."
 
 msgid "More..."
 msgstr "Більше..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Некоректна клавіша '%s' в прив'язці клавіш мишки"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Некоректна клавіша '%s' в прив'язці клавіш мишки"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Некоректний контекст '%s' в прив'зці клавіш мишки"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Некоректний контекст '%s' в прив'зці клавіш мишки"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Не вдалося перейти в домашню директорію '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Не вдалося перейти в домашню директорію '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Не вдалося відкрити дисплей зі змінної середовища DISPLAY"
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Не вдалося відкрити дисплей зі змінної середовища DISPLAY"
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Не вдалося ініцаілізувати бібліотеку obrender"
 
 msgid "Failed to initialize the obrender library."
 msgstr "Не вдалося ініцаілізувати бібліотеку obrender"
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "X-сервер не підтримує локалі"
 
 msgid "X server does not support locale."
 msgstr "X-сервер не підтримує локалі"
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr "Не можу встановити модифікатори локалі для X-сервера"
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Не можу встановити модифікатори локалі для X-сервера"
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Не вдалося знайти коректний файл конфігурації, використовую стандартні "
 "налаштування"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Не вдалося знайти коректний файл конфігурації, використовую стандартні "
 "налаштування"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "Не вдалося загрузити стиль"
 
 msgid "Unable to load a theme."
 msgstr "Не вдалося загрузити стиль"
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr ""
 "При перезавантаженні не вдалося виконати новий виконуваний файл '%s': %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr ""
 "При перезавантаженні не вдалося виконати новий виконуваний файл '%s': %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Авторські права (c)"
 
 msgid "Copyright (c)"
 msgstr "Авторські права (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Синтакс: openbox [параметри]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Синтакс: openbox [параметри]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -205,23 +203,23 @@ msgstr ""
 "\n"
 "Параметри:\n"
 
 "\n"
 "Параметри:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Показати цю справку і вийти\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Показати цю справку і вийти\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --vesrion           Показати версію і вийти\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --vesrion           Показати версію і вийти\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Замінити поточний менеджер вікон\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Замінити поточний менеджер вікон\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Не з'єднуватися з сесійним менеджером\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Не з'єднуватися з сесійним менеджером\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -229,15 +227,15 @@ msgstr ""
 "\n"
 "Передаю повідомлення процесу Openbox що виконується\n"
 
 "\n"
 "Передаю повідомлення процесу Openbox що виконується\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Перезавантажити конфігурацію Openbox'у\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Перезавантажити конфігурацію Openbox'у\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Перезапустити Openbox\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Перезапустити Openbox\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -245,24 +243,24 @@ msgstr ""
 "\n"
 "Налагоджувальні параметри\n"
 
 "\n"
 "Налагоджувальні параметри\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Запустити в синхронному режимі\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Запустити в синхронному режимі\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Показувати інформацію налагоджування\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Показувати інформацію налагоджування\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Показувати інформацію налагоджування для уравління\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Показувати інформацію налагоджування для уравління\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Розбити екран на фальшиві екрани xinerama\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Розбити екран на фальшиві екрани xinerama\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -271,27 +269,27 @@ msgstr ""
 "\n"
 "Будь-ласка, повідомляйте про помилки на %s\n"
 
 "\n"
 "Будь-ласка, повідомляйте про помилки на %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Некоректний командний аргумент '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Некоректний командний аргумент '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:94 openbox/screen.c:195

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "На дисплеї %d вже запущений менеджер вікон"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "На дисплеї %d вже запущений менеджер вікон"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:131

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Не можу отримати вибір менеджера вікон на дисплеї %d"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Не можу отримати вибір менеджера вікон на дисплеї %d"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:152

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Менеджео вікон на дисплеї %d не завершується"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Менеджео вікон на дисплеї %d не завершується"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:1006

 #, c-format
 msgid "desktop %i"
 msgstr "стільниця %i"
 #, c-format
 msgid "desktop %i"
 msgstr "стільниця %i"


@@ -340,9 +338,3 @@ msgstr "Клавіша '%s' на яку здійснено запит - не і
 #, c-format
 msgid "X Error: %s"
 msgstr "Помилка X-серверу: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "Помилка X-серверу: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Здійснено запит на некоректну дію '%s'. Нема такої дії."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Некоректне викристання дії '%s'. Дія буде проігнорована."

diff --git a/po/vi.po b/po/vi.po
index 2dcfd79..64c2aa4 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-06-07 06:50-0500\n"
 "Last-Translator: Quan Tran <qeed.quan@gmail.com>\n"
 "Language-Team: None\n"
 "PO-Revision-Date: 2007-06-07 06:50-0500\n"
 "Last-Translator: Quan Tran <qeed.quan@gmail.com>\n"
 "Language-Team: None\n"


@@ -15,186 +15,184 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "Không thể chuyển chỗ '%s' từ utf8"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Hành động '%s' làm không được. Hành động đó không có."

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Sự dùng hành động '%s' sai rồi. Không làm hành động đó."
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Làm không được '%s': %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "Làm không được '%s': %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Không thể chuyển chỗ '%s' từ utf8"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "Đi đến chỗ đó"
 
 msgid "Go there..."
 msgstr "Đi đến chỗ đó"
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "Cửa sổ"
 
 msgid "Windows"
 msgstr "Cửa sổ"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "Chỗ làm việc"
 
 msgid "Desktops"
 msgstr "Chỗ làm việc"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "Tất cả chỗ làm việc"
 
 msgid "All desktops"
 msgstr "Tất cả chỗ làm việc"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "Lớ_p"
 
 msgid "_Layer"
 msgstr "Lớ_p"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "Luôn luôn ở _trên"
 
 msgid "Always on _top"
 msgstr "Luôn luôn ở _trên"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "_Bình thường"
 
 msgid "_Normal"
 msgstr "_Bình thường"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "Luôn luôn ở _dưới"
 
 msgid "Always on _bottom"
 msgstr "Luôn luôn ở _dưới"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "Gửi đến chỗ làm _việc"
 
 msgid "_Send to desktop"
 msgstr "Gửi đến chỗ làm _việc"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "Khách thực đơn"
 
 msgid "Client menu"
 msgstr "Khách thực đơn"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "_Hoàn lại"
 
 msgid "R_estore"
 msgstr "_Hoàn lại"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "Chu_yển đi"
 
 msgid "_Move"
 msgstr "Chu_yển đi"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "Làm _nhỏ hơn/lớn hơn"
 
 msgid "Resi_ze"
 msgstr "Làm _nhỏ hơn/lớn hơn"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "Biến _xuống"
 
 msgid "Ico_nify"
 msgstr "Biến _xuống"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "Biến _lớn nhất"
 
 msgid "Ma_ximize"
 msgstr "Biến _lớn nhất"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "_Cuốn lên/xuống"
 
 msgid "_Roll up/down"
 msgstr "_Cuốn lên/xuống"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "_Trang/Không Trang trí"
 
 msgid "Un/_Decorate"
 msgstr "_Trang/Không Trang trí"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "Đón_g"
 
 msgid "_Close"
 msgstr "Đón_g"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Sai nút '%s' ở trong hình thể"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Sai nút '%s' ở trong hình thể"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "Xung đột với chữ trói ở trong hình thể"
 
 msgid "Conflict with key binding in config file"
 msgstr "Xung đột với chữ trói ở trong hình thể"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Không có thể tìm vững chắc thực đơn '%s'"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "Không có thể tìm vững chắc thực đơn '%s'"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Không có thể chạy lệnh cho ống-thực đơn '%s': %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "Không có thể chạy lệnh cho ống-thực đơn '%s': %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Vô hiệu sản xuất của ống-thực đơn '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "Vô hiệu sản xuất của ống-thực đơn '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Thử mở thực đơn '%s' nhưng mà cái đó không có"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "Thử mở thực đơn '%s' nhưng mà cái đó không có"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "Thêm nữa"
 
 msgid "More..."
 msgstr "Thêm nữa"
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Vô hiệu nút '%s' ở trong máy chuột đặt"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "Vô hiệu nút '%s' ở trong máy chuột đặt"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Vô hiệu văn cảnh '%s' ở trong chuột đặt"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Vô hiệu văn cảnh '%s' ở trong chuột đặt"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Không thể đổi đến chỗ nhà '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Không thể đổi đến chỗ nhà '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Không mở hình từ DISPLAY được."
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Không mở hình từ DISPLAY được."
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "Không mở được thư viện obrender."
 
 msgid "Failed to initialize the obrender library."
 msgstr "Không mở được thư viện obrender."
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "Chương trình X không có locale cho tiếng nay."
 
 msgid "X server does not support locale."
 msgstr "Chương trình X không có locale cho tiếng nay."
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr "Không thể dùng locale cho chương trình X."
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Không thể dùng locale cho chương trình X."
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "Không thể tìm ra hình thể, sẽ dùng bắt đầu hình thể"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "Không thể tìm ra hình thể, sẽ dùng bắt đầu hình thể"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "Không thể đọc theme."
 
 msgid "Unable to load a theme."
 msgstr "Không thể đọc theme."
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Bắt đầu lại hỏng mở được executable mới '%s': %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Bắt đầu lại hỏng mở được executable mới '%s': %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "Bản quyền (c)"
 
 msgid "Copyright (c)"
 msgstr "Bản quyền (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "Cách dùng: openbox [chọn lựa]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "Cách dùng: openbox [chọn lựa]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -202,24 +200,24 @@ msgstr ""
 "\n"
 "Chọn lựa:\n"
 
 "\n"
 "Chọn lựa:\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Trưng bày giúp đỡ này và đi ra\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Trưng bày giúp đỡ này và đi ra\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Trưng bày số của chương trình và đi ra\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Trưng bày số của chương trình và đi ra\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           Thay thế chương trình quản lý cửa sổ cho đến openbox\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           Thay thế chương trình quản lý cửa sổ cho đến openbox\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Tắt liên lạc đến session quản lý\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Tắt liên lạc đến session quản lý\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -227,15 +225,15 @@ msgstr ""
 "\n"
 "Đưa thông báo cho chương trình Openbox:\n"
 
 "\n"
 "Đưa thông báo cho chương trình Openbox:\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Bắt đầu lại Openbox's hình thể\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Bắt đầu lại Openbox's hình thể\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Bắt đầu lại Openbox\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Bắt đầu lại Openbox\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -243,24 +241,24 @@ msgstr ""
 "\n"
 "Debugging chọn lựa:\n"
 
 "\n"
 "Debugging chọn lựa:\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Chạy trong cách thức synchronous\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Chạy trong cách thức synchronous\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Trưng bày debugging đoàn chữ\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Trưng bày debugging đoàn chữ\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Trưng bày debugging đoàn chữ cho điều khiển tập trung\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Trưng bày debugging đoàn chữ cho điều khiển tập trung\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Tách trưng bày vào giả xinerama màn\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Tách trưng bày vào giả xinerama màn\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -269,27 +267,27 @@ msgstr ""
 "\n"
 "Làm ơn báo cáo bugs ở chỗ %s\n"
 
 "\n"
 "Làm ơn báo cáo bugs ở chỗ %s\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Mệnh lệnh viết sai '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Mệnh lệnh viết sai '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Chương trình quản lý cửa sổ khác đang chạy trên màn hình %d"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Chương trình quản lý cửa sổ khác đang chạy trên màn hình %d"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Không thể lấy được chương trình quản lý cửa sổ ở trên màn hình %d"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Không thể lấy được chương trình quản lý cửa sổ ở trên màn hình %d"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Chương trình quản lý cửa sổ trên màn hình %d không đi ra"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Chương trình quản lý cửa sổ trên màn hình %d không đi ra"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "chỗ làm việc %i"
 #, c-format
 msgid "desktop %i"
 msgstr "chỗ làm việc %i"


@@ -338,9 +336,3 @@ msgstr "Yêu cầu key '%s' không có ở chỗ màn hình"
 #, c-format
 msgid "X Error: %s"
 msgstr "X trục chật: %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "X trục chật: %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Hành động '%s' làm không được. Hành động đó không có."
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Sự dùng hành động '%s' sai rồi. Không làm hành động đó."

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 41cdb13..e1ae3a0 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-05-28 13:00+0800\n"
 "Last-Translator: Xiaoyu PENG <peng.xiaoyu@gmail.com>\n"
 "Language-Team: None\n"
 "PO-Revision-Date: 2007-05-28 13:00+0800\n"
 "Last-Translator: Xiaoyu PENG <peng.xiaoyu@gmail.com>\n"
 "Language-Team: None\n"


@@ -15,186 +15,184 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "从 utf8 转换路径 '%s' 时失败"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "请求的动作 '%s' 无效。该动作不存在。"

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "使用的动作 '%s' 无效。动作将被忽略。"
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "执行 '%s' 时失败: %s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "执行 '%s' 时失败: %s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "从 utf8 转换路径 '%s' 时失败"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "跳转到..."
 
 msgid "Go there..."
 msgstr "跳转到..."
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "窗口"
 
 msgid "Windows"
 msgstr "窗口"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "桌面"
 
 msgid "Desktops"
 msgstr "桌面"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "所有桌面"
 
 msgid "All desktops"
 msgstr "所有桌面"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "层(_L)"
 
 msgid "_Layer"
 msgstr "层(_L)"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "总在最上层(_T)"
 
 msgid "Always on _top"
 msgstr "总在最上层(_T)"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "常规(_N)"
 
 msgid "_Normal"
 msgstr "常规(_N)"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "总在最底层(_B)"
 
 msgid "Always on _bottom"
 msgstr "总在最底层(_B)"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "发送到桌面(_S)"
 
 msgid "_Send to desktop"
 msgstr "发送到桌面(_S)"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "客户端菜单"
 
 msgid "Client menu"
 msgstr "客户端菜单"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "还原(_E)"
 
 msgid "R_estore"
 msgstr "还原(_E)"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "移动(_M)"
 
 msgid "_Move"
 msgstr "移动(_M)"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "调整大小(_Z)"
 
 msgid "Resi_ze"
 msgstr "调整大小(_Z)"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "最小化(_N)"
 
 msgid "Ico_nify"
 msgstr "最小化(_N)"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "最大化(_X)"
 
 msgid "Ma_ximize"
 msgstr "最大化(_X)"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "卷起/放下(_R)"
 
 msgid "_Roll up/down"
 msgstr "卷起/放下(_R)"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "去除装饰(_D)"
 
 msgid "Un/_Decorate"
 msgstr "去除装饰(_D)"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "关闭(_C)"
 
 msgid "_Close"
 msgstr "关闭(_C)"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "配置文件中指定的按钮 '%s' 无效"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "配置文件中指定的按钮 '%s' 无效"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "配置文件中的组合键冲突"
 
 msgid "Conflict with key binding in config file"
 msgstr "配置文件中的组合键冲突"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "无法找到有效的菜单文件 '%s'"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "无法找到有效的菜单文件 '%s'"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "执行管道菜单的命令 '%s' 时失败: %s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "执行管道菜单的命令 '%s' 时失败: %s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "无效的管道菜单输出 '%s'"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "无效的管道菜单输出 '%s'"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "尝试读取菜单 '%s'，但是它不存在"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "尝试读取菜单 '%s'，但是它不存在"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "更多..."
 
 msgid "More..."
 msgstr "更多..."
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "鼠标绑定中的无效按键 '%s'"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "鼠标绑定中的无效按键 '%s'"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "鼠标绑定中无效的上下文 '%s'"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "鼠标绑定中无效的上下文 '%s'"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "无法切换到主目录 '%s': %s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "无法切换到主目录 '%s': %s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "在打开DISPLAY环境变量所指定的X显示时失败"
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "在打开DISPLAY环境变量所指定的X显示时失败"
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "初始化obrender库时失败"
 
 msgid "Failed to initialize the obrender library."
 msgstr "初始化obrender库时失败"
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "X服务器不支持该Locale"
 
 msgid "X server does not support locale."
 msgstr "X服务器不支持该Locale"
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr "无法设置X服务器的locale修饰项"
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr "无法设置X服务器的locale修饰项"
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "无法找到有效的配置文件，使用一些简单的默认值"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "无法找到有效的配置文件，使用一些简单的默认值"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "无法读入主题"
 
 msgid "Unable to load a theme."
 msgstr "无法读入主题"
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "重新启动以执行新的可执行文件 '%s' 时失败: %s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "重新启动以执行新的可执行文件 '%s' 时失败: %s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "版权 (c)"
 
 msgid "Copyright (c)"
 msgstr "版权 (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "用法: openbox [选项]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "用法: openbox [选项]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -202,23 +200,23 @@ msgstr ""
 "\n"
 "选项： \n"
 
 "\n"
 "选项： \n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              显示帮助选项后退出\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              显示帮助选项后退出\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           显示版本号后退出\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           显示版本号后退出\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           替换当前运行的窗口管理器\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           替换当前运行的窗口管理器\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        禁止与会话管理器的连接\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        禁止与会话管理器的连接\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -226,15 +224,15 @@ msgstr ""
 "\n"
 "传递信息给运行中的Openbox实例：\n"
 
 "\n"
 "传递信息给运行中的Openbox实例：\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       重新读入Openbox的配置\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       重新读入Openbox的配置\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           重新启动Openbox\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           重新启动Openbox\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -242,23 +240,23 @@ msgstr ""
 "\n"
 "调试选项：\n"
 
 "\n"
 "调试选项：\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              在同步模式中运行\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              在同步模式中运行\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug            显示调试输出\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug            显示调试输出\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       显示焦点处理的调试输出\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       显示焦点处理的调试输出\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    分割显示到伪造的 xinerama 屏幕中\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    分割显示到伪造的 xinerama 屏幕中\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -267,27 +265,27 @@ msgstr ""
 "\n"
 "请向 %s 报告错误\n"
 
 "\n"
 "请向 %s 报告错误\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "无效的命令行参数 '%s'\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "无效的命令行参数 '%s'\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "已经有窗口管理器运行在屏幕 %d"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "已经有窗口管理器运行在屏幕 %d"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "在屏幕 %d 无法被选为窗口管理器"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "在屏幕 %d 无法被选为窗口管理器"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "屏幕 %d 的窗口管理器没有退出"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "屏幕 %d 的窗口管理器没有退出"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "桌面 %i"
 #, c-format
 msgid "desktop %i"
 msgstr "桌面 %i"


@@ -336,9 +334,3 @@ msgstr "请求的按键 '%s' 在显示中不存在"
 #, c-format
 msgid "X Error: %s"
 msgstr "X 错误： %s"
 #, c-format
 msgid "X Error: %s"
 msgstr "X 错误： %s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "请求的动作 '%s' 无效。该动作不存在。"
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "使用的动作 '%s' 无效。动作将被忽略。"

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 07e06c7..2946307 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: openbox 3.4.2\n"
+"Project-Id-Version: openbox 3.4\n"

 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"

-"POT-Creation-Date: 2007-07-12 12:58+0200\n"
+"POT-Creation-Date: 2007-06-07 14:18+0200\n"

 "PO-Revision-Date: 2007-05-23 16:22+0200\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "PO-Revision-Date: 2007-05-23 16:22+0200\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"


@@ -16,186 +16,184 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 

-#: openbox/actions/execute.c:86
+#: openbox/action.c:957

 #, c-format
 #, c-format

-msgid "Failed to convert the path '%s' from utf8"
-msgstr "從 utf8 轉換路徑「%s」時失敗"
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "要求的動作「%s」無效。無此類動作存在。"

 
 

-#: openbox/actions/execute.c:95 openbox/actions/execute.c:113
+#: openbox/action.c:960
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "使用的動作「%s」無效。動作將被忽略。"
+
+#: openbox/action.c:1227 openbox/action.c:1245 openbox/action.c:1258

 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "執行「%s」時失敗：%s"
 
 #, c-format
 msgid "Failed to execute '%s': %s"
 msgstr "執行「%s」時失敗：%s"
 

-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/action.c:1266
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "從 utf8 轉換路徑「%s」時失敗"
+
+#: openbox/client_list_combined_menu.c:104 openbox/client_list_menu.c:105

 msgid "Go there..."
 msgstr "到那裏去…"
 
 msgid "Go there..."
 msgstr "到那裏去…"
 

-#: openbox/client_list_combined_menu.c:98
-msgid "Manage desktops"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:152
-msgid "_Add new desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:153
-msgid "_Remove last desktop"
-msgstr ""
-
-#: openbox/client_list_combined_menu.c:146
+#: openbox/client_list_combined_menu.c:150

 msgid "Windows"
 msgstr "視窗"
 
 msgid "Windows"
 msgstr "視窗"
 

-#: openbox/client_list_menu.c:199
+#: openbox/client_list_menu.c:196

 msgid "Desktops"
 msgstr "桌面"
 
 msgid "Desktops"
 msgstr "桌面"
 

-#: openbox/client_menu.c:256
+#: openbox/client_menu.c:258

 msgid "All desktops"
 msgstr "所有桌面"
 
 msgid "All desktops"
 msgstr "所有桌面"
 

-#: openbox/client_menu.c:360
+#: openbox/client_menu.c:363

 msgid "_Layer"
 msgstr "層次(_L)"
 
 msgid "_Layer"
 msgstr "層次(_L)"
 

-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:368

 msgid "Always on _top"
 msgstr "最上層(_T)"
 
 msgid "Always on _top"
 msgstr "最上層(_T)"
 

-#: openbox/client_menu.c:366
+#: openbox/client_menu.c:369

 msgid "_Normal"
 msgstr "一般(_N)"
 
 msgid "_Normal"
 msgstr "一般(_N)"
 

-#: openbox/client_menu.c:367
+#: openbox/client_menu.c:370

 msgid "Always on _bottom"
 msgstr "最下層(_B)"
 
 msgid "Always on _bottom"
 msgstr "最下層(_B)"
 

-#: openbox/client_menu.c:370
+#: openbox/client_menu.c:373

 msgid "_Send to desktop"
 msgstr "傳送到桌面(_S)"
 
 msgid "_Send to desktop"
 msgstr "傳送到桌面(_S)"
 

-#: openbox/client_menu.c:374
+#: openbox/client_menu.c:377

 msgid "Client menu"
 msgstr "客戶端選單"
 
 msgid "Client menu"
 msgstr "客戶端選單"
 

-#: openbox/client_menu.c:380
+#: openbox/client_menu.c:383

 msgid "R_estore"
 msgstr "還原(_E)"
 
 msgid "R_estore"
 msgstr "還原(_E)"
 

-#: openbox/client_menu.c:388
+#: openbox/client_menu.c:391

 msgid "_Move"
 msgstr "移動(_M)"
 
 msgid "_Move"
 msgstr "移動(_M)"
 

-#: openbox/client_menu.c:390
+#: openbox/client_menu.c:393

 msgid "Resi_ze"
 msgstr "調整大小(_Z)"
 
 msgid "Resi_ze"
 msgstr "調整大小(_Z)"
 

-#: openbox/client_menu.c:392
+#: openbox/client_menu.c:395

 msgid "Ico_nify"
 msgstr "最小化(_N)"
 
 msgid "Ico_nify"
 msgstr "最小化(_N)"
 

-#: openbox/client_menu.c:400
+#: openbox/client_menu.c:403

 msgid "Ma_ximize"
 msgstr "最大化(_X)"
 
 msgid "Ma_ximize"
 msgstr "最大化(_X)"
 

-#: openbox/client_menu.c:408
+#: openbox/client_menu.c:411

 msgid "_Roll up/down"
 msgstr "向上/向下捲動(_R)"
 
 msgid "_Roll up/down"
 msgstr "向上/向下捲動(_R)"
 

-#: openbox/client_menu.c:410
+#: openbox/client_menu.c:413

 msgid "Un/_Decorate"
 msgstr "去除/裝飾(_D)"
 
 msgid "Un/_Decorate"
 msgstr "去除/裝飾(_D)"
 

-#: openbox/client_menu.c:420
+#: openbox/client_menu.c:423

 msgid "_Close"
 msgstr "關閉(_C)"
 
 msgid "_Close"
 msgstr "關閉(_C)"
 

-#: openbox/config.c:737
+#: openbox/config.c:704

 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "在配置檔中指定的按鈕「%s」無效"
 
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "在配置檔中指定的按鈕「%s」無效"
 

-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:162

 msgid "Conflict with key binding in config file"
 msgstr "與配置檔中的按鍵組合衝突"
 
 msgid "Conflict with key binding in config file"
 msgstr "與配置檔中的按鍵組合衝突"
 

-#: openbox/menu.c:103 openbox/menu.c:111
+#: openbox/menu.c:100 openbox/menu.c:108

 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "無法找到有效的選單檔案「%s」"
 
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr "無法找到有效的選單檔案「%s」"
 

-#: openbox/menu.c:171
+#: openbox/menu.c:151

 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "執行命令於管線選單「%s」時失敗：%s"
 
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
 msgstr "執行命令於管線選單「%s」時失敗：%s"
 

-#: openbox/menu.c:185
+#: openbox/menu.c:168

 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "從管線選單「%s」的輸出無效"
 
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
 msgstr "從管線選單「%s」的輸出無效"
 

-#: openbox/menu.c:198
+#: openbox/menu.c:181

 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "試圖存取選單「%s」但是它不存在"
 
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
 msgstr "試圖存取選單「%s」但是它不存在"
 

-#: openbox/menu.c:368 openbox/menu.c:369
+#: openbox/menu.c:342 openbox/menu.c:343

 msgid "More..."
 msgstr "更多…"
 
 msgid "More..."
 msgstr "更多…"
 

-#: openbox/mouse.c:349
+#: openbox/mouse.c:338

 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "與滑鼠組合的按鈕「%s」無效"
 
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
 msgstr "與滑鼠組合的按鈕「%s」無效"
 

-#: openbox/mouse.c:355
+#: openbox/mouse.c:344

 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "與滑鼠組合的上下文「%s」無效"
 
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
 msgstr "與滑鼠組合的上下文「%s」無效"
 

-#: openbox/openbox.c:131
+#: openbox/openbox.c:129

 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "無法變更到主目錄「%s」：%s"
 
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "無法變更到主目錄「%s」：%s"
 

-#: openbox/openbox.c:151
+#: openbox/openbox.c:149

 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "開啟依 DISPLAY 環境變數所指的顯示時失敗。"
 
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "開啟依 DISPLAY 環境變數所指的顯示時失敗。"
 

-#: openbox/openbox.c:182
+#: openbox/openbox.c:180

 msgid "Failed to initialize the obrender library."
 msgstr "初始化 obrender 函式庫時失敗。"
 
 msgid "Failed to initialize the obrender library."
 msgstr "初始化 obrender 函式庫時失敗。"
 

-#: openbox/openbox.c:188
+#: openbox/openbox.c:186

 msgid "X server does not support locale."
 msgstr "X 伺服器不支援語區。"
 
 msgid "X server does not support locale."
 msgstr "X 伺服器不支援語區。"
 

-#: openbox/openbox.c:190
+#: openbox/openbox.c:188

 msgid "Cannot set locale modifiers for the X server."
 msgstr "無法設定用於 X 伺服器的語區修飾項。"
 
 msgid "Cannot set locale modifiers for the X server."
 msgstr "無法設定用於 X 伺服器的語區修飾項。"
 

-#: openbox/openbox.c:253
+#: openbox/openbox.c:249

 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "無法找到有效的配置檔案，而使用某些簡單的預設值"
 
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "無法找到有效的配置檔案，而使用某些簡單的預設值"
 

-#: openbox/openbox.c:279
+#: openbox/openbox.c:275

 msgid "Unable to load a theme."
 msgstr "無法載入佈景主題。"
 
 msgid "Unable to load a theme."
 msgstr "無法載入佈景主題。"
 

-#: openbox/openbox.c:408
+#: openbox/openbox.c:401

 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "重新啟動以執行新的可執行檔「%s」時失敗：%s"
 
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "重新啟動以執行新的可執行檔「%s」時失敗：%s"
 

-#: openbox/openbox.c:478 openbox/openbox.c:480
+#: openbox/openbox.c:471 openbox/openbox.c:473

 msgid "Copyright (c)"
 msgstr "著作權 (c)"
 
 msgid "Copyright (c)"
 msgstr "著作權 (c)"
 

-#: openbox/openbox.c:489
+#: openbox/openbox.c:482

 msgid "Syntax: openbox [options]\n"
 msgstr "語法：openbox [選項]\n"
 
 msgid "Syntax: openbox [options]\n"
 msgstr "語法：openbox [選項]\n"
 

-#: openbox/openbox.c:490
+#: openbox/openbox.c:483

 msgid ""
 "\n"
 "Options:\n"
 msgid ""
 "\n"
 "Options:\n"


@@ -203,23 +201,23 @@ msgstr ""
 "\n"
 "選項：\n"
 
 "\n"
 "選項：\n"
 

-#: openbox/openbox.c:491
+#: openbox/openbox.c:484

 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              顯示此說明然後離開\n"
 
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              顯示此說明然後離開\n"
 

-#: openbox/openbox.c:492
+#: openbox/openbox.c:485

 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           顯示版本然後離開\n"
 
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           顯示版本然後離開\n"
 

-#: openbox/openbox.c:493
+#: openbox/openbox.c:486

 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           替換目前執行的視窗管理員\n"
 
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           替換目前執行的視窗管理員\n"
 

-#: openbox/openbox.c:494
+#: openbox/openbox.c:487

 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        停用與執行階段管理程式的連結\n"
 
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        停用與執行階段管理程式的連結\n"
 

-#: openbox/openbox.c:495
+#: openbox/openbox.c:488

 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"


@@ -227,15 +225,15 @@ msgstr ""
 "\n"
 "傳遞訊息到執行中的 Openbox 實體：\n"
 
 "\n"
 "傳遞訊息到執行中的 Openbox 實體：\n"
 

-#: openbox/openbox.c:496
+#: openbox/openbox.c:489

 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       重新載入 Openbox 配置\n"
 
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       重新載入 Openbox 配置\n"
 

-#: openbox/openbox.c:497
+#: openbox/openbox.c:490

 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           重新啟動 Openbox\n"
 
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           重新啟動 Openbox\n"
 

-#: openbox/openbox.c:498
+#: openbox/openbox.c:491

 msgid ""
 "\n"
 "Debugging options:\n"
 msgid ""
 "\n"
 "Debugging options:\n"


@@ -243,23 +241,23 @@ msgstr ""
 "\n"
 "偵錯選項：\n"
 
 "\n"
 "偵錯選項：\n"
 

-#: openbox/openbox.c:499
+#: openbox/openbox.c:492

 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              在同步模式中運行\n"
 
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              在同步模式中運行\n"
 

-#: openbox/openbox.c:500
+#: openbox/openbox.c:493

 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             顯示偵錯輸出\n"
 
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             顯示偵錯輸出\n"
 

-#: openbox/openbox.c:501
+#: openbox/openbox.c:494

 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       顯示焦點處理的偵錯輸出\n"
 
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       顯示焦點處理的偵錯輸出\n"
 

-#: openbox/openbox.c:502
+#: openbox/openbox.c:495

 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    分割顯示以進入假造的 xinerama 螢幕\n"
 
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    分割顯示以進入假造的 xinerama 螢幕\n"
 

-#: openbox/openbox.c:503
+#: openbox/openbox.c:496

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -268,27 +266,27 @@ msgstr ""
 "\n"
 "請向 %s 報告錯誤\n"
 
 "\n"
 "請向 %s 報告錯誤\n"
 

-#: openbox/openbox.c:600
+#: openbox/openbox.c:593

 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "無效的命令列引數「%s」\n"
 
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "無效的命令列引數「%s」\n"
 

-#: openbox/screen.c:95 openbox/screen.c:196
+#: openbox/screen.c:89 openbox/screen.c:190

 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "螢幕 %d 中已經有視窗管理員在運行"
 
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "螢幕 %d 中已經有視窗管理員在運行"
 

-#: openbox/screen.c:132
+#: openbox/screen.c:126

 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "無法於螢幕 %d 獲選為視窗管理員"
 
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "無法於螢幕 %d 獲選為視窗管理員"
 

-#: openbox/screen.c:153
+#: openbox/screen.c:147

 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "螢幕 %d 中的視窗管理員並未離開"
 
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "螢幕 %d 中的視窗管理員並未離開"
 

-#: openbox/screen.c:1077
+#: openbox/screen.c:991

 #, c-format
 msgid "desktop %i"
 msgstr "桌面 %i"
 #, c-format
 msgid "desktop %i"
 msgstr "桌面 %i"


@@ -337,9 +335,3 @@ msgstr "要求的按鍵「%s」不存在於畫面之中"
 #, c-format
 msgid "X Error: %s"
 msgstr "X 錯誤：%s"
 #, c-format
 msgid "X Error: %s"
 msgstr "X 錯誤：%s"

-
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "要求的動作「%s」無效。無此類動作存在。"
-
-#~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "使用的動作「%s」無效。動作將被忽略。"

diff --git a/tests/.svnignore b/tests/.svnignore
deleted file mode 100644 (file)
index 2376957..0000000
--- a/tests/.svnignore
+++ /dev/null
@@ -1,36 +0,0 @@
-title
-confignotify
-fallback
-grouptran2
-grouptrancircular
-fakeunmap
-showhide
-modal2
-skiptaskbar
-skiptaskbar2
-modal3
-override
-grouptran
-borderchange
-grouptrancircular2
-restack
-stacking
-groupmodal
-icons
-duplicatesession
-aspect
-modal
-noresize
-shape
-big
-urgent
-focusout
-positioned
-strut
-grav
-resize
-fullscreen
-mapiconic
-extentsrequest
-usertimewin
-confignotifymax