merge r5728 from trunk

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 9455410c24e4001085f2f9d3d1c1dff713b489a6..a4cb464740aa100719bc14baf17a9146456318ee 100644 (file)
--- 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 a4391448b56d4835e22b53d35b9decbd192e1974..40384e4d6a940be83b53d04bc2ca791d75810222 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: 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 <davidmaja@gmail.com>\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 8f5071ba1160e4892114bad94fd7666dcc880b8c..6253d1d9a6796ac14e1659f3840c5cea0dba18fc 100644 (file)
--- 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 <svahl@web.de>\n"
 "Language-Team:  <de@li.org>\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 9efea682bf0471fadaad586988801dea8faa3da2..7e11bc95ad7d1d6a8a25ab40ab3a53c31e8b92aa 100644 (file)
--- 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 18fd5040ca6e2b9abcf519409117f7d2b003874d..877064be734e91a55635ddb042abd32eb471a063 100644 (file)
--- 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 9263be43b8a53033a373e79a23c093ba5a18e6dc..5ec6bb13656f6898952f779069fa6cedd48eaabc 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: 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 <mcg79@lycos.es>\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 9d1409c6acbde6266c9ba1d739dd4e63d949a042..c90bac2983913f69f013ade2747e09aa1e743ad8 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: 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 <pauli.virtanen@hut.fi>\n"
 "Language-Team: Finnish <fi@li.org>\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 480a23f45e922b6fc32d278ab7e63d6ae1b31037..5bfd4c7c473bfc260062e5cd4dd2fd8dfd37eb9f 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: 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 <leonptitlouis@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\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 522de122ff9d5898f396bee0f54bffe226cd577a..98d26de0a955b39010dc397f5f49a8ce7816f2e5 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: 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 <drade@boobah.info>\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 d22b3f07d63d9377b0fb99219a11c0e26a1c4feb..d59beeec8362c43af523af53b718137919cd6ed5 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: 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 <nakai@gnome.gr.jp>\n"
 "Language-Team: Japanese <ja@li.org>\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 90203470626a5b0c7cd994a9cde3e4d59dde4cc1..db4fffcdeb36530753d4d70b96c192e9daf6c823 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: 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 345eaf2447dfcd780de6a51ca6872fc70aed79ad..1e686216d44bd1bb50c053827a78e858c100dc23 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: 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 <madej@afn.no-ip.org>\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 2b8d380fad5746c38ca4e0a7a812a66a25b9a16c..898baad51568639641cc7852a5981f2fac681537 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: 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 <gonsas@gmail.com>\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 d43886c4b99f810b8cfebe674a3746d8db8d2ea0..bafde831e10fd528b23c2343187a3be81e34ef52 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: 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 <alexey@remizov.pp.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\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 1cff5a89f2c4368b63bc1abab219b474688b58b6..906b27c5d36766d8e72972f1216d69c3e1a77c40 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: 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 <jose1711@gmail.com\n"
 "Language-Team: Slovak <LL@li.org>\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 9f74caec0214b9ca200f9ab9ba612b84a529ca91..dfc3ff960fc9e0974df1c35c659a863a4d67c569 100644 (file)
--- 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 <mikachu@icculus.org>\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 f7ccf3dd5e0ef83c276c6146e9050c1970acbff6..c392fb478b3d764216eaccb1ea2ec927da1b405e 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: 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 <william.chao@ossii.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 "桌面"