merge r6866-6873 from trunk

diff --git a/configure.ac b/configure.ac
index 3aa8f81144eb9a49af01c1f32f73ec310af83926..096cd354c4793c40cafdc00d302ad4028d68be7e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [3.3.993], [http://bugzilla.icculus.org])
+AC_INIT([openbox], [3.3.994], [http://bugzilla.icculus.org])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([openbox/openbox.c])
 
@@ -15,9 +15,9 @@ dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match
 dnl
 OB_MAJOR_VERSION=3
 OB_MINOR_VERSION=4
-OB_MICRO_VERSION=9
-OB_INTERFACE_AGE=3
-OB_BINARY_AGE=3
+OB_MICRO_VERSION=10
+OB_INTERFACE_AGE=4
+OB_BINARY_AGE=4
 OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
 
 AC_SUBST(OB_MAJOR_VERSION)

diff --git a/data/rc.xml b/data/rc.xml
index 3ff65747564f3518d9fcd212eb22295b7323528b..421de2da3c62bf6e6c33e855c4060d49e8c0074b 100644 (file)
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -221,14 +221,20 @@
 
   <context name="Frame">
     <mousebind button="A-Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="A-Left" action="Click">
+      <action name="Unshade"/>
     </mousebind>
     <mousebind button="A-Left" action="Drag">
       <action name="Move"/>
     </mousebind>
 
     <mousebind button="A-Right" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
     </mousebind>
     <mousebind button="A-Right" action="Drag">
       <action name="Resize"/>
@@ -262,7 +268,11 @@
 
   <context name="Titlebar">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Left" action="Click">
+      <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Move"/>
@@ -287,14 +297,17 @@
     </mousebind>
 
     <mousebind button="Right" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
       <action name="ShowMenu"><menu>client-menu</menu></action>
     </mousebind>
   </context>
 
   <context name="Top">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"><edge>top</edge></action>
@@ -303,7 +316,8 @@
 
   <context name="Left">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"><edge>left</edge></action>
@@ -312,7 +326,8 @@
 
   <context name="Right">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"><edge>right</edge></action>
@@ -321,7 +336,8 @@
 
   <context name="Bottom">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"><edge>bottom</edge></action>
@@ -334,14 +350,16 @@
     </mousebind>
 
     <mousebind button="Right" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
       <action name="ShowMenu"><menu>client-menu</menu></action>
     </mousebind>
   </context>
 
   <context name="BLCorner">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"/>
@@ -350,7 +368,8 @@
 
   <context name="BRCorner">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"/>
@@ -359,7 +378,9 @@
 
   <context name="TLCorner">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"/>
@@ -368,7 +389,9 @@
 
   <context name="TRCorner">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"/>
@@ -377,30 +400,38 @@
 
   <context name="Client">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind>
     <mousebind button="Middle" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind>
     <mousebind button="Right" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind>
   </context>
 
   <context name="Icon">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
       <action name="ShowMenu"><menu>client-menu</menu></action>
     </mousebind>
     <mousebind button="Right" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
       <action name="ShowMenu"><menu>client-menu</menu></action>
     </mousebind>
   </context>
 
   <context name="AllDesktops">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Click">
       <action name="ToggleOmnipresent"/>
@@ -409,7 +440,8 @@
 
   <context name="Shade">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Click">
       <action name="ToggleShade"/>
@@ -418,7 +450,8 @@
 
   <context name="Iconify">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Click">
       <action name="Iconify"/>
@@ -427,13 +460,19 @@
 
   <context name="Maximize">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
     </mousebind>
     <mousebind button="Middle" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
     </mousebind>
     <mousebind button="Right" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Click">
       <action name="ToggleMaximizeFull"/>
@@ -448,7 +487,9 @@
 
   <context name="Close">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Click">
       <action name="Close"/>
@@ -477,7 +518,8 @@
     </mousebind>
 
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind>
   </context>
 

diff --git a/doc/rc-mouse-focus.xml b/doc/rc-mouse-focus.xml
index eb140b8ebb6ecf01e40767cb9b3c92a069fbb4ed..3ad00fed4ccd580dd73baf0b9f47e32c1e9821e0 100644 (file)
--- a/doc/rc-mouse-focus.xml
+++ b/doc/rc-mouse-focus.xml
@@ -397,13 +397,16 @@
 
   <context name="Client">
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind>
     <mousebind button="Middle" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind>
     <mousebind button="Right" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind>
   </context>
 
@@ -491,7 +494,7 @@
     </mousebind>
 
     <mousebind button="Left" action="Press">
-      <action name="Activate"/>
+      <action name="Focus"/>
     </mousebind>
   </context>
 

diff --git a/openbox/screen.c b/openbox/screen.c
index 08b2d74036dc663f625d3b77be2eb2f8004df586..b7cb41c85d8722a040f396598d19fc59bf69f9d4 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -508,10 +508,11 @@ void screen_set_desktop(guint num, gboolean dofocus)
      
     g_assert(num < screen_num_desktops);
 
-    if (old == num) return;
-
     old = screen_desktop;
     screen_desktop = num;
+
+    if (old == num) return;
+
     PROP_SET32(RootWindow(ob_display, ob_screen),
                net_current_desktop, cardinal, num);
 

diff --git a/po/ca.po b/po/ca.po
index cb5fc27f71d87a419de00f73d1b709cef7bbff6d..9220b997bdd8572f1348bfd798c65383d6357b67 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-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-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"
@@ -277,7 +277,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, fuzzy, c-format
 msgid "desktop %i"
 msgstr "Escriptoris"

diff --git a/po/cs.po b/po/cs.po
index 70f358f0cc0052fc53c9b815181ecb6749c39bf1..e28b832ff3f1bb250f9854fdf1e8a40326b6f840 100644 (file)
--- a/po/cs.po
+++ b/po/cs.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-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\n"
 "PO-Revision-Date: 2007-05-22 19:00+0100\n"
 "Last-Translator: tezlo <tezlo@gmx.net>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -293,7 +293,7 @@ msgstr "Nepodařilo se získat výseč pro window manager na obrazovce %d"
 msgid "The WM on screen %d is not exiting"
 msgstr "Window manager na obrazovce %d ne a ne skončit"
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, c-format
 msgid "desktop %i"
 msgstr "plochu %i"

diff --git a/po/de.po b/po/de.po
index 189e7f729dbe2a5a60e980ae77acd8470c84016f..e7b2bf9eced5b574ffbbfbacf2c7564e78626338 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-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-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"
@@ -289,7 +289,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, fuzzy, c-format
 msgid "desktop %i"
 msgstr "Alle Desktops"

diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index 443fe0fe0991d52ffbe013a927365f6802d0ded5..382ef55922af71cd3cce71b58a253db3917f49cd 100644 (file)
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openbox 3.3.992\n"
+"Project-Id-Version: openbox 3.3.993\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-24 14:51+0200\n"
-"PO-Revision-Date: 2007-05-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\n"
+"PO-Revision-Date: 2007-05-25 15:23-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -311,7 +311,7 @@ msgstr "Could not acquire window manager selection on screen %d"
 msgid "The WM on screen %d is not exiting"
 msgstr "The WM on screen %d is not exiting"
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"

diff --git a/po/en@quot.po b/po/en@quot.po
index 7ab707157a76a47f303fa9e33b385aa7353269b6..060fa10dadf47cfecf365f2eb5c4933b47bb1468 100644 (file)
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openbox 3.3.992\n"
+"Project-Id-Version: openbox 3.3.993\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-24 14:51+0200\n"
-"PO-Revision-Date: 2007-05-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\n"
+"PO-Revision-Date: 2007-05-25 15:23-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -308,7 +308,7 @@ msgstr "Could not acquire window manager selection on screen %d"
 msgid "The WM on screen %d is not exiting"
 msgstr "The WM on screen %d is not exiting"
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"

diff --git a/po/es.po b/po/es.po
index c660e728c8c933e3be9866ce37d8256b80ac0556..1d38943fb23da3db5764c1786c6f88818c4b1e92 100644 (file)
--- a/po/es.po
+++ b/po/es.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-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\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"
@@ -293,7 +293,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr "El WM en la pantalla %d no esta saliendo"
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, c-format
 msgid "desktop %i"
 msgstr "Escritorio %i"

diff --git a/po/et.po b/po/et.po
index b7fb36b6092dea97c21a80a8a7f54b10c663662b..51029e4c974f628088945cc354f0e81faaf40595 100644 (file)
--- a/po/et.po
+++ b/po/et.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-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\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"
@@ -289,7 +289,7 @@ msgstr "Ei suuda hankida aknahaldurite loetelu ekraanil %d"
 msgid "The WM on screen %d is not exiting"
 msgstr "Aknahaldur ekraanil %d ei sulgu"
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, c-format
 msgid "desktop %i"
 msgstr "töölaud %i"

diff --git a/po/fi.po b/po/fi.po
index 94ad67c005cf7c04a3f16d51229679a279c9f8c5..22fdcfae7662adb26a429b894f7efdea23d23e0b 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\n"
 "PO-Revision-Date: 2007-05-21 00:06+0200\n"
 "Last-Translator: Lauri Hakko\n"
 "Language-Team: None\n"
@@ -286,7 +286,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, c-format
 msgid "desktop %i"
 msgstr "työtila %i"

diff --git a/po/fr.po b/po/fr.po
index 77db91ba92b199c76cad46b55a91e4f990d5f1ea..f94876804d5987b461455d594474befefda4bbfb 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\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"
@@ -300,7 +300,7 @@ 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:939
+#: openbox/screen.c:946
 #, c-format
 msgid "desktop %i"
 msgstr "bureau %i"

diff --git a/po/hr.po b/po/hr.po
index 51d378b5dd08b5bf20d2a2def2dac4fb100d0714..ba6082a39656fc6c8f460e8892dfd6824f57c33d 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-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\n"
 "PO-Revision-Date: 2006-09-05 16:45+0100\n"
 "Last-Translator: Daniel Radetic <drade@boobah.info>\n"
 "Language-Team: None\n"
@@ -277,7 +277,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, fuzzy, c-format
 msgid "desktop %i"
 msgstr "Radne površine"

diff --git a/po/it.po b/po/it.po
index aee69d746912ebcfe2acd492752756dfec2de4be..1aa1dd42ff4b8dd1f371466ea3444b1f57b1d47a 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\n"
 "PO-Revision-Date: 2007-05-21 11:33+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <it@li.org>\n"
@@ -278,7 +278,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, c-format
 msgid "desktop %i"
 msgstr ""

diff --git a/po/ja.po b/po/ja.po
index ff8847a2645ab96d1243c4261286d71e7be99882..6d8c9204787b3f7c11d12523d5cc6e72ff54435b 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-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-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"
@@ -291,7 +291,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, fuzzy, c-format
 msgid "desktop %i"
 msgstr "デスクトップ"

diff --git a/po/no.po b/po/no.po
index 1600b58c82baeca3c09906d1e77641eb2e9d3b59..4af0fc1492306816d10d431836b8d12bd6e8fb52 100644 (file)
--- a/po/no.po
+++ b/po/no.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-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\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"
@@ -285,7 +285,7 @@ msgstr "Kunne ikke hendte vindusbehandlerens markering på skjerm %d"
 msgid "The WM on screen %d is not exiting"
 msgstr "Vindusbehandleren på skjerm %d vil ikke avslutte"
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, c-format
 msgid "desktop %i"
 msgstr "skrivebord %i"

diff --git a/po/openbox.pot b/po/openbox.pot
index b5707ad98383a736a0d8c3119dc605a20558837b..e514f1b520b693862395a5879399f3ec46f91296 100644 (file)
--- a/po/openbox.pot
+++ b/po/openbox.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -278,7 +278,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, c-format
 msgid "desktop %i"
 msgstr ""

diff --git a/po/pl.po b/po/pl.po
index 2d6460b4ec048bbe1612eb6a8de64857ff42d45b..5d584fb3fa5ee558709f9c5a89b0ccfc4eae1356 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\n"
 "PO-Revision-Date: 2007-05-21 18:09+0100\n"
 "Last-Translator: Paweł Rusinek <p.rusinek@gmail.com>\n"
 "Language-Team: None\n"
@@ -292,7 +292,7 @@ msgstr "Nie można uzyskać wyboru menedżera okien na ekranie %d"
 msgid "The WM on screen %d is not exiting"
 msgstr "Menedżer okien na ekranie %d nie kończy działania"
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, c-format
 msgid "desktop %i"
 msgstr "pulpit %i"

diff --git a/po/pt.po b/po/pt.po
index 80cfc4428e9bffb15c7322e7ce2bb8c80da5e6e2..da252c820b0e7e2186e4166eb87bb3ed069eff88 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\n"
 "PO-Revision-Date: 2007-05-23 00:34+0200\n"
 "Last-Translator: Althaser <Althaser@gmail.com>\n"
 "Language-Team: None\n"
@@ -290,7 +290,7 @@ msgstr "N
 msgid "The WM on screen %d is not exiting"
 msgstr "O gestor de janelas no ecrã %d não está fechando"
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, c-format
 msgid "desktop %i"
 msgstr "trabalho %i"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5facb581731ec0e271e5220ccd0b3b21cb447b76..aa1a83a40e2320f80187676ef9f877b11305992a 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\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"
@@ -295,7 +295,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr "O gerenciador de janelas na tela %d não está saindo"
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, c-format
 msgid "desktop %i"
 msgstr "trabalho %i"

diff --git a/po/ru.po b/po/ru.po
index f83405869b7df86a6c3822d7c53cba05918dd927..7c0ffaf53bb1e78b7083f336b4a2ad774570bb39 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-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-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"
@@ -277,7 +277,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, fuzzy, c-format
 msgid "desktop %i"
 msgstr "Рабочие места"

diff --git a/po/sk.po b/po/sk.po
index 5902d454b9d747d039ae0c93c241b0e043f0d47f..3f93eb49c39fee38ed133f6be6bf179ba7578fa7 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-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-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"
@@ -277,7 +277,7 @@ msgstr ""
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, fuzzy, c-format
 msgid "desktop %i"
 msgstr "Plochy"

diff --git a/po/sv.po b/po/sv.po
index 50384b692eead4a2ec64e4b8a108376160122bd2..e3344495967560781b803c526c999431172d097d 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-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\n"
 "PO-Revision-Date: 2007-05-22 00:29+0200\n"
 "Last-Translator: Mikael Magnusson <mikachu@icculus.org>\n"
 "Language-Team: None\n"
@@ -286,7 +286,7 @@ msgstr "Kunde inte erh
 msgid "The WM on screen %d is not exiting"
 msgstr "Fönsterhanteraren på skärm %d avslutar inte"
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, c-format
 msgid "desktop %i"
 msgstr "skrivbord %i"

diff --git a/po/zh_TW.po b/po/zh_TW.po
index e6e0b288b70f37820c87060d0befba2b883f690d..c4627b6cbe342adbd46567eb67d0371e9fed8012 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.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-24 14:51+0200\n"
+"POT-Creation-Date: 2007-05-25 15:23-0400\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"
@@ -286,7 +286,7 @@ msgstr "無法於螢幕 %d 獲選為視窗管理員"
 msgid "The WM on screen %d is not exiting"
 msgstr "螢幕 %d 中的視窗管理員並未離開"
 
-#: openbox/screen.c:939
+#: openbox/screen.c:946
 #, c-format
 msgid "desktop %i"
 msgstr "桌面 %i"