merge r74662 from trunk

diff --git a/CHANGELOG b/CHANGELOG
index 814bcdd41cafe80b17d5dac92007f9a5ae68d483..30209a76c9b146c3fad38ac4db65dc846447a5b0 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,42 @@
+3.4.1:
+  * Add Vietnamese translation
+  * Add Japanese translation
+  * Keep new transient windows from not getting focus when any related window
+    has focus already
+  * Change behavior of underMouse option - make focus go under the mouse when
+    no window has focus anymore, rather than to the last used window
+  * Make on-screen display dialogs (such as the Alt-Tab dialog) appear on the
+    active monitor when using Xinerama (a.k.a. TwinView)
+  * Fix for window stacking - let you lower sibling transient windows behind
+    eachother
+  * Fix directional focus actions when used without a dialog
+  * Fix race that could prevent ObConf from setting the desktop names correctly
+  * Add new theme options:
+    - window.active.button.toggled.image.color has been split into:
+      - window.active.button.toggled.unpressed.image.color
+      - window.active.button.toggled.pressed.image.color
+      - window.active.button.toggled.hover.image.color 
+    - window.inactive.button.toggled.image.color has been split into:
+      - window.inactive.button.toggled.unpressed.image.color
+      - window.inactive.button.toggled.pressed.image.color
+      - window.inactive.button.toggled.hover.image.color 
+    - window.active.button.toggled.bg has been split into:
+      - window.active.button.toggled.unpressed.bg
+      - window.active.button.toggled.pressed.bg
+      - window.active.button.toggled.hover.bg 
+    - window.inactive.button.toggled.bg has been split into:
+      - window.inactive.button.toggled.unpressed.bg
+      - window.inactive.button.toggled.pressed.bg
+      - window.inactive.button.toggled.hover.bg 
+  * Add new Onyx and Onyx-Citrus themes
+  * Updated Mikachu theme using new theme options
+  * Improvements to splitvertical gradients - Add a small gradient in the
+    middle between the upper and lower gradients
+  * Fix another emacs event storm, don't configure the window when it sets its
+    WM_NORMAL_HINTS unless we have to
+  * Fix for focus cycling to helper windows - Don't count dialogs as a sibling,
+    so they don't stop you
+
 3.4:
   * Add Indian Bengali translation
   * Updated Italian translation

diff --git a/po/ar.po b/po/ar.po
index 402f107acb2aeb2c6a5edc96349164a6aaaaa2e6..fe6ec704fe4ea891e8c40d5aace5713973088093 100644 (file)
--- a/po/ar.po
+++ b/po/ar.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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
 "PO-Revision-Date: 2007-05-26 03:11+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -115,7 +115,7 @@ msgstr "أغلق (&C)"
 msgid "Invalid button '%s' specified in config file"
 msgstr "زر غير صحيح '%s' محدد في ملف الإعدادات"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "يتعارض مع ارتباط المفاتيح في ملف الإعدادات"
 

diff --git a/po/bn_IN.po b/po/bn_IN.po
index b39a2ab76192aa365818f8c15fbc94b54614f392..d28a742a42311f46de23dfce3545ce8131c9ee55 100644 (file)
--- a/po/bn_IN.po
+++ b/po/bn_IN.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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
 "PO-Revision-Date: 2007-06-01 19:02+0530\n"
 "Last-Translator: Runa Bhattacharjee <runabh@gmail.com>\n"
 "Language-Team: Bengali (India) <en@li.org>\n"
@@ -115,7 +115,7 @@ msgstr "বন্ধ করুন (&C)"
 msgid "Invalid button '%s' specified in config file"
 msgstr "কনফিগ ফাইলে অবৈধ বাটন '%s' উল্লিখিত হয়েছে"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "কনফিগ ফাইলে কি-বাইন্ডিং সংক্রান্ত দ্বন্দ্ব"
 

diff --git a/po/ca.po b/po/ca.po
index ba2591b358a948f399d463b0fc2e796faf36dcee..765a9b57ffff90a917957ccc1e27c66570b39812 100644 (file)
--- 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
 "PO-Revision-Date: 2007-05-28 15:54+0200\n"
 "Last-Translator: David Majà Martínez <davidmaja@gmail.com>\n"
 "Language-Team: catalan\n"
