From: Dana Jansens Date: Fri, 30 Mar 2007 18:29:56 +0000 (+0000) Subject: merge r5728 from trunk X-Git-Tag: openbox-3_3_991-RELEASE~257 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=376e0a41689f4c37b79492a1c4f91a79dc20c7eb;p=dana%2Fopenbox.git merge r5728 from trunk --- diff --git a/openbox/menuframe.c b/openbox/menuframe.c index 9455410c..a4cb4647 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -193,7 +193,9 @@ void menu_frame_place_topmenu(ObMenuFrame *self, gint x, gint y) x = self->client->frame->area.x + self->client->frame->size.left; y = self->client->frame->area.y + self->client->frame->size.top; } else { - x -= self->area.width / 2; + if (config_menu_middle) { + x -= self->area.width / 2; + } y -= self->title_h; } menu_frame_move(self, x, y); diff --git a/po/ca.po b/po/ca.po index a4391448..40384e4d 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: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-03-12 19:19-0400\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2004-01-25 20:41+0100\n" "Last-Translator: David Majà Martínez \n" "Language-Team: catalan\n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "Vés aquí..." -#: openbox/client_list_menu.c:188 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "Escriptoris" diff --git a/po/de.po b/po/de.po index 8f5071ba..6253d1d9 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.3\n" "Report-Msgid-Bugs-To: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-02-28 12:50-0500\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2006-06-11 10:41+0200\n" "Last-Translator: Sebastian Vahl \n" "Language-Team: \n" @@ -14,11 +14,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "Gehe zu..." -#: openbox/client_list_menu.c:187 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "" @@ -102,21 +102,16 @@ msgstr "--sm-client-id benötigt ein Argument\n" msgid "--sm-save-file requires an argument\n" msgstr "--sm-save-file benötigt ein Argument\n" -#: openbox/session.c:160 +#: openbox/session.c:168 #, c-format msgid "Unable to make directory '%s': %s" msgstr "Das Verzeichnis '%s' konnte nicht angelegt werden: %s" -#: render/font.c:58 -msgid "Couldn't initialize Xft." -msgstr "Xft konnte nicht initialisiert werden" +#~ msgid "Couldn't initialize Xft." +#~ msgstr "Xft konnte nicht initialisiert werden" -#: render/font.c:193 render/font.c:198 -#, c-format -msgid "Unable to load font: %s\n" -msgstr "Schriftart %s konnte nicht geladen werden\n" +#~ msgid "Unable to load font: %s\n" +#~ msgstr "Schriftart %s konnte nicht geladen werden\n" -#: render/font.c:194 -#, c-format -msgid "Trying fallback font: %s\n" -msgstr "Versuche Ersatz-Schriftart %s zu laden\n" +#~ msgid "Trying fallback font: %s\n" +#~ msgstr "Versuche Ersatz-Schriftart %s zu laden\n" diff --git a/po/en@boldquot.po b/po/en@boldquot.po index 9efea682..7e11bc95 100644 --- a/po/en@boldquot.po +++ b/po/en@boldquot.po @@ -32,7 +32,7 @@ msgid "" msgstr "" "Project-Id-Version: openbox 3.2\n" "Report-Msgid-Bugs-To: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-03-12 19:19-0400\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2004-11-07 12:52+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -41,11 +41,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "Go there..." -#: openbox/client_list_menu.c:188 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "Desktops" diff --git a/po/en@quot.po b/po/en@quot.po index 18fd5040..877064be 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: openbox 3.2\n" "Report-Msgid-Bugs-To: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-03-12 19:19-0400\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2004-11-07 12:52+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -38,11 +38,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "Go there..." -#: openbox/client_list_menu.c:188 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "Desktops" diff --git a/po/es.po b/po/es.po index 9263be43..5ec6bb13 100644 --- 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: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-03-12 19:19-0400\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2005-03-25 09:31+0100\n" "Last-Translator: Miguel Calleja Gómez \n" "Language-Team: None\n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "Ir ahí..." -#: openbox/client_list_menu.c:188 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "Escritorios" diff --git a/po/fi.po b/po/fi.po index 9d1409c6..c90bac29 100644 --- 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: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-03-12 19:19-0400\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2005-03-15 21:29+0200\n" "Last-Translator: Pauli Virtanen \n" "Language-Team: Finnish \n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "Näytä tämä..." -#: openbox/client_list_menu.c:188 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "Työtilat" diff --git a/po/fr.po b/po/fr.po index 480a23f4..5bfd4c7c 100644 --- 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: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-03-12 19:19-0400\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2004-06-11 23:06+0200\n" "Last-Translator: Julien Louis \n" "Language-Team: French \n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "Aller à..." -#: openbox/client_list_menu.c:188 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "Bureaux" diff --git a/po/hr.po b/po/hr.po index 522de122..98d26de0 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: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-03-12 19:19-0400\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2006-09-05 16:45+0100\n" "Last-Translator: Daniel Radetic \n" "Language-Team: None\n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "Odi na..." -#: openbox/client_list_menu.c:188 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "Radne povrÅ¡ine" diff --git a/po/ja.po b/po/ja.po index d22b3f07..d59beeec 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: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-03-12 19:19-0400\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2003-11-20 15:00+0900\n" "Last-Translator: Yukihiro Nakai \n" "Language-Team: Japanese \n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "移動する..." -#: openbox/client_list_menu.c:188 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "デスクトップ" diff --git a/po/no.po b/po/no.po index 90203470..db4fffcd 100644 --- 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: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-03-12 19:19-0400\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2004-03-29 18:33:39+0200\n" "Last-Translator: Øyvind Albrigtsen\n" "Language-Team: None\n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "Gå dit" -#: openbox/client_list_menu.c:188 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "Skrivebord" diff --git a/po/pl.po b/po/pl.po index 345eaf24..1e686216 100644 --- 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: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-03-12 19:19-0400\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2004-09-07 21:17+0200\n" "Last-Translator: Madej \n" "Language-Team: NONE\n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "Przejdź..." -#: openbox/client_list_menu.c:188 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "Pulpit" diff --git a/po/pt.po b/po/pt.po index 2b8d380f..898baad5 100644 --- 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: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-03-12 19:19-0400\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2004-03-29 18:33:39+0200\n" "Last-Translator: Gonçalo Ferreira \n" "Language-Team: None\n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "Ir até..." -#: openbox/client_list_menu.c:188 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "Áreas de trabalho" diff --git a/po/ru.po b/po/ru.po index d43886c4..bafde831 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: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-03-12 19:19-0400\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2004-04-23 13:00+0300\n" "Last-Translator: Alexey Remizov \n" "Language-Team: Russian \n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "Перейти..." -#: openbox/client_list_menu.c:188 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "Рабочие места" diff --git a/po/sk.po b/po/sk.po index 1cff5a89..906b27c5 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: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-03-12 19:19-0400\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2006-08-25 00:52+0200\n" "Last-Translator: Jozef Riha \n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "PrejsÅ¥ na..." -#: openbox/client_list_menu.c:188 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "Plochy" diff --git a/po/sv.po b/po/sv.po index 9f74caec..dfc3ff96 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: openbox 3.3\n" "Report-Msgid-Bugs-To: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-03-12 19:19-0400\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2004-03-29 18:33:39+0200\n" "Last-Translator: Mikael Magnusson \n" "Language-Team: None\n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "Gå dit" -#: openbox/client_list_menu.c:188 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "Skrivbord" diff --git a/po/zh_TW.po b/po/zh_TW.po index f7ccf3dd..c392fb47 100644 --- 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: mikachu@icculus.org\n" -"POT-Creation-Date: 2007-03-12 19:19-0400\n" +"POT-Creation-Date: 2007-03-25 13:41-0400\n" "PO-Revision-Date: 2006-03-01 12:00+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" @@ -16,11 +16,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: openbox/client_list_menu.c:97 +#: openbox/client_list_menu.c:99 msgid "Go there..." msgstr "到那裡去..." -#: openbox/client_list_menu.c:188 +#: openbox/client_list_menu.c:190 msgid "Desktops" msgstr "桌面"