merge r6463-6468 from trunk

diff --git a/Makefile.am b/Makefile.am
index b35a453b29163068a65a602f6f686ba80b0fda00..ea29454d7aafaa6057dd44eac051784543a345dc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -346,7 +346,7 @@ dist_rc_DATA = \
 
 edit = $(SED) \
        -e 's!@version\@!$(VERSION)!' \
-       -e 's!@confdir\@!$(confdir)!' \
+       -e 's!@configdir\@!$(configdir)!' \
        -e 's!@bindir\@!$(bindir)!'
 
 data/xsession/openbox-gnome-session: Makefile data \
@@ -435,7 +435,7 @@ dist_doc_DATA = \
        data/rc.xsd \
        data/menu.xsd
 
-man_MANS = \
+dist_man_MANS = \
        doc/openbox.1 \
        doc/openbox-gnome-session.1 \
        doc/openbox-kde-session.1

diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml
index a8f2fe74554e16cf761775b1faf1e4ecd745db17..b2b4a8363e0875dbb19b39515cbf0ea0ed54c0f1 100644 (file)
--- a/doc/openbox.1.sgml
+++ b/doc/openbox.1.sgml
@@ -81,7 +81,7 @@ manpage.1: manpage.sgml
     <para>You can use the <command>obconf</command> tool to configure Openbox
       easily with a graphical interface, however more in-depth configuration
       is possible by editing the configuration files by hand. The default
-      configuration file is installed in @confdir@/xdg/openbox/rc.xml, and the
+      configuration file is installed in @configdir@/openbox/rc.xml, and the
       user configuration is placed in ~/.config/openbox/rc.xml. You can copy
       the default configuration to ~/.config/openbox and edit it to your
       liking.</para>

diff --git a/openbox/dock.c b/openbox/dock.c
index 0cc42285a3e7a8c2de406956d9000cf976712ef8..697261e202dfc9e4fbd6e4203558fa92cf0147e0 100644 (file)
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -28,7 +28,7 @@
 #include "render/theme.h"
 
 #define DOCK_EVENT_MASK (ButtonPressMask | ButtonReleaseMask | \
-                         EnterWindowMask | LeaveWindowMask)
+                         EnterWindowMask | LeaveWindowMask | FocusChangeMask)
 #define DOCKAPP_EVENT_MASK (StructureNotifyMask)
 
 static ObDock *dock;

diff --git a/openbox/event.c b/openbox/event.c
index 9e72408db951a40cc9f381b4541ce0c49036e620..e431e8f40972c47fdaad81c12f26b65b8fb63d6c 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -307,15 +307,26 @@ static gboolean wanted_focusevent(XEvent *e, gboolean in_client_only)
                 return FALSE;
         }
 
+        /* This means focus moved to the frame window */
+        if (detail == NotifyInferior && !in_client_only)
+            return TRUE;
+
+        /* It was on a client, was it a valid one?
+           It's possible to get a FocusIn event for a client that was managed
+           but has disappeared. Don't even parse those FocusIn events.
+        */
+        {
+            ObWindow *w = g_hash_table_lookup(window_map, &e->xfocus.window);
+            if (!w || !WINDOW_IS_CLIENT(w))
+                return FALSE;
+        }
+
         /* This means focus moved from the root window to a client */
         if (detail == NotifyVirtual)
             return TRUE;
         /* This means focus moved from one client to another */
         if (detail == NotifyNonlinearVirtual)
             return TRUE;
-        /* This means focus moved to the frame window */
-        if (detail == NotifyInferior && !in_client_only)
-            return TRUE;
 
         /* Otherwise.. */
         return FALSE;
@@ -356,13 +367,7 @@ static Bool event_look_for_focusin(Display *d, XEvent *e, XPointer arg)
 
 Bool event_look_for_focusin_client(Display *d, XEvent *e, XPointer arg)
 {
-    ObWindow *w;
-
-    /* It is possible to get FocusIn events or unmanaged windows, meaning
-       they won't be for any known client */
-    return e->type == FocusIn && wanted_focusevent(e, TRUE) &&
-        (w = g_hash_table_lookup(window_map, &e->xfocus.window)) &&
-        WINDOW_IS_CLIENT(w);
+    return e->type == FocusIn && wanted_focusevent(e, TRUE);
 }
 
 static void print_focusevent(XEvent *e)