@@ -112,7 +112,7 @@ msgstr "&Tanca"
 msgid "Invalid button '%s' specified in config file"
 msgstr "El botó especificat al fitxer de configuració '%s' no és vàlid."
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Conflicte amb la tecla vinculada en el fitxer de configuració"
 

diff --git a/po/cs.po b/po/cs.po
index 679a2ed11544460f1b517b1b1c9afdc321491c1d..3d5fee6442f74a283916d12770f9447c91dcf86e 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
 "PO-Revision-Date: 2007-06-04 12:46+0200\n"
 "Last-Translator: tezlo <tezlo@gmx.net>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -115,7 +115,7 @@ msgstr "&Zavřít"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Neplatné tlačítko '%s' v konfiguračním souboru"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt klávesových zkratek v konfiguračním souboru"
 

diff --git a/po/de.po b/po/de.po
index c484c631ff881b5e1a177d4f6974cf0057509179..cb1383888bfd5260909ef79806425bd611c3490f 100644 (file)
--- a/po/de.po
+++ b/po/de.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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
 "PO-Revision-Date: 2007-06-04 00:47+0200\n"
 "Last-Translator: Sebastian Sareyko <public@nooms.de>\n"
 "Language-Team:  <de@li.org>\n"
@@ -112,7 +112,7 @@ msgstr "&Schlie
 msgid "Invalid button '%s' specified in config file"
 msgstr "Unzulässiger Knopf '%s' in der Konfigurationsdatei angegeben"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt mit Tastenkombination in der Konfigurationsdatei"
 

diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index ec21a2df1514e9846598a72bc57581b5a3b936b0..91754294c2ceb15acd85f23359c51d25f3bb30e9 100644 (file)
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openbox 3.4.0\n"
+"Project-Id-Version: openbox 3.4.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-07 14:18+0200\n"
-"PO-Revision-Date: 2007-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
+"PO-Revision-Date: 2007-06-09 17:28-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -138,7 +138,7 @@ msgstr "&Close"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Invalid button ‘\e[1m%s\e[0m’ specified in config file"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Conflict with key binding in config file"
 

diff --git a/po/en@quot.po b/po/en@quot.po
index 304fa9f7b21be4efa186056f808765d352ec0f64..5c1782c982e41f3bb291205c9fb48b22ba17658c 100644 (file)
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openbox 3.4.0\n"
+"Project-Id-Version: openbox 3.4.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-07 14:18+0200\n"
-"PO-Revision-Date: 2007-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
+"PO-Revision-Date: 2007-06-09 17:28-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -135,7 +135,7 @@ msgstr "&Close"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Invalid button ‘%s’ specified in config file"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Conflict with key binding in config file"
 

diff --git a/po/es.po b/po/es.po
index dbc3eae88bd8fc18b41d462e79a0379f69fc6359..d75d97492bd13efa775204f150e1fce728a34e65 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-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"
@@ -112,7 +112,7 @@ msgstr "&Cerrar"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Botón invalido '%s' especificado en el archivo de configuración"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Conflicto con la combinación de teclas en el archivo de configuración"
 

diff --git a/po/et.po b/po/et.po
index 76728f39cec7b86d64dafb86a79d9eb218333a5e..a5ef1d702fb53824baec9dc7af73a09338a87d70 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-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"
@@ -114,7 +114,7 @@ msgstr "S&ulge"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Vigane nupp '%s' määratletud konfiguratsioonifailis"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt kiirklahviga konfiguratsioonifailis"
 

diff --git a/po/fi.po b/po/fi.po
index 79838fa43d4f1a7a830a6483778862a45545a56a..27292eefa46ac3fc8fd7add1bf0097229fa8e715 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
 "PO-Revision-Date: 2007-05-21 00:06+0200\n"
 "Last-Translator: Lauri Hakko\n"
 "Language-Team: None\n"
