From a7ecc6ec211058e5f4a1cfde03992d9b14a6f098 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 30 May 2007 17:56:10 +0000 Subject: [PATCH] merge r7109 from trunk --- openbox/event.c | 4 +++- po/ar.po | 7 ++++--- po/ca.po | 12 ++++++------ po/nl.po | 8 ++++---- po/pt.po | 8 ++++---- po/pt_BR.po | 8 ++++---- po/ru.po | 10 +++++----- po/sk.po | 8 ++++---- 8 files changed, 34 insertions(+), 31 deletions(-) diff --git a/openbox/event.c b/openbox/event.c index 154b8347..f5da603b 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1509,7 +1509,9 @@ static void event_handle_dock(ObDock *s, XEvent *e) dock_hide(FALSE); break; case LeaveNotify: - dock_hide(TRUE); + /* don't hide when moving into a dock app */ + if (e->xcrossing.detail != NotifyInferior) + dock_hide(TRUE); break; } } diff --git a/po/ar.po b/po/ar.po index 6db696a2..10178224 100644 --- a/po/ar.po +++ b/po/ar.po @@ -15,7 +15,8 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : 3\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : " +"3\n" #: openbox/action.c:954 #, c-format @@ -70,7 +71,8 @@ msgid "Always on &bottom" msgstr "دائما في القاع (&B)" #: openbox/client_menu.c:361 -msgid "&Send to desktop (&S)" +#, fuzzy +msgid "&Send to desktop" msgstr "أرسِل إلى سطح المكتب" #: openbox/client_menu.c:365 @@ -336,4 +338,3 @@ msgstr "المفتاح المطلوب '%s' لا وجود له في العرض" #, c-format msgid "X Error: %s" msgstr "خطأ إكس: %s" - diff --git a/po/ca.po b/po/ca.po index 1e307736..349745a8 100644 --- a/po/ca.po +++ b/po/ca.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-28 07:55+0200\n" +"POT-Creation-Date: 2007-05-23 16:20+0200\n" "PO-Revision-Date: 2007-05-28 15:54+0200\n" "Last-Translator: David Majà Martínez \n" "Language-Team: catalan\n" @@ -25,12 +25,12 @@ msgstr "L'acció sol·licitada '%s' no és vàlida. Aquesta acció no existeix." msgid "Invalid use of action '%s'. Action will be ignored." msgstr "L'ús de l'acció '%s' no és vàlid. S'ignorarà aquesta acció." -#: openbox/action.c:1224 openbox/action.c:1242 openbox/action.c:1255 +#: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257 #, c-format msgid "Failed to execute '%s': %s" msgstr "No s'ha pogut executar '%s': %s" -#: openbox/action.c:1263 +#: openbox/action.c:1265 #, c-format msgid "Failed to convert the path '%s' from utf8" msgstr "No s'ha pogut convertir el camí '%s' des de utf8" @@ -43,7 +43,7 @@ msgstr "Vés aquí..." msgid "Windows" msgstr "Finestres" -#: openbox/client_list_menu.c:195 +#: openbox/client_list_menu.c:196 msgid "Desktops" msgstr "Escriptoris" @@ -298,7 +298,7 @@ msgstr "" msgid "The WM on screen %d is not exiting" msgstr "El gestor de finestres de la pantalla %d no està sortint" -#: openbox/screen.c:950 +#: openbox/screen.c:939 #, c-format msgid "desktop %i" msgstr "escriptori %i" @@ -344,7 +344,7 @@ msgstr "El nom de la tecla '%s' no és vàlid en la vinculació de tecles" msgid "Requested key '%s' does not exist on the display" msgstr "La tecla seleccionada '%s' no existeix a la pantalla" -#: openbox/xerror.c:38 +#: openbox/xerror.c:39 #, c-format msgid "X Error: %s" msgstr "Error d'X: %s" diff --git a/po/nl.po b/po/nl.po index a404e51b..ca8df83a 100644 --- a/po/nl.po +++ b/po/nl.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-27 16:40+0200\n" +"POT-Creation-Date: 2007-05-23 16:20+0200\n" "PO-Revision-Date: 2007-05-24 16:39+0200\n" "Last-Translator: Mark Pustjens \n" "Language-Team: Dutch \n" @@ -26,12 +26,12 @@ msgstr "Ongeldige actie '%s' gevraagd. Deze actie bestaat niet" msgid "Invalid use of action '%s'. Action will be ignored." msgstr "Ongeldig gebruik van actie '%s'. Actie wordt genegeerd." -#: openbox/action.c:1224 openbox/action.c:1242 openbox/action.c:1255 +#: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257 #, c-format msgid "Failed to execute '%s': %s" msgstr "Uitvoeren van '%s' mislukt: %s" -#: openbox/action.c:1263 +#: openbox/action.c:1265 #, c-format msgid "Failed to convert the path '%s' from utf8" msgstr "Converteren van het pad '%s' vanuit utf8 mislukt" @@ -289,7 +289,7 @@ msgstr "Kon window manager selectie op scherm %d niet verkrijgen" msgid "The WM on screen %d is not exiting" msgstr "De window manager op scherm %d sluit zichzelf niet af" -#: openbox/screen.c:948 +#: openbox/screen.c:939 #, c-format msgid "desktop %i" msgstr "bureaublad %i" diff --git a/po/pt.po b/po/pt.po index dd1bb83c..c8f4ec80 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-27 16:40+0200\n" +"POT-Creation-Date: 2007-05-23 16:20+0200\n" "PO-Revision-Date: 2007-05-23 00:34+0200\n" "Last-Translator: Althaser \n" "Language-Team: None\n" @@ -26,12 +26,12 @@ msgstr "Pedido de ac msgid "Invalid use of action '%s'. Action will be ignored." msgstr "Uso inválido da acção '%s'. A acção será ignorada." -#: openbox/action.c:1224 openbox/action.c:1242 openbox/action.c:1255 +#: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257 #, c-format msgid "Failed to execute '%s': %s" msgstr "Falha a executar '%s': %s" -#: openbox/action.c:1263 +#: openbox/action.c:1265 #, c-format msgid "Failed to convert the path '%s' from utf8" msgstr "Falha a converter o caminho '%s' do utf8" @@ -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:948 +#: openbox/screen.c:939 #, c-format msgid "desktop %i" msgstr "área de trabalho %i" diff --git a/po/pt_BR.po b/po/pt_BR.po index af74d635..d28b28c1 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-27 16:40+0200\n" +"POT-Creation-Date: 2007-05-23 16:20+0200\n" "PO-Revision-Date: 2007-05-22 19:35+0200\n" "Last-Translator: Og Maciel \n" "Language-Team: Brazilian Portuguese \n" @@ -27,12 +27,12 @@ msgstr "Ação inválida '%s' requisitada. Ação não existe." msgid "Invalid use of action '%s'. Action will be ignored." msgstr "Uso inválido da ação '%s'. Ação será ignorada." -#: openbox/action.c:1224 openbox/action.c:1242 openbox/action.c:1255 +#: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257 #, c-format msgid "Failed to execute '%s': %s" msgstr "Falha ao executar '%s': %s" -#: openbox/action.c:1263 +#: openbox/action.c:1265 #, c-format msgid "Failed to convert the path '%s' from utf8" msgstr "Falha ao converter o caminho '%s' do utf8" @@ -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:948 +#: openbox/screen.c:939 #, c-format msgid "desktop %i" msgstr "área de trabalho %i" diff --git a/po/ru.po b/po/ru.po index 077ca798..0da22852 100644 --- a/po/ru.po +++ b/po/ru.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 16:51+0200\n" +"POT-Creation-Date: 2007-05-23 16:20+0200\n" "PO-Revision-Date: 2007-05-24 19:41+0100\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: Russian \n" @@ -15,23 +15,23 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/action.c:953 +#: openbox/action.c:954 #, c-format msgid "Invalid action '%s' requested. No such action exists." msgstr "Запрошено некорректное действие '%s'. Нет такого действия." -#: openbox/action.c:956 +#: openbox/action.c:957 #, c-format msgid "Invalid use of action '%s'. Action will be ignored." msgstr "" "Некорректное использование действия '%s'. Действие будет проигнорировано." -#: openbox/action.c:1225 openbox/action.c:1243 openbox/action.c:1256 +#: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257 #, c-format msgid "Failed to execute '%s': %s" msgstr "Не удалось запустить '%s': %s" -#: openbox/action.c:1264 +#: openbox/action.c:1265 #, c-format msgid "Failed to convert the path '%s' from utf8" msgstr "Не удалось сконвертировать путь '%s' из utf8" diff --git a/po/sk.po b/po/sk.po index 60734277..de354c67 100644 --- a/po/sk.po +++ b/po/sk.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-27 16:40+0200\n" +"POT-Creation-Date: 2007-05-23 16:20+0200\n" "PO-Revision-Date: 2007-05-27 13:43Central Europe Daylight Time\n" "Last-Translator: Jozef Riha \n" @@ -25,12 +25,12 @@ msgstr "Vyžiadaná neplatná akcia '%s'. Takáto akcia neexistuje." msgid "Invalid use of action '%s'. Action will be ignored." msgstr "Neplatné použitie akcie '%s'. Akcia bude ignorovaná." -#: openbox/action.c:1224 openbox/action.c:1242 openbox/action.c:1255 +#: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257 #, c-format msgid "Failed to execute '%s': %s" msgstr "Nepodarilo sa spustiÅ¥ '%s': %s" -#: openbox/action.c:1263 +#: openbox/action.c:1265 #, c-format msgid "Failed to convert the path '%s' from utf8" msgstr "Nepodarilo sa skonvertovaÅ¥ cestu '%s' z utf8" @@ -289,7 +289,7 @@ msgstr "Nepodarilo sa získaÅ¥ výber okenného manažéra na obrazovke %d" msgid "The WM on screen %d is not exiting" msgstr "Okenný manažér na obrazovke %d sa neukončuje" -#: openbox/screen.c:948 +#: openbox/screen.c:939 #, c-format msgid "desktop %i" msgstr "plocha %i" -- 2.34.1