From b93c0e9468a99585e67d698a919977b090a6226c Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 25 May 2007 21:43:35 +0000 Subject: [PATCH] merge r6866-6873 from trunk --- configure.ac | 8 ++-- data/rc.xml | 94 ++++++++++++++++++++++++++++++------------ doc/rc-mouse-focus.xml | 11 +++-- openbox/screen.c | 5 ++- po/ca.po | 4 +- po/cs.po | 4 +- po/de.po | 4 +- po/en@boldquot.po | 8 ++-- po/en@quot.po | 8 ++-- po/es.po | 4 +- po/et.po | 4 +- po/fi.po | 4 +- po/fr.po | 4 +- po/hr.po | 4 +- po/it.po | 4 +- po/ja.po | 4 +- po/no.po | 4 +- po/openbox.pot | 4 +- po/pl.po | 4 +- po/pt.po | 4 +- po/pt_BR.po | 4 +- po/ru.po | 4 +- po/sk.po | 4 +- po/sv.po | 4 +- po/zh_TW.po | 4 +- 25 files changed, 128 insertions(+), 82 deletions(-) diff --git a/configure.ac b/configure.ac index 3aa8f811..096cd354 100644 --- 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 3ff65747..421de2da 100644 --- a/data/rc.xml +++ b/data/rc.xml @@ -221,14 +221,20 @@ - + + + + + - + + + @@ -262,7 +268,11 @@ - + + + + + @@ -287,14 +297,17 @@ - + + client-menu - + + + top @@ -303,7 +316,8 @@ - + + left @@ -312,7 +326,8 @@ - + + right @@ -321,7 +336,8 @@ - + + bottom @@ -334,14 +350,16 @@ - + + client-menu - + + @@ -350,7 +368,8 @@ - + + @@ -359,7 +378,9 @@ - + + + @@ -368,7 +389,9 @@ - + + + @@ -377,30 +400,38 @@ - + + - + + - + + - + + + client-menu - + + client-menu - + + + @@ -409,7 +440,8 @@ - + + @@ -418,7 +450,8 @@ - + + @@ -427,13 +460,19 @@ - + + + - + + + - + + + @@ -448,7 +487,9 @@ - + + + @@ -477,7 +518,8 @@ - + + diff --git a/doc/rc-mouse-focus.xml b/doc/rc-mouse-focus.xml index eb140b8e..3ad00fed 100644 --- a/doc/rc-mouse-focus.xml +++ b/doc/rc-mouse-focus.xml @@ -397,13 +397,16 @@ - + + - + + - + + @@ -491,7 +494,7 @@ - + diff --git a/openbox/screen.c b/openbox/screen.c index 08b2d740..b7cb41c8 100644 --- 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 cb5fc27f..9220b997 100644 --- 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 \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 70f358f0..e28b832f 100644 --- 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 \n" "Language-Team: Czech \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 189e7f72..e7b2bf9e 100644 --- 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 \n" "Language-Team: \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 443fe0fe..382ef559 100644 --- 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 7ab70715..060fa10d 100644 --- 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 c660e728..1d38943f 100644 --- 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 \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 b7fb36b6..51029e4c 100644 --- 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 \n" "Language-Team: Estonian \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 94ad67c0..22fdcfae 100644 --- 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 77db91ba..f9487680 100644 --- 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 \n" "Language-Team: French \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 51d378b5..ba6082a3 100644 --- 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 \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 aee69d74..1aa1dd42 100644 --- 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: \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 ff8847a2..6d8c9204 100644 --- 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 \n" "Language-Team: Japanese \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 1600b58c..4af0fc14 100644 --- 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 \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 b5707ad9..e514f1b5 100644 --- a/po/openbox.pot +++ b/po/openbox.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 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 \n" "Language-Team: LANGUAGE \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 2d6460b4..5d584fb3 100644 --- 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 \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 80cfc442..da252c82 100644 --- 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 \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 5facb581..aa1a83a4 100644 --- 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 \n" "Language-Team: Brazilian Portuguese \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 f8340586..7c0ffaf5 100644 --- 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 \n" "Language-Team: Russian \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 5902d454..3f93eb49 100644 --- 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 \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 50384b69..e3344495 100644 --- 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 \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 e6e0b288..c4627b6c 100644 --- 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 \n" "Language-Team: Chinese (traditional) \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" -- 2.34.1