@@ -113,7 +113,7 @@ msgstr "&Sulje"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Virheellinen painike '%s' määritelty konfiguraatio tiedostossa"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Päällekäisiä key bindejä konfiguraatio tiedostossa"
 

diff --git a/po/fr.po b/po/fr.po
index 4e8fad0e5e904841705f15f839f29ef63f61f0ec..ef474c2011bbc744a0923f34dfcb76da034999ab 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-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"
@@ -113,7 +113,7 @@ msgstr "&Fermer"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Bouton indiqué dans le fichier de configuration '%s' invalide"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Conflit entre les raccourcis clavier dans le fichier de configuration"
 

diff --git a/po/it.po b/po/it.po
index 9bf35fba6f2e1348ce733efee8d4e6ab5e137e0f..565450a02537f6ab87c80e7752ea44d3875f4343 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
 "PO-Revision-Date: 2007-06-04 03:06+0200\n"
 "Last-Translator: Davide Truffa <davide@catoblepa.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -111,7 +111,7 @@ msgstr "&Chiudi"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Il pulsante '%s' specificato nel file di configurazione non è valido"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr ""
 "Conflitto con la scorciatoia da tastiera specificata nel file di "

diff --git a/po/ja.po b/po/ja.po
index 0abb43a3a6d2d628fffe7347d55224b066104418..fa71cce5b3dd88e767a352a640ff848cabd0c9b1 100644 (file)
--- a/po/ja.po
+++ b/po/ja.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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
 "PO-Revision-Date: 2007-06-07 14:49+0200\n"
 "Last-Translator: Yukihiro Nakai <nakai@gnome.gr.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -114,7 +114,7 @@ msgstr "閉じる(&C)"
 msgid "Invalid button '%s' specified in config file"
 msgstr ""
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr ""
 

diff --git a/po/nl.po b/po/nl.po
index 0fdf1b11caebf9de9be50d5153e627894b1a581f..4b6f04031517b4af03f5de0b160237da3e73a5c4 100644 (file)
--- 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
 "PO-Revision-Date: 2007-05-24 16:39+0200\n"
 "Last-Translator: Mark Pustjens <pustjens@dds.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -113,7 +113,7 @@ msgstr "&Sluiten"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Ongeldige knop '%s' gespecificeerd in het configuratie bestand"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Conflict met toetsen binding in het configuratie bestand"
 

diff --git a/po/no.po b/po/no.po
index 026dd47825cd868b67b78145b73908798ebc1832..1dc4b34cd8dfa5fddb584de225bb0f247863ec1f 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-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"
@@ -112,7 +112,7 @@ msgstr "&Lukk"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Ugyldig tast '%s' spesifisert i konfigurasjonsfilen"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt med hurtigtastbinding i konfigurasjonsfilen"
 

diff --git a/po/openbox.pot b/po/openbox.pot
index 00cbc398f5bbe14fc4bc9273a62774b8de83b8c4..de68463d0857700a3b42bdf13cca64d0779f726e 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-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"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "Invalid button '%s' specified in config file"
 msgstr ""
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr ""
 

diff --git a/po/pl.po b/po/pl.po
index 018fc0327f68e443c4373f06345cd3e20c51a1f6..8755f820b8dbe1061a6e5fe4549c425018461db2 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-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"
@@ -113,7 +113,7 @@ msgstr "Z&amknij"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Niepoprawny klawisz '%s' użyty w pliku konfiguracyjnym"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt z powiązaniem klawiaturowym w pliku konfiguracyjnym"
 

diff --git a/po/pt.po b/po/pt.po
index 0bdf62455f8eff4dcd05d90265cec5861e4814f7..8b1ecee73635eebca884e2d632dad9a503a6aa6d 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
 "PO-Revision-Date: 2007-05-23 00:34+0200\n"
 "Last-Translator: Althaser <Althaser@gmail.com>\n"
 "Language-Team: None\n"