@@ -475,6 +480,7 @@ static void event_process(const XEvent *ec, gpointer data)
             e->xfocus.detail == NotifyInferior)
         {
             XEvent ce;
+
             ob_debug_type(OB_DEBUG_FOCUS,
                           "Focus went to pointer root/none or to our frame "
                           "window\n");
@@ -514,17 +520,6 @@ static void event_process(const XEvent *ec, gpointer data)
                     focus_fallback(TRUE);
             }
         }
-        else if (!client) {
-            /* It is possible to get FocusIn events or unmanaged windows,
-               meaning they won't be for any known client
-
-               If this happens, set the client to NULL so we know focus
-               has wandered off, and we'll get a focus out for it
-               shortly.
-            */
-            ob_debug_type(OB_DEBUG_FOCUS, "Focus went to an invalid target\n");
-            focus_set_client(NULL);
-        }
         else if (client != focus_client) {
             focus_left_screen = FALSE;
             frame_adjust_focus(client->frame, TRUE);

diff --git a/openbox/focus.c b/openbox/focus.c
index a756a9b5484841d7a54fb62dc46809a1bbe89c2d..72588a30a958b0bcacafbbc472d57565d3d9e25a 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -280,19 +280,15 @@ ObClient* focus_fallback(gboolean allow_refocus)
     old = focus_client;
     new = focus_fallback_target(allow_refocus, focus_client);
 
-    /* send focus somewhere if it is moving or if it was NULL before,
-       in which case it may not even be on the screen */
-    if (!old || new != old) {
-        /* unfocus any focused clients.. they can be focused by Pointer events
-           and such, and then when we try focus them, we won't get a FocusIn
-           event at all for them. */
-        focus_nothing();
-
-        if (new) {
-            client_focus(new);
-            /* remember that we tried to send focus here */
-            focus_tried = new;
-        }
+    /* unfocus any focused clients.. they can be focused by Pointer events
+       and such, and then when we try focus them, we won't get a FocusIn
+       event at all for them. */
+    focus_nothing();
+
+    if (new) {
+        client_focus(new);
+        /* remember that we tried to send focus here */
+        focus_tried = new;
     }
 
     return new;

diff --git a/openbox/resist.c b/openbox/resist.c
index 56bd214dbe8e51281812f63d1852b7da5f9e729b..ab71d132f68efc7470d9fe49fca72888ef2b229e 100644 (file)
--- a/openbox/resist.c
+++ b/openbox/resist.c
@@ -57,9 +57,6 @@ void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y)
 
         if (!WINDOW_IS_CLIENT(it->data))
             continue;
-        /* only snap in the same layer */
-        if (window_layer(it->data) != c->layer)
-            continue;
         target = it->data;
 
         /* don't snap to self or non-visibles */
@@ -206,9 +203,6 @@ void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h,
     for (it = stacking_list; it; it = g_list_next(it)) {
         if (!WINDOW_IS_CLIENT(it->data))
             continue;
-        /* only snap in the same layer */
-        if (window_layer(it->data) != c->layer)
-            continue;
         target = it->data;
 
         /* don't snap to invisibles or ourself */

diff --git a/po/ca.po b/po/ca.po
index 7cde57beaee4ae078f164c9cfd544c7b313a96e3..b7af0eb7b7ef1ccfb3830574755175fc6ffe6198 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
 "PO-Revision-Date: 2004-01-25 20:41+0100\n"
 "Last-Translator: David Majà Martínez <davidmaja@gmail.com>\n"
 "Language-Team: catalan\n"
@@ -214,66 +214,66 @@ msgid ""
 msgstr ""
 
 #: openbox/openbox.c:460
-msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:462
-msgid "  --sm-disable        Disable connection to the session manager\n"
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:464
+#: openbox/openbox.c:462
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
+#: openbox/openbox.c:463
+msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
+#: openbox/openbox.c:464
+msgid "  --config TYPE       Specify the configuration profile to use\n"
 msgstr ""
 
-#: openbox/openbox.c:467
+#: openbox/openbox.c:465
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr ""
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 #, fuzzy
 msgid "--config requires an argument\n"
 msgstr "--sm-save-file necessita un argument\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr ""

diff --git a/po/de.po b/po/de.po
index 4b7f2565682bfe0620b6ddb7ddea5260a4de6623..2b4d7f697965dcd3a30a1e8bedb4f8d76ca36910 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
 "PO-Revision-Date: 2006-06-11 10:41+0200\n"
 "Last-Translator: Simon A. Wilper <simonaw@openoffice.org>\n"
 "Language-Team:  <de@li.org>\n"
@@ -222,28 +222,28 @@ msgstr ""
 "\n"
 
 #: openbox/openbox.c:460
-#, fuzzy
-msgid "  --config TYPE       Specify the configuration profile to use\n"
-msgstr "  --reconfigure       Openbox's Konfiguration neu laden\n"
+msgid "  --help              Display this help and exit\n"
+msgstr "  --help              Diese Hilfe anzeigen und beenden\n"
+
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
+msgstr "  --version           Version anzeigen und beenden\n"
 
 #: openbox/openbox.c:462
+msgid "  --replace           Replace the currently running window manager\n"
+msgstr "  --replace           Den aktuell laufenden Fenstermanager ersetzen\n"
+
+#: openbox/openbox.c:463
 #, fuzzy
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Keine Verbindung zum Sitzungsmanager aufbauen\n"
 
 #: openbox/openbox.c:464
-msgid "  --replace           Replace the currently running window manager\n"
-msgstr "  --replace           Den aktuell laufenden Fenstermanager ersetzen\n"
+#, fuzzy
+msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgstr "  --reconfigure       Openbox's Konfiguration neu laden\n"
 
 #: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
-msgstr "  --help              Diese Hilfe anzeigen und beenden\n"
-
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
-msgstr "  --version           Version anzeigen und beenden\n"
-
-#: openbox/openbox.c:467
 #, fuzzy
 msgid ""
 "\n"
@@ -253,11 +253,11 @@ msgstr ""
 "Nachrichten an eine laufende Openbox-Instanz weiterleiten:\n"
 "\n"
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Openbox's Konfiguration neu laden\n"
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 #, fuzzy
 msgid ""
 "\n"
@@ -268,20 +268,20 @@ msgstr ""
 "Debugging Optionen:\n"
 "\n"
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --snyc              im Synchronisierungsmodus starten\n"
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Debugging-Informationen anzeigen\n"
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Debugging-Informationen fürs Fokus-Handling anzeigen\n"
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -291,12 +291,12 @@ msgstr ""
 "Bitte melden Sie Bugreports an: %s\n"
 "\n"
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 #, fuzzy
 msgid "--config requires an argument\n"
 msgstr "--config-file benötigt ein Argument\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr ""

diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index cad1e21467cac6839101260c90da53dbee99fbb4..10ab3048f56890514c1a7dab7ee9d8398fac12b8 100644 (file)
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.3.990\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
-"PO-Revision-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
+"PO-Revision-Date: 2007-05-13 16:42-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -227,26 +227,26 @@ msgstr ""
 "Options:\n"
 
 #: openbox/openbox.c:460
-msgid "  --config TYPE       Specify the configuration profile to use\n"
-msgstr "  --config TYPE       Specify the configuration profile to use\n"
+msgid "  --help              Display this help and exit\n"
+msgstr "  --help              Display this help and exit\n"
+
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
+msgstr "  --version           Display the version and exit\n"
 
 #: openbox/openbox.c:462
+msgid "  --replace           Replace the currently running window manager\n"
+msgstr "  --replace           Replace the currently running window manager\n"
+
+#: openbox/openbox.c:463
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Disable connection to the session manager\n"
 
 #: openbox/openbox.c:464
-msgid "  --replace           Replace the currently running window manager\n"
-msgstr "  --replace           Replace the currently running window manager\n"
+msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgstr "  --config TYPE       Specify the configuration profile to use\n"
 
 #: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
-msgstr "  --help              Display this help and exit\n"
-
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
-msgstr "  --version           Display the version and exit\n"
-
-#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -254,11 +254,11 @@ msgstr ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Reload Openbox's configuration\n"
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -266,19 +266,19 @@ msgstr ""
 "\n"
 "Debugging options:\n"
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Run in synchronous mode\n"
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Display debugging output\n"
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Display debugging output for focus handling\n"
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
@@ -287,11 +287,11 @@ msgstr ""
 "\n"
 "Please report bugs at %s\n"
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 msgid "--config requires an argument\n"
 msgstr "--config requires an argument\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Invalid command line argument ‘\e[1m%s\e[0m’\n"

diff --git a/po/en@quot.po b/po/en@quot.po
index d86ed0b71e3c08102fc33e3b4cc3f7ec8afc67d4..b167c02577c68a4b621ae099213ad2ef6710c6ac 100644 (file)
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -29,8 +29,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.3.990\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
-"PO-Revision-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
+"PO-Revision-Date: 2007-05-13 16:42-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -224,26 +224,26 @@ msgstr ""
 "Options:\n"
 
 #: openbox/openbox.c:460
-msgid "  --config TYPE       Specify the configuration profile to use\n"
-msgstr "  --config TYPE       Specify the configuration profile to use\n"
+msgid "  --help              Display this help and exit\n"
+msgstr "  --help              Display this help and exit\n"
+
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
+msgstr "  --version           Display the version and exit\n"
 
 #: openbox/openbox.c:462
+msgid "  --replace           Replace the currently running window manager\n"
+msgstr "  --replace           Replace the currently running window manager\n"
+
+#: openbox/openbox.c:463
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Disable connection to the session manager\n"
 
 #: openbox/openbox.c:464
-msgid "  --replace           Replace the currently running window manager\n"
-msgstr "  --replace           Replace the currently running window manager\n"
+msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgstr "  --config TYPE       Specify the configuration profile to use\n"
 
 #: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
-msgstr "  --help              Display this help and exit\n"
-
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
-msgstr "  --version           Display the version and exit\n"
-
-#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -251,11 +251,11 @@ msgstr ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Reload Openbox's configuration\n"
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -263,19 +263,19 @@ msgstr ""
 "\n"
 "Debugging options:\n"
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Run in synchronous mode\n"
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Display debugging output\n"
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Display debugging output for focus handling\n"
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
@@ -284,11 +284,11 @@ msgstr ""
 "\n"
 "Please report bugs at %s\n"
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 msgid "--config requires an argument\n"
 msgstr "--config requires an argument\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Invalid command line argument ‘%s’\n"

diff --git a/po/es.po b/po/es.po
index 514a3961ae4c9b002df426013f69ea0e477f30fa..e6c99ad077b8b5d1a2611c9f7e43241e8567ca58 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
 "PO-Revision-Date: 2005-03-25 09:31+0100\n"
 "Last-Translator: Miguel Calleja Gómez <mcg79@lycos.es>\n"
 "Language-Team: None\n"
@@ -214,66 +214,66 @@ msgid ""
 msgstr ""
 
 #: openbox/openbox.c:460
-msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:462
-msgid "  --sm-disable        Disable connection to the session manager\n"
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:464
+#: openbox/openbox.c:462
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
+#: openbox/openbox.c:463
+msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
+#: openbox/openbox.c:464
+msgid "  --config TYPE       Specify the configuration profile to use\n"
 msgstr ""
 
-#: openbox/openbox.c:467
+#: openbox/openbox.c:465
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr ""
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 #, fuzzy
 msgid "--config requires an argument\n"
 msgstr "--sm-save-file necesita un argumento\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr ""

diff --git a/po/fi.po b/po/fi.po
index 5bb3c4d505668ef2fd520cb31431915b63985f86..cf88dcf57855ce483ebb290559b9ec39474adcbe 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
 "PO-Revision-Date: 2005-03-15 21:29+0200\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@hut.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -214,66 +214,66 @@ msgid ""
 msgstr ""
 
 #: openbox/openbox.c:460
-msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:462
-msgid "  --sm-disable        Disable connection to the session manager\n"
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:464
+#: openbox/openbox.c:462
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
+#: openbox/openbox.c:463
+msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
+#: openbox/openbox.c:464
+msgid "  --config TYPE       Specify the configuration profile to use\n"
 msgstr ""
 
-#: openbox/openbox.c:467
+#: openbox/openbox.c:465
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr ""
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 #, fuzzy
 msgid "--config requires an argument\n"
 msgstr "--sm-save-file tarvitsee parametrin\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr ""

diff --git a/po/fr.po b/po/fr.po
index e984c468f963220e50d313c4e3e8491f8d448ff3..975b7b4720d45bdf1cf0db8efa9ec31549d8bfbf 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
 "PO-Revision-Date: 2004-06-11 23:06+0200\n"
 "Last-Translator: Julien Louis <leonptitlouis@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -214,66 +214,66 @@ msgid ""
 msgstr ""
 
 #: openbox/openbox.c:460
-msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:462
-msgid "  --sm-disable        Disable connection to the session manager\n"
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:464
+#: openbox/openbox.c:462
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
+#: openbox/openbox.c:463
+msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
+#: openbox/openbox.c:464
+msgid "  --config TYPE       Specify the configuration profile to use\n"
 msgstr ""
 
-#: openbox/openbox.c:467
+#: openbox/openbox.c:465
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr ""
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 #, fuzzy
 msgid "--config requires an argument\n"
 msgstr "--sm-save-file requiert un argument\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr ""

diff --git a/po/hr.po b/po/hr.po
index c176c60f0c604e2fd6f3b0731df20465aaca052c..cfd88e502a035181f32378dfd72b8f639c2a6ba9 100644 (file)
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
 "PO-Revision-Date: 2006-09-05 16:45+0100\n"
 "Last-Translator: Daniel Radetic <drade@boobah.info>\n"
 "Language-Team: None\n"
@@ -213,66 +213,66 @@ msgid ""
 msgstr ""
 
 #: openbox/openbox.c:460
-msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:462
-msgid "  --sm-disable        Disable connection to the session manager\n"
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:464
+#: openbox/openbox.c:462
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
+#: openbox/openbox.c:463
+msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
+#: openbox/openbox.c:464
+msgid "  --config TYPE       Specify the configuration profile to use\n"
 msgstr ""
 
-#: openbox/openbox.c:467
+#: openbox/openbox.c:465
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr ""
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 #, fuzzy
 msgid "--config requires an argument\n"
 msgstr "--sm-save-file zahtjeva argument\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr ""

diff --git a/po/ja.po b/po/ja.po
index a3f6502781422fbc0401861d0d83a49068f6e413..1a9a70657c91217af9d026387b176b047a1f355a 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
 "PO-Revision-Date: 2003-11-20 15:00+0900\n"
 "Last-Translator: Yukihiro Nakai <nakai@gnome.gr.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -213,66 +213,66 @@ msgid ""
 msgstr ""
 
 #: openbox/openbox.c:460
-msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:462
-msgid "  --sm-disable        Disable connection to the session manager\n"
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:464
+#: openbox/openbox.c:462
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
+#: openbox/openbox.c:463
+msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
+#: openbox/openbox.c:464
+msgid "  --config TYPE       Specify the configuration profile to use\n"
 msgstr ""
 
-#: openbox/openbox.c:467
+#: openbox/openbox.c:465
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr ""
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 #, fuzzy
 msgid "--config requires an argument\n"
 msgstr "--sm-save-file には引数が必要です\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr ""

diff --git a/po/no.po b/po/no.po
index 7aa3a03283dabc7450b08e5272043221d1271f74..165958a25db5db12432281dc6a2753adf88761e2 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
 "PO-Revision-Date: 2004-03-29 18:33:39+0200\n"
 "Last-Translator: Øyvind Albrigtsen\n"
 "Language-Team: None\n"
@@ -214,66 +214,66 @@ msgid ""
 msgstr ""
 
 #: openbox/openbox.c:460
-msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:462
-msgid "  --sm-disable        Disable connection to the session manager\n"
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:464
+#: openbox/openbox.c:462
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
+#: openbox/openbox.c:463
+msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
+#: openbox/openbox.c:464
+msgid "  --config TYPE       Specify the configuration profile to use\n"
 msgstr ""
 
-#: openbox/openbox.c:467
+#: openbox/openbox.c:465
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr ""
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 #, fuzzy
 msgid "--config requires an argument\n"
 msgstr "--sm-save-file krever et argument\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr ""

diff --git a/po/pl.po b/po/pl.po
index fd53b8fda29713ecd9fe9e002c0628c2618ca794..13976bf3dc425af23e86e6151a35c4dc0917beb0 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
 "PO-Revision-Date: 2004-09-07 21:17+0200\n"
 "Last-Translator: Madej <madej@afn.no-ip.org>\n"
 "Language-Team: NONE\n"
@@ -214,66 +214,66 @@ msgid ""
 msgstr ""
 
 #: openbox/openbox.c:460
-msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:462
-msgid "  --sm-disable        Disable connection to the session manager\n"
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:464
+#: openbox/openbox.c:462
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
+#: openbox/openbox.c:463
+msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
+#: openbox/openbox.c:464
+msgid "  --config TYPE       Specify the configuration profile to use\n"
 msgstr ""
 
-#: openbox/openbox.c:467
+#: openbox/openbox.c:465
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr ""
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 #, fuzzy
 msgid "--config requires an argument\n"
 msgstr "--sm-save-file wymaga argumentu\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr ""

diff --git a/po/pt.po b/po/pt.po
index e17cdc220d6fb4a48bfb4277b13294254ac3fecc..14f5960297fbff8e339bd3c714256ab64c7e7052 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
 "PO-Revision-Date: 2004-03-29 18:33:39+0200\n"
 "Last-Translator: Gonçalo Ferreira <gonsas@gmail.com>\n"
 "Language-Team: None\n"
@@ -214,66 +214,66 @@ msgid ""
 msgstr ""
 
 #: openbox/openbox.c:460
-msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:462
-msgid "  --sm-disable        Disable connection to the session manager\n"
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:464
+#: openbox/openbox.c:462
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
+#: openbox/openbox.c:463
+msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
+#: openbox/openbox.c:464
+msgid "  --config TYPE       Specify the configuration profile to use\n"
 msgstr ""
 
-#: openbox/openbox.c:467
+#: openbox/openbox.c:465
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr ""
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 #, fuzzy
 msgid "--config requires an argument\n"
 msgstr "--sm-save-file requer um argumento\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr ""

diff --git a/po/ru.po b/po/ru.po
index 8283ac4b74a6ca17d318e0007e99ee74d7bcf750..9e9fd86ba5fb9cdd4ac20134d10ffbd8ea01322f 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
 "PO-Revision-Date: 2004-04-23 13:00+0300\n"
 "Last-Translator: Alexey Remizov <alexey@remizov.pp.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
@@ -214,66 +214,66 @@ msgid ""
 msgstr ""
 
 #: openbox/openbox.c:460
-msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:462
-msgid "  --sm-disable        Disable connection to the session manager\n"
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:464
+#: openbox/openbox.c:462
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
+#: openbox/openbox.c:463
+msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
+#: openbox/openbox.c:464
+msgid "  --config TYPE       Specify the configuration profile to use\n"
 msgstr ""
 
-#: openbox/openbox.c:467
+#: openbox/openbox.c:465
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr ""
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 #, fuzzy
 msgid "--config requires an argument\n"
 msgstr "--sm-save-file требует параметр\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr ""

diff --git a/po/sk.po b/po/sk.po
index 2fb57e64dac60a4e34ab9d892208b7df9d610db8..9beeeac0472806c7ba7a883595e4f1410777ed9f 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox-3.3rc2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
 "PO-Revision-Date: 2006-08-25 00:52+0200\n"
 "Last-Translator: Jozef Riha <jose1711@gmail.com\n"
 "Language-Team: Slovak <LL@li.org>\n"
@@ -214,66 +214,66 @@ msgid ""
 msgstr ""
 
 #: openbox/openbox.c:460
-msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:462
-msgid "  --sm-disable        Disable connection to the session manager\n"
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:464
+#: openbox/openbox.c:462
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
+#: openbox/openbox.c:463
+msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
+#: openbox/openbox.c:464
+msgid "  --config TYPE       Specify the configuration profile to use\n"
 msgstr ""
 
-#: openbox/openbox.c:467
+#: openbox/openbox.c:465
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr ""
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 #, fuzzy
 msgid "--config requires an argument\n"
 msgstr "--sm-save-file vyžaduje parameter\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr ""

diff --git a/po/sv.po b/po/sv.po
index fa888a440173536af11a21863ed9eb819292c7a6..90a81d2a6edb54d72df6144cb99dc792863dd6eb 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
 "PO-Revision-Date: 2007-05-06 13:44+0200\n"
 "Last-Translator: Mikael Magnusson <mikachu@icculus.org>\n"
 "Language-Team: None\n"
@@ -202,27 +202,27 @@ msgstr ""
 "Alternativ:\n"
 
 #: openbox/openbox.c:460
-msgid "  --config TYPE       Specify the configuration profile to use\n"
-msgstr ""
-"  --config TYP        Ange vilken konfigurationsprofil som ska användas\n"
+msgid "  --help              Display this help and exit\n"
+msgstr "  --help              Visa den här hjälpen och avsluta\n"
+
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
+msgstr "  --version           Visa versionen och avsluta\n"
 
 #: openbox/openbox.c:462
+msgid "  --replace           Replace the currently running window manager\n"
+msgstr "  --replace           Ersätt den befintliga fönsterhanteraren\n"
+
+#: openbox/openbox.c:463
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Avaktivera anslutning till sessions-hanteraren\n"
 
 #: openbox/openbox.c:464
-msgid "  --replace           Replace the currently running window manager\n"
-msgstr "  --replace           Ersätt den befintliga fönsterhanteraren\n"
+msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgstr ""
+"  --config TYP        Ange vilken konfigurationsprofil som ska användas\n"
 
 #: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
-msgstr "  --help              Visa den här hjälpen och avsluta\n"
-
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
-msgstr "  --version           Visa versionen och avsluta\n"
-
-#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -230,11 +230,11 @@ msgstr ""
 "\n"
 "Skicka meddelanden till en exekverande instans av Openbox:\n"
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Ladda om Openbox konfiguration\n"
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -242,19 +242,19 @@ msgstr ""
 "\n"
 "Debug-alternativ:\n"
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Kör i synkroniserat läge\n"
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Visa debuginformation\n"
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Visa debuginformation för fokushantering\n"
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
@@ -263,11 +263,11 @@ msgstr ""
 "\n"
 "Rapportera buggar till %s\n"
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 msgid "--config requires an argument\n"
 msgstr "--config kräver ett argument\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, fuzzy, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Ogiltig utdata från pipe-menyn '%s'"

diff --git a/po/zh_TW.po b/po/zh_TW.po
index be6e8d6c436ac3a324ef1450b715d62af79dd0ee..cb375e04cfcadbc09769d5571dbd7101ee4b0f19 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.3rc2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0400\n"
+"POT-Creation-Date: 2007-05-13 16:42-0400\n"
 "PO-Revision-Date: 2006-03-01 12:00+0800\n"
 "Last-Translator: Wei-Lun Chao <william.chao@ossii.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -215,66 +215,66 @@ msgid ""
 msgstr ""
 
 #: openbox/openbox.c:460
-msgid "  --config TYPE       Specify the configuration profile to use\n"
+msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:462
-msgid "  --sm-disable        Disable connection to the session manager\n"
+#: openbox/openbox.c:461
+msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:464
+#: openbox/openbox.c:462
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:465
-msgid "  --help              Display this help and exit\n"
+#: openbox/openbox.c:463
+msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:466
-msgid "  --version           Display the version and exit\n"
+#: openbox/openbox.c:464
+msgid "  --config TYPE       Specify the configuration profile to use\n"
 msgstr ""
 
-#: openbox/openbox.c:467
+#: openbox/openbox.c:465
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 
-#: openbox/openbox.c:468
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr ""
 
-#: openbox/openbox.c:469
+#: openbox/openbox.c:467
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:529
 #, fuzzy
 msgid "--config requires an argument\n"
 msgstr "--sm-save-file 要求引數\n"
 
-#: openbox/openbox.c:568
+#: openbox/openbox.c:564
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr ""

diff --git a/tests/showhide.c b/tests/showhide.c
new file mode 100644 (file)
index 0000000..a0b51e7
--- /dev/null
+++ b/tests/showhide.c
@@ -0,0 +1,54 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   showhide.c for the Openbox window manager
+   Copyright (c) 2003-2007   Dana Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
+#include <stdio.h>
+#include <unistd.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+int main () {
+  Display   *display;
+  Window     win;
+  XEvent     report;
+  XEvent     msg;
+  int        x=50,y=50,h=100,w=400;
+
+  display = XOpenDisplay(NULL);
+
+  if (display == NULL) {
+    fprintf(stderr, "couldn't connect to X server :0\n");
+    return 0;
+  }
+
+  while (1) {
+      win = XCreateWindow(display, RootWindow(display, 0),
+                          x, y, w, h, 10, CopyFromParent, CopyFromParent,
+                          CopyFromParent, 0, NULL);
+      XSetWindowBackground(display,win,WhitePixel(display,0)); 
+      XMapWindow(display, win);
+      XFlush(display);
+      usleep(1000);
+      XDestroyWindow(display, win);
+      XSync(display, False);
+
+      break;
+      sleep(2);
+  }
+
+  return 1;
+}