@@ -113,7 +113,7 @@ msgstr "&Fechar"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Botão inválido '%s' especificado no ficheiro de configuração"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Conflito com tecla de atalho no ficheiro de configuração"
 

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5441051fdb9fb9ca312208f9c83c3f89b9d2d9cd..e2104b23e60b1e6d64f522d5535af2b055b7d0e5 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-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"
@@ -114,7 +114,7 @@ msgstr "&Fechar"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Botão inválido '%s' especificado no arquivo de configuração"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Conflito com associação de chave no arquivo de configuração"
 

diff --git a/po/ru.po b/po/ru.po
index 4882b0f6b547267a902994b4b370e5d9e1d26db2..9b58fa85a6e56d8ee01fbeb9768b063ee7b43995 100644 (file)
--- 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
 "PO-Revision-Date: 2007-05-24 19:41+0100\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
@@ -113,7 +113,7 @@ msgstr "Закрыть(&C)"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Некорректная клавиша '%s' упомянута в конфигурационном файле"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Конфликт привязок клавиш в конфигурационном файле"
 

diff --git a/po/sk.po b/po/sk.po
index 03c1687f79fdc745194f8a3e296063fe46e38adb..ece175ee76ad96d9b1808ecff88a3eb38b0f9f0e 100644 (file)
--- 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
 "PO-Revision-Date: 2007-05-27 13:43Central Europe Daylight Time\n"
 "Last-Translator: Jozef Riha <jose1711@gmail.com\n"
 "Language-Team: Slovak <LL@li.org>\n"
@@ -112,7 +112,7 @@ msgstr "Z&avrieť"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Neplatné tlačidlo '%s' špecifikované v konfiguračnom súbore"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt priradenie klávesov v konfiguračnom súbore"
 

diff --git a/po/sv.po b/po/sv.po
index 7f07031a48bec678bd0ea30b45cff2d9ca7da51e..8be0faff2feab2795aa822baf24c62c2e833e04b 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
 "PO-Revision-Date: 2007-05-22 00:29+0200\n"
 "Last-Translator: Mikael Magnusson <mikachu@icculus.org>\n"
 "Language-Team: None\n"
@@ -112,7 +112,7 @@ msgstr "St
 msgid "Invalid button '%s' specified in config file"
 msgstr "Ogiltig knapp '%s' angiven i konfigurationsfilen"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt med annan tangentbindning i konfigurationsfilen"
 

diff --git a/po/vi.po b/po/vi.po
index 157dfc526c9835b47c29ab5cbc7b5be032c35e1a..cb77f9c59d9a6eddd791e3c5dc5c40e0b0aeb3f5 100644 (file)
--- a/po/vi.po
+++ b/po/vi.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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
 "PO-Revision-Date: 2007-06-07 06:50-0500\n"
 "Last-Translator: Quan Tran <qeed.quan@gmail.com>\n"
 "Language-Team: None\n"
@@ -112,7 +112,7 @@ msgstr "Đón&g"
 msgid "Invalid button '%s' specified in config file"
 msgstr "Sai nút '%s' ở trong hình thể"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "Xung đột với chữ trói ở trong hình thể"
 

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1fb159c50aa04ea01007bcd2c97dbbf0111934e8..8f6c8fcd23bdb7eb78a0f7d05901299129eda1bb 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-0400\n"
 "PO-Revision-Date: 2007-05-28 13:00+0800\n"
 "Last-Translator: Xiaoyu PENG <peng.xiaoyu@gmail.com>\n"
 "Language-Team: None\n"
@@ -112,7 +112,7 @@ msgstr "关闭(&C)"
 msgid "Invalid button '%s' specified in config file"
 msgstr "配置文件中指定的按钮 '%s' 无效"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "配置文件中的组合键冲突"
 

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8e0163ed70d1dac92c9777fc4f6cf9a84b10eae4..44b9ff0de65d2c3b11f1e3ae8fa7dbe61462cd57 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-06-07 14:18+0200\n"
+"POT-Creation-Date: 2007-06-09 17:28-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"
@@ -113,7 +113,7 @@ msgstr "關閉(&C)"
 msgid "Invalid button '%s' specified in config file"
 msgstr "在配置檔中指定的按鈕「%s」無效"
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:164
 msgid "Conflict with key binding in config file"
 msgstr "與配置檔中的按鍵組合衝突"