From d27cef98da229fea93571209bc6fefc23e0717ce Mon Sep 17 00:00:00 2001
From: Robert Kuszinger <hiding@freemail.hu>
Date: Fri, 21 Dec 2007 14:36:05 +0100
Subject: [PATCH 01/79] Add Hungarian translation.

---
 po/LINGUAS |   1 +
 po/hu.po   | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 346 insertions(+)
 create mode 100644 po/hu.po

diff --git a/po/LINGUAS b/po/LINGUAS
index d361d7a2..33191bfc 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -22,5 +22,6 @@ it
 vi
 ja
 ua
+hu
 
 #hr
diff --git a/po/hu.po b/po/hu.po
new file mode 100644
index 00000000..75f49ebf
--- /dev/null
+++ b/po/hu.po
@@ -0,0 +1,345 @@
+# Hungarian messages for openbox.
+# Copyright (C) 2007 Mikael Magnusson
+# This file is distributed under the same license as the openbox package.
+# Robert Kuszinger <hiding@freemail.hu>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openbox 3.4.3\n"
+"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"PO-Revision-Date: 2007-12-21 14:33+0100\n"
+"Last-Translator: Robert Kuszinger <hiding@freemail.hu>\n"
+"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: openbox/actions/execute.c:88
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Az útvonalat nem sikerült átalakítani utf8-ból: '%s'"
+
+#: openbox/actions/execute.c:97 openbox/actions/execute.c:115
+#, c-format
+msgid "Failed to execute '%s': %s"
+msgstr "Nem sikerült futtatni ezt a programot '%s': %s"
+
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
+msgid "Go there..."
+msgstr "Menjünk oda..."
+
+#: openbox/client_list_combined_menu.c:96
+msgid "Manage desktops"
+msgstr "Munkaasztal-kezelés"
+
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
+msgid "_Add new desktop"
+msgstr "Új _munkaasztal"
+
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
+msgid "_Remove last desktop"
+msgstr "Utolsó munkaasztal _eltávolítása"
+
+#: openbox/client_list_combined_menu.c:150
+msgid "Windows"
+msgstr "Ablakok"
+
+#: openbox/client_list_menu.c:203
+msgid "Desktops"
+msgstr "Munkaasztalok"
+
+#: openbox/client_menu.c:256
+msgid "All desktops"
+msgstr "Összes munkaasztal"
+
+#: openbox/client_menu.c:360
+msgid "_Layer"
+msgstr "_Réteg"
+
+#: openbox/client_menu.c:365
+msgid "Always on _top"
+msgstr "Mindig _felül"
+
+#: openbox/client_menu.c:366
+msgid "_Normal"
+msgstr "_Normál"
+
+#: openbox/client_menu.c:367
+msgid "Always on _bottom"
+msgstr "Mindig _alul"
+
+#: openbox/client_menu.c:370
+msgid "_Send to desktop"
+msgstr "Munkaasztalra _küldeni"
+
+#: openbox/client_menu.c:374
+msgid "Client menu"
+msgstr "Kliens menü"
+
+#: openbox/client_menu.c:384
+msgid "R_estore"
+msgstr "_Visszaállítás"
+
+#: openbox/client_menu.c:392
+msgid "_Move"
+msgstr "_Mozgatás"
+
+#: openbox/client_menu.c:394
+msgid "Resi_ze"
+msgstr "_Átméretezés"
+
+#: openbox/client_menu.c:396
+msgid "Ico_nify"
+msgstr "Iko_nná alakítás"
+
+#: openbox/client_menu.c:404
+msgid "Ma_ximize"
+msgstr "Ma_ximalizálás"
+
+#: openbox/client_menu.c:412
+msgid "_Roll up/down"
+msgstr "_Görgetés fel/le"
+
+#: openbox/client_menu.c:414
+msgid "Un/_Decorate"
+msgstr "_Dekoráció eltávilítása"
+
+#: openbox/client_menu.c:418
+msgid "_Close"
+msgstr "_Bezárás"
+
+#: openbox/config.c:740
+#, c-format
+msgid "Invalid button '%s' specified in config file"
+msgstr "Érvénytelen gomb a konfigurációs fájlban '%s'"
+
+#: openbox/keyboard.c:156
+msgid "Conflict with key binding in config file"
+msgstr "Ütköző billentyű-műveletek a konfigurációs fájlban"
+
+#: openbox/menu.c:103 openbox/menu.c:111
+#, c-format
+msgid "Unable to find a valid menu file '%s'"
+msgstr "Nem található ilyen érvényes menü fájl: '%s'"
+
+#: openbox/menu.c:171
+#, c-format
+msgid "Failed to execute command for pipe-menu '%s': %s"
+msgstr "Sikertelen parancsfuttatás a csővezeték-menüben '%s': %s"
+
+#: openbox/menu.c:185
+#, c-format
+msgid "Invalid output from pipe-menu '%s'"
+msgstr "Érvnytelen válasz a csővezeték menüből '%s'"
+
+#: openbox/menu.c:198
+#, c-format
+msgid "Attempted to access menu '%s' but it does not exist"
+msgstr "'%s' menü elérésére történt kísérlet, de az nem létezik"
+
+#: openbox/menu.c:368 openbox/menu.c:369
+msgid "More..."
+msgstr "Tovább..."
+
+#: openbox/mouse.c:349
+#, c-format
+msgid "Invalid button '%s' in mouse binding"
+msgstr "Érvénytelen gomb '%s' az egér parancsoknál"
+
+#: openbox/mouse.c:355
+#, c-format
+msgid "Invalid context '%s' in mouse binding"
+msgstr "Érvénytelen környezet az egér parancsoknál: '%s'"
+
+#: openbox/openbox.c:129
+#, c-format
+msgid "Unable to change to home directory '%s': %s"
+msgstr "Nem lehet a saját mappába váltani '%s': %s"
+
+#: openbox/openbox.c:149
+msgid "Failed to open the display from the DISPLAY environment variable."
+msgstr "Nem nyitható meg a DISPLAY változóban beállított képernyő"
+
+#: openbox/openbox.c:180
+msgid "Failed to initialize the obrender library."
+msgstr "Nem sikerült használatba venni az obernder függvénykönyvtárat"
+
+#: openbox/openbox.c:186
+msgid "X server does not support locale."
+msgstr "Az X kiszolgáló nem támogatja ezt a nemzetközi beállítást."
+
+#: openbox/openbox.c:188
+msgid "Cannot set locale modifiers for the X server."
+msgstr "A nemzetközi beálljtás módosítók nem állíthatók be az X szerveren."
+
+#: openbox/openbox.c:251
+msgid "Unable to find a valid config file, using some simple defaults"
+msgstr "Nincs konfigurációs fájl, ezért egyszerű alapértelmezéseket használunk"
+
+#: openbox/openbox.c:277
+msgid "Unable to load a theme."
+msgstr "Nem tölthető be a téma."
+
+#: openbox/openbox.c:402
+#, c-format
+msgid "Restart failed to execute new executable '%s': %s"
+msgstr "Az újraindítás során ez az új program nem volt indítható '%s': %s"
+
+#: openbox/openbox.c:472 openbox/openbox.c:474
+msgid "Copyright (c)"
+msgstr "Szerzői jogok (c)"
+
+#: openbox/openbox.c:483
+msgid "Syntax: openbox [options]\n"
+msgstr "Használat: openbox [options]\n"
+
+#: openbox/openbox.c:484
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Opciók:\n"
+
+#: openbox/openbox.c:485
+msgid "  --help              Display this help and exit\n"
+msgstr "  --help              Súgó megjelenítése és kilépés\n"
+
+#: openbox/openbox.c:486
+msgid "  --version           Display the version and exit\n"
+msgstr "  --version           Verzió kiírása majd kilépés\n"
+
+#: openbox/openbox.c:487
+msgid "  --replace           Replace the currently running window manager\n"
+msgstr "  --replace           Futó ablakkezelő cseréje\n"
+
+#: openbox/openbox.c:488
+msgid "  --sm-disable        Disable connection to the session manager\n"
+msgstr "  --sm-disable        Ne csatlakozzon a szekció-kezelőhöz\n"
+
+#: openbox/openbox.c:489
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+msgstr ""
+"\n"
+"Üzenet küldése a futó Openbox példánynak\n"
+
+#: openbox/openbox.c:490
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr "  --reconfigure       Konfiguráció úrjatöltése\n"
+
+#: openbox/openbox.c:491
+msgid "  --restart           Restart Openbox\n"
+msgstr "  --restart           Openbox újraindítása\n"
+
+#: openbox/openbox.c:492
+msgid "  --exit              Exit Openbox\n"
+msgstr "  --exit              Kilépés az Openboxból\n"
+
+#: openbox/openbox.c:493
+msgid ""
+"\n"
+"Debugging options:\n"
+msgstr ""
+"\n"
+"Debug (hibakereső) lehetőségek:\n"
+
+#: openbox/openbox.c:494
+msgid "  --sync              Run in synchronous mode\n"
+msgstr "  --sync              Futtatás szinkron módban\n"
+
+#: openbox/openbox.c:495
+msgid "  --debug             Display debugging output\n"
+msgstr "  --debug             Hibakeresési információk megjelenítése\n"
+
+#: openbox/openbox.c:496
+msgid "  --debug-focus       Display debugging output for focus handling\n"
+msgstr ""
+"  --debug-focus       Fókuszkezelésre vonatkozó hibakeresési információk "
+"kiírása\n"
+
+#: openbox/openbox.c:497
+msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
+msgstr "  --debug-xinerama    Képernyő felosztása két ál-xinerama képernyőre\n"
+
+#: openbox/openbox.c:498
+#, c-format
+msgid ""
+"\n"
+"Please report bugs at %s\n"
+msgstr ""
+"\n"
+"Légyszi jelentsd a hibát itt: %s\n"
+
+#: openbox/openbox.c:599
+#, c-format
+msgid "Invalid command line argument '%s'\n"
+msgstr "Érvénytelen parancssori opció: '%s'\n"
+
+#: openbox/screen.c:96 openbox/screen.c:184
+#, c-format
+msgid "A window manager is already running on screen %d"
+msgstr "Már fut egy ablakkezelő ezen a képernyőn %d"
+
+#: openbox/screen.c:118
+#, c-format
+msgid "Could not acquire window manager selection on screen %d"
+msgstr "Nem tudok ablakkezelőt váltani ezen a képernyőn %d"
+
+#: openbox/screen.c:139
+#, c-format
+msgid "The WM on screen %d is not exiting"
+msgstr "Ezen a képernyőn: %d az ablakkezelő nem lép ki"
+
+#: openbox/screen.c:1087
+#, c-format
+msgid "desktop %i"
+msgstr "%i. munkaasztal"
+
+#: openbox/session.c:103
+#, c-format
+msgid "Unable to make directory '%s': %s"
+msgstr "Nem hozható létre a könyvtár '%s': %s"
+
+#: openbox/session.c:451
+#, c-format
+msgid "Unable to save the session to '%s': %s"
+msgstr "Nem tudom elmenti ide a futó környezetet '%s': %s"
+
+#: openbox/session.c:583
+#, c-format
+msgid "Error while saving the session to '%s': %s"
+msgstr "Hiba a futási környezet mentése közben '%s': %s"
+
+#: openbox/startupnotify.c:237
+#, c-format
+msgid "Running %s\n"
+msgstr "Futtatás %s\n"
+
+#: openbox/translate.c:58
+#, c-format
+msgid "Invalid modifier key '%s' in key/mouse binding"
+msgstr "Érvénytelen módosító gomb '%s' egér vagy billentyűparancsnál"
+
+#: openbox/translate.c:135
+#, c-format
+msgid "Invalid key code '%s' in key binding"
+msgstr "Érvénytelen billentyűkód '%s' billentyűparancsnál"
+
+#: openbox/translate.c:142
+#, c-format
+msgid "Invalid key name '%s' in key binding"
+msgstr "Érvénytelen billentyűnév '%s' billentyűparancsnál"
+
+#: openbox/translate.c:148
+#, c-format
+msgid "Requested key '%s' does not exist on the display"
+msgstr "A kért gomb '%s' nem létezik a képernyőn"
+
+#: openbox/xerror.c:39
+#, c-format
+msgid "X Error: %s"
+msgstr "X rendszer hiba: %s"

From 585098c3b661bca51755715d35bdd23104a452c1 Mon Sep 17 00:00:00 2001
From: Eric Lassauge <lassauge@users.sf.net>
Date: Tue, 8 Jan 2008 21:07:54 +0100
Subject: [PATCH 02/79] Update french translation with --exit help and use
 french punctuation rules.

---
 po/fr.po | 68 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 13a77f79..7ec69158 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,14 +5,15 @@
 # tioui <leonptitlouis@wanadoo.fr>, 2004.
 # Cyrille Bagard <nocbos@gmail.com>, 2007.
 # Jacques BON <jbon@cafcom.net>, 2007.
+# �ric Lassauge <lassauge@users.sf.net>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.4.3\n"
+"Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2007-11-12 19:12+0100\n"
-"PO-Revision-Date: 2007-08-17 22:25+0200\n"
-"Last-Translator: Jacques BON <jbon@cafcom.net>\n"
+"PO-Revision-Date: 2008-01-08 12:25+0200\n"
+"Last-Translator: �ric Lassauge <lassauge@users.sf.net>\n"
 "Language-Team: fran�ais <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -21,16 +22,16 @@ msgstr ""
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
-msgstr "�chec de la conversion du chemin '%s' depuis l'UTF-8"
+msgstr "�chec de la conversion du chemin ��%s�� depuis l'UTF-8"
 
 #: openbox/actions/execute.c:97 openbox/actions/execute.c:115
 #, c-format
 msgid "Failed to execute '%s': %s"
-msgstr "�chec de l'ex�cution de '%s': %s"
+msgstr "�chec de l'ex�cution de ��%s���: %s"
 
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
-msgstr "Aller �..."
+msgstr "Aller l�..."
 
 #: openbox/client_list_combined_menu.c:96
 msgid "Manage desktops"
@@ -115,7 +116,7 @@ msgstr "_Fermer"
 #: openbox/config.c:740
 #, c-format
 msgid "Invalid button '%s' specified in config file"
-msgstr "Bouton indiqu� dans le fichier de configuration '%s' invalide"
+msgstr "Bouton ��%s�� indiqu� dans le fichier de configuration invalide"
 
 #: openbox/keyboard.c:156
 msgid "Conflict with key binding in config file"
@@ -124,41 +125,41 @@ msgstr "Conflit entre les raccourcis clavier dans le fichier de configuration"
 #: openbox/menu.c:103 openbox/menu.c:111
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
-msgstr "Impossible de trouver un fichier de menus valide '%s'"
+msgstr "Impossible de trouver un fichier de menus valide  ��%s��"
 
 #: openbox/menu.c:171
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
-msgstr "Echec lors de l'ex�cution de la commande pour un pipe-menu '%s': %s"
+msgstr "�chec lors de l'ex�cution de la commande pour un pipe-menu ��%s���: %s"
 
 #: openbox/menu.c:185
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
-msgstr "Sortie du pipe-menu invalide '%s'"
+msgstr "Sortie du pipe-menu invalide ��%s��"
 
 #: openbox/menu.c:198
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
-msgstr "Tentative d'acc�s au menu '%s' qui n'existe pas"
+msgstr "Tentative d'acc�s au menu ��%s�� qui n'existe pas"
 
 #: openbox/menu.c:368 openbox/menu.c:369
 msgid "More..."
-msgstr "Davantage..."
+msgstr "Plus..."
 
 #: openbox/mouse.c:349
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
-msgstr "Bouton '%s' invalide dans le param�trage de la souris"
+msgstr "Bouton ��%s�� invalide dans le param�trage de la souris"
 
 #: openbox/mouse.c:355
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
-msgstr "Contexte '%s' invalide dans le param�trage de la souris"
+msgstr "Contexte ��%s�� invalide dans le param�trage de la souris"
 
 #: openbox/openbox.c:129
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
-msgstr "Impossible de changer vers le r�pertoire de l'utilisateur '%s': %s"
+msgstr "Impossible de changer vers le r�pertoire de l'utilisateur ��%s���: %s"
 
 #: openbox/openbox.c:149
 msgid "Failed to open the display from the DISPLAY environment variable."
@@ -182,7 +183,7 @@ msgstr ""
 #: openbox/openbox.c:251
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
-"Impossible de trouver un fichier de configuration valide ; utilisation de "
+"Impossible de trouver un fichier de configuration valide, utilisation de "
 "d�fauts simples"
 
 #: openbox/openbox.c:277
@@ -192,7 +193,8 @@ msgstr "Impossible de charger un th
 #: openbox/openbox.c:402
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
-msgstr "Le red�marrage n'a pas r�ussi � ex�cuter le nouvel ex�cutable '%s': %s"
+msgstr ""
+"Le red�marrage n'a pas r�ussi � ex�cuter le nouvel ex�cutable ��%s���: %s"
 
 #: openbox/openbox.c:472 openbox/openbox.c:474
 msgid "Copyright (c)"
@@ -200,7 +202,7 @@ msgstr "Copyright (c)"
 
 #: openbox/openbox.c:483
 msgid "Syntax: openbox [options]\n"
-msgstr "Syntaxe: openbox [options]\n"
+msgstr "Syntaxe�: openbox [options]\n"
 
 #: openbox/openbox.c:484
 msgid ""
@@ -208,7 +210,7 @@ msgid ""
 "Options:\n"
 msgstr ""
 "\n"
-"Options:\n"
+"Options�:\n"
 
 #: openbox/openbox.c:485
 msgid "  --help              Display this help and exit\n"
@@ -235,7 +237,7 @@ msgid ""
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 "\n"
-"Passage de messages � l'instance d'Openbox en marche:\n"
+"Passage de messages � l'instance d'Openbox en cours�:\n"
 
 #: openbox/openbox.c:490
 msgid "  --reconfigure       Reload Openbox's configuration\n"
@@ -248,7 +250,7 @@ msgstr "  --restart           Red
 #: openbox/openbox.c:492
 #, fuzzy
 msgid "  --exit              Exit Openbox\n"
-msgstr ""
+msgstr "  --exit              Sortir d'Openbox\n"
 
 #: openbox/openbox.c:493
 msgid ""
@@ -256,7 +258,7 @@ msgid ""
 "Debugging options:\n"
 msgstr ""
 "\n"
-"Options de d�boguage:\n"
+"Options de d�boguage�:\n"
 
 #: openbox/openbox.c:494
 msgid "  --sync              Run in synchronous mode\n"
@@ -289,7 +291,7 @@ msgstr ""
 #: openbox/openbox.c:599
 #, c-format
 msgid "Invalid command line argument '%s'\n"
-msgstr "Argument de la ligne de commande invalide '%s'\n"
+msgstr "Argument de la ligne de commande invalide ��%s��\n"
 
 #: openbox/screen.c:96 openbox/screen.c:184
 #, c-format
@@ -307,7 +309,7 @@ msgstr ""
 #, c-format
 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"
+"Le gestionnaire de fen�tres sur l'�cran %d n'est pas en train de se terminer"
 
 #: openbox/screen.c:1087
 #, c-format
@@ -317,17 +319,17 @@ msgstr "bureau %i"
 #: openbox/session.c:103
 #, c-format
 msgid "Unable to make directory '%s': %s"
-msgstr "Impossible de cr�er le r�pertoire '%s': %s"
+msgstr "Impossible de cr�er le r�pertoire ��%s���: %s"
 
 #: openbox/session.c:451
 #, c-format
 msgid "Unable to save the session to '%s': %s"
-msgstr "Impossible de sauvegarder la session de '%s': %s"
+msgstr "Impossible de sauvegarder la session dans ��%s���: %s"
 
 #: openbox/session.c:583
 #, c-format
 msgid "Error while saving the session to '%s': %s"
-msgstr "Erreur lors de la sauvegarde de la session de '%s': %s"
+msgstr "Erreur lors de la sauvegarde de la session depuis ��%s���: %s"
 
 #: openbox/startupnotify.c:237
 #, c-format
@@ -338,25 +340,25 @@ msgstr "Ex
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr ""
-"Touche de modification '%s' invalide dans le param�trage du clavier / de la "
-"souris"
+"Touche de modification ��%s�� invalide dans le param�trage du clavier / de "
+"la souris"
 
 #: openbox/translate.c:135
 #, c-format
 msgid "Invalid key code '%s' in key binding"
-msgstr "Code de touche '%s' invalide dans le raccourci clavier"
+msgstr "Code de touche ��%s�� invalide dans le raccourci clavier"
 
 #: openbox/translate.c:142
 #, c-format
 msgid "Invalid key name '%s' in key binding"
-msgstr "Nom de touche '%s' invalide dans le raccourci clavier"
+msgstr "Nom de touche ��%s�� invalide dans le raccourci clavier"
 
 #: openbox/translate.c:148
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
-msgstr "La touche demand�e '%s' n'existe pas pour l'affichage"
+msgstr "La touche demand�e ��%s�� n'existe pas pour l'affichage"
 
 #: openbox/xerror.c:39
 #, c-format
 msgid "X Error: %s"
-msgstr "Erreur X: %s"
+msgstr "Erreur X�: %s"

From 9ad2ec9700038364a3a0a22cabb94b05e1b933e5 Mon Sep 17 00:00:00 2001
From: Quan Tran <qeed.quan@gmail.com>
Date: Wed, 9 Jan 2008 21:34:19 +0100
Subject: [PATCH 03/79] Add --exit translation to vietnamese translation.

---
 po/vi.po | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/po/vi.po b/po/vi.po
index 13528b59..0d08aa28 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.4.3\n"
+"Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2007-11-12 19:12+0100\n"
-"PO-Revision-Date: 2007-07-20 16:48+0200\n"
+"PO-Revision-Date: 2008-01-09 21:33+0100\n"
 "Last-Translator: Quan Tran <qeed.quan@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -236,9 +236,8 @@ msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Bắt đầu lại Openbox\n"
 
 #: openbox/openbox.c:492
-#, fuzzy
 msgid "  --exit              Exit Openbox\n"
-msgstr ""
+msgstr "  --exit              Đi ra Openbox\n"
 
 #: openbox/openbox.c:493
 msgid ""

From b155a17305e555233bf7d7062db7370a48d8f93c Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@comhem.se>
Date: Fri, 11 Jan 2008 02:04:39 +0100
Subject: [PATCH 04/79] Correct .po version headers.

---
 po/fi.po    | 2 +-
 po/hu.po    | 2 +-
 po/no.po    | 2 +-
 po/sv.po    | 2 +-
 po/ua.po    | 2 +-
 po/zh_TW.po | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index d2d5e240..63c92690 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openbox 3.4.3\n"
+"Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2007-11-12 19:12+0100\n"
 "PO-Revision-Date: 2007-10-22 15:58+0200\n"
diff --git a/po/hu.po b/po/hu.po
index 75f49ebf..c9c2dccf 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openbox 3.4.3\n"
+"Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2007-11-12 19:12+0100\n"
 "PO-Revision-Date: 2007-12-21 14:33+0100\n"
diff --git a/po/no.po b/po/no.po
index 4f801943..ec72a932 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 # Michael Kjelbergvik Thung <postlogic@switch-case.org>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: openbox 3.4.3\n"
+"Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2007-11-12 19:12+0100\n"
 "PO-Revision-Date: 2007-05-20 18:41+0200\n"
diff --git a/po/sv.po b/po/sv.po
index b024d8ed..3518f258 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openbox 3.4.3\n"
+"Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2007-11-12 19:12+0100\n"
 "PO-Revision-Date: 2007-05-22 00:29+0200\n"
diff --git a/po/ua.po b/po/ua.po
index d4c73a4a..4770c333 100644
--- a/po/ua.po
+++ b/po/ua.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2007-11-12 19:12+0100\n"
 "PO-Revision-Date: 2007-06-16 13:02+0200\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fd495212..5a7c0498 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openbox 3.4.3\n"
+"Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2007-11-12 19:12+0100\n"
 "PO-Revision-Date: 2007-07-23 23:22+0200\n"

From 40ed213d4bdbb8c6cb5690a902433725cf97f693 Mon Sep 17 00:00:00 2001
From: Inko Illarramendi Arancibia <inkoia@gmail.com>
Date: Fri, 11 Jan 2008 02:09:31 +0100
Subject: [PATCH 05/79] Add new Basque translation.

---
 po/LINGUAS |   1 +
 po/eu.po   | 348 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 349 insertions(+)
 create mode 100644 po/eu.po

diff --git a/po/LINGUAS b/po/LINGUAS
index 33191bfc..d95268a1 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -2,6 +2,7 @@ zh_TW
 zh_CN
 de
 es
+eu
 ca
 sv
 sk
diff --git a/po/eu.po b/po/eu.po
new file mode 100644
index 00000000..2425f10e
--- /dev/null
+++ b/po/eu.po
@@ -0,0 +1,348 @@
+# Basque translation for openbox.
+# Copyright (C) 2008 Inko Illarramendi Arancibia
+# This file is distributed under the same license as the openbox package.
+# Inko Illarramendi Arancibia <inkoia@gmail.com>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Openbox 3.4.5\n"
+"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
+"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"PO-Revision-Date: 2008-01-11 01:00+0100\n"
+"Last-Translator: Inko I. A. <inkoia@gmail.com>\n"
+"Language-Team: Inko I. A. <inkoia@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: openbox/actions/execute.c:88
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Hutsegitea '%s' helbidea utf8-tik bihurtzean"
+
+#: openbox/actions/execute.c:97 openbox/actions/execute.c:115
+#, c-format
+msgid "Failed to execute '%s': %s"
+msgstr "Hutsegitea '%s' exekutatzean: %s"
+
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
+msgid "Go there..."
+msgstr "Hona joan..."
+
+#: openbox/client_list_combined_menu.c:96
+msgid "Manage desktops"
+msgstr "Idazmahaiak kudeatu"
+
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
+msgid "_Add new desktop"
+msgstr "Idazmahai berria _gehitu"
+
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
+msgid "_Remove last desktop"
+msgstr "Azken idazmahaia _ezabatu"
+
+#: openbox/client_list_combined_menu.c:150
+msgid "Windows"
+msgstr "Leihoak"
+
+#: openbox/client_list_menu.c:203
+msgid "Desktops"
+msgstr "Idazmahaiak"
+
+#: openbox/client_menu.c:256
+msgid "All desktops"
+msgstr "Idazmahai guztiak"
+
+#: openbox/client_menu.c:360
+msgid "_Layer"
+msgstr "_Geruza"
+
+#: openbox/client_menu.c:365
+msgid "Always on _top"
+msgstr "Beti _gainean"
+
+#: openbox/client_menu.c:366
+msgid "_Normal"
+msgstr "_Ohikoa"
+
+#: openbox/client_menu.c:367
+msgid "Always on _bottom"
+msgstr "Beti _azpian"
+
+#: openbox/client_menu.c:370
+msgid "_Send to desktop"
+msgstr "_Bidali idazmahaira"
+
+#: openbox/client_menu.c:374
+msgid "Client menu"
+msgstr "Bezero menua"
+
+#: openbox/client_menu.c:384
+msgid "R_estore"
+msgstr "Berr_ezarri"
+
+#: openbox/client_menu.c:392
+msgid "_Move"
+msgstr "_Mugitu"
+
+#: openbox/client_menu.c:394
+msgid "Resi_ze"
+msgstr "_Tamaina aldatu"
+
+#: openbox/client_menu.c:396
+msgid "Ico_nify"
+msgstr "Iko_notu"
+
+#: openbox/client_menu.c:404
+msgid "Ma_ximize"
+msgstr "Ma_ximizatu"
+
+#: openbox/client_menu.c:412
+msgid "_Roll up/down"
+msgstr "Bildu/_Zabaldu"
+
+#: openbox/client_menu.c:414
+msgid "Un/_Decorate"
+msgstr "Des/_Dekoratu"
+
+#: openbox/client_menu.c:418
+msgid "_Close"
+msgstr "_Itxi"
+
+#: openbox/config.c:740
+#, c-format
+msgid "Invalid button '%s' specified in config file"
+msgstr "Konfigurazio fitxategian zehaztutako '%s' botoia baliogabea"
+
+#: openbox/keyboard.c:156
+msgid "Conflict with key binding in config file"
+msgstr "Gatazka konfigurazio fitxategiko tekla elkarketarekin"
+
+#: openbox/menu.c:103 openbox/menu.c:111
+#, c-format
+msgid "Unable to find a valid menu file '%s'"
+msgstr "Ezin da '%s' baliozko menu fitxategi bat aurkitu"
+
+#: openbox/menu.c:171
+#, c-format
+msgid "Failed to execute command for pipe-menu '%s': %s"
+msgstr "Hutsegitea '%s' pipe-menuarentzat komandoa exekutatzean: %s"
+
+#: openbox/menu.c:185
+#, c-format
+msgid "Invalid output from pipe-menu '%s'"
+msgstr "Baliogabeko irteera '%s' pipe-menutik"
+
+#: openbox/menu.c:198
+#, c-format
+msgid "Attempted to access menu '%s' but it does not exist"
+msgstr "'%s' menua atzitzen saiatu da baina ez da existitzen"
+
+#: openbox/menu.c:368 openbox/menu.c:369
+msgid "More..."
+msgstr "Gehiago..."
+
+#: openbox/mouse.c:349
+#, c-format
+msgid "Invalid button '%s' in mouse binding"
+msgstr "Baliogabeko '%s' botoia sagu elkarketan"
+
+#: openbox/mouse.c:355
+#, c-format
+msgid "Invalid context '%s' in mouse binding"
+msgstr "Baliogabeko '%s' testuingurua sagu elkarketan"
+
+#: openbox/openbox.c:129
+#, c-format
+msgid "Unable to change to home directory '%s': %s"
+msgstr "Ezin da '%s' hasiera direktoriora aldatu: %s"
+
+#: openbox/openbox.c:149
+msgid "Failed to open the display from the DISPLAY environment variable."
+msgstr "Hutsegitea pantaila irekitzean DISPLAY ingurune aldagaitik."
+
+#: openbox/openbox.c:180
+msgid "Failed to initialize the obrender library."
+msgstr "Hutsegitea obrender liburutegia hasieratzean."
+
+#: openbox/openbox.c:186
+msgid "X server does not support locale."
+msgstr "X zerbitzariak ez du locale euskarririk."
+
+#: openbox/openbox.c:188
+msgid "Cannot set locale modifiers for the X server."
+msgstr "Ezin da locale modifikatzailerik ezarri X zerbitzariarentzat."
+
+#: openbox/openbox.c:251
+msgid "Unable to find a valid config file, using some simple defaults"
+msgstr ""
+"Ezin da baliozko konfigurazio fitxategirik aurkitu, hainbat aukera lehenetsi "
+"sinple erabiltzen"
+
+#: openbox/openbox.c:277
+msgid "Unable to load a theme."
+msgstr "Ezin da gai bat kargatu."
+
+#: openbox/openbox.c:402
+#, c-format
+msgid "Restart failed to execute new executable '%s': %s"
+msgstr "Berrabiarazteak hutsegitea '%s' exekutagarri berria exekutatzean: %s"
+
+#: openbox/openbox.c:472 openbox/openbox.c:474
+msgid "Copyright (c)"
+msgstr "Copyright (c)"
+
+#: openbox/openbox.c:483
+msgid "Syntax: openbox [options]\n"
+msgstr "Sintaxia: openbox [aukerak]\n"
+
+#: openbox/openbox.c:484
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Aukerak:\n"
+
+#: openbox/openbox.c:485
+msgid "  --help              Display this help and exit\n"
+msgstr "  --help              Mezu hau erakutsi eta irten\n"
+
+#: openbox/openbox.c:486
+msgid "  --version           Display the version and exit\n"
+msgstr "  --version           Bertsioa bistarazi eta irten\n"
+
+#: openbox/openbox.c:487
+msgid "  --replace           Replace the currently running window manager\n"
+msgstr ""
+"  --replace           Ordezkatu exekutatzen ari den leiho-kudeatzailea\n"
+
+#: openbox/openbox.c:488
+msgid "  --sm-disable        Disable connection to the session manager\n"
+msgstr "  --sm-disable        Ezgaitu saio kudeatzailearekiko konexioa\n"
+
+#: openbox/openbox.c:489
+msgid ""
+"\n"
+"Passing messages to a running Openbox instance:\n"
+msgstr ""
+"\n"
+"Exekutatzen ari den Openbox instantzia bati mezuak pasatzen:\n"
+
+#: openbox/openbox.c:490
+msgid "  --reconfigure       Reload Openbox's configuration\n"
+msgstr "  --reconfigure       Birkargatu Openbox-en konfigurazioa\n"
+
+#: openbox/openbox.c:491
+msgid "  --restart           Restart Openbox\n"
+msgstr "  --restart           Berrabiarazi Openbox\n"
+
+#: openbox/openbox.c:492
+msgid "  --exit              Exit Openbox\n"
+msgstr "  --exit              Itxi Openbox\n"
+
+#: openbox/openbox.c:493
+msgid ""
+"\n"
+"Debugging options:\n"
+msgstr ""
+"\n"
+"Arazketa aukerak:\n"
+
+#: openbox/openbox.c:494
+msgid "  --sync              Run in synchronous mode\n"
+msgstr "  --sync              Modu sinkronoan exekutatu\n"
+
+#: openbox/openbox.c:495
+msgid "  --debug             Display debugging output\n"
+msgstr "  --debug             Arazketa irteera erakutsi\n"
+
+#: openbox/openbox.c:496
+msgid "  --debug-focus       Display debugging output for focus handling\n"
+msgstr "  --debug-focus       Erakutsi arazketa irteera foku maneiurako\n"
+
+#: openbox/openbox.c:497
+msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
+msgstr "  --debug-xinerama    Zatitu pantaila xinerama pantaila faltsuetan\n"
+
+#: openbox/openbox.c:498
+#, c-format
+msgid ""
+"\n"
+"Please report bugs at %s\n"
+msgstr ""
+"\n"
+"%s helbidean erroreen berri eman mesedez\n"
+
+#: openbox/openbox.c:599
+#, c-format
+msgid "Invalid command line argument '%s'\n"
+msgstr "'%s' komando lerro argumentu baliogabea\n"
+
+#: openbox/screen.c:96 openbox/screen.c:184
+#, c-format
+msgid "A window manager is already running on screen %d"
+msgstr ""
+"Bistaratzeko %d pantailan aurretik leiho-kudeatzaile bat exekutatzen ari da"
+
+#: openbox/screen.c:118
+#, c-format
+msgid "Could not acquire window manager selection on screen %d"
+msgstr ""
+"Ezin izan da eskuratu leiho-kudeatzailearen hautapena bistaratzeko %d "
+"pantailan"
+
+#: openbox/screen.c:139
+#, c-format
+msgid "The WM on screen %d is not exiting"
+msgstr "%d bistaratze pantailako leiho-kudeatzailea ez da irteten"
+
+#: openbox/screen.c:1087
+#, c-format
+msgid "desktop %i"
+msgstr "%i Idazmahaia"
+
+#: openbox/session.c:103
+#, c-format
+msgid "Unable to make directory '%s': %s"
+msgstr "Ezin da '%s' direktorioa sortu: %s"
+
+#: openbox/session.c:451
+#, c-format
+msgid "Unable to save the session to '%s': %s"
+msgstr "Ezin da saioa '%s'-n gorde: %s"
+
+#: openbox/session.c:583
+#, c-format
+msgid "Error while saving the session to '%s': %s"
+msgstr "Errorea saioa '%s'-n gordetzean: %s"
+
+#: openbox/startupnotify.c:237
+#, c-format
+msgid "Running %s\n"
+msgstr "Egikaritzen %s\n"
+
+#: openbox/translate.c:58
+#, c-format
+msgid "Invalid modifier key '%s' in key/mouse binding"
+msgstr " tekla/sagu elkarketan '%s' modifikatzaile tekla baliogabea"
+
+#: openbox/translate.c:135
+#, c-format
+msgid "Invalid key code '%s' in key binding"
+msgstr " tekla elkarketan '%s' tekla kode baliogabea"
+
+#: openbox/translate.c:142
+#, c-format
+msgid "Invalid key name '%s' in key binding"
+msgstr " tekla elkarketan '%s' tekla izen baliogabea"
+
+#: openbox/translate.c:148
+#, c-format
+msgid "Requested key '%s' does not exist on the display"
+msgstr "Eskatutako '%s' tekla ez da pantaila existitzen"
+
+#: openbox/xerror.c:39
+#, c-format
+msgid "X Error: %s"
+msgstr "X errorea: %s"

From 9e9a7e124d1a80579281c5ab2ffc3574f38f9eba Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 09:46:07 -0500
Subject: [PATCH 06/79] allow dialog windows to be fullscreened, kpdf does this

---
 openbox/client.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/openbox/client.c b/openbox/client.c
index d0fed545..1e2040fd 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1634,11 +1634,16 @@ void client_setup_decor_and_functions(ObClient *self, gboolean reconfig)
     switch (self->type) {
     case OB_CLIENT_TYPE_NORMAL:
         /* normal windows retain all of the possible decorations and
-           functionality, and are the only windows that you can fullscreen */
+           functionality, and can be fullscreen */
         self->functions |= OB_CLIENT_FUNC_FULLSCREEN;
         break;
 
     case OB_CLIENT_TYPE_DIALOG:
+        /* sometimes apps make dialog windows fullscreen for some reason (for
+           e.g. kpdf does this..) */
+        self->functions |= OB_CLIENT_FUNC_FULLSCREEN;
+        break;
+
     case OB_CLIENT_TYPE_UTILITY:
         /* these windows don't have anything added or removed by default */
         break;

From 44ee90c94623d37b3de3767233bc9cd38b670d34 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 10:00:58 -0500
Subject: [PATCH 07/79] Bug#:   	 3328 - remove top border for maxed
 undecorated windows

---
 openbox/frame.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openbox/frame.c b/openbox/frame.c
index b10f793b..b49139ac 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -377,10 +377,12 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
 
         STRUT_SET(self->size,
                   self->cbwidth_l + (!self->max_horz ? self->bwidth : 0),
-                  self->cbwidth_t + self->bwidth,
+                  self->cbwidth_t +
+                  (!self->max_horz || !self->max_vert ||
+                   !self->client->undecorated ? self->bwidth : 0),
                   self->cbwidth_r + (!self->max_horz ? self->bwidth : 0),
                   self->cbwidth_b +
-                    (!self->max_horz || !self->max_vert ? self->bwidth : 0));
+                  (!self->max_horz || !self->max_vert ? self->bwidth : 0));
 
         if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
             self->size.top += ob_rr_theme->title_height + self->bwidth;

From 103567be66c781dac459921454bfeebbd5751191 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 10:16:42 -0500
Subject: [PATCH 08/79] updated clearlooks theme from John McKnight

---
 themes/Clearlooks/openbox-3/themerc | 148 +++++++++++++++-------------
 1 file changed, 78 insertions(+), 70 deletions(-)

diff --git a/themes/Clearlooks/openbox-3/themerc b/themes/Clearlooks/openbox-3/themerc
index e1dd9aa9..05e89229 100644
--- a/themes/Clearlooks/openbox-3/themerc
+++ b/themes/Clearlooks/openbox-3/themerc
@@ -2,117 +2,125 @@
 # Author: John McKnight <jmcknight@gmail.com>
 # Note: This is a port of the Clearlooks metacity theme to Openbox.
 
-# Menu settings
-menu.title.bg: Raised Gradient Vertical
-menu.title.bg.color: #658fb5
-menu.title.bg.colorTo: #4d6982
+### Menu
+#menu.border.color: #b5aa99
+
+menu.title.bg: Flat Border Gradient Vertical
+menu.title.bg.color: #589bda
+menu.title.bg.colorTo: #3c7cb7
+menu.title.bg.border.color: #7cb6ec
 menu.title.text.color: #ffffff
-menu.title.text.justify: Left
+menu.title.text.justify: Center
 
 menu.items.bg: Flat Solid
-menu.items.bg.color: #f8f5f2
+menu.items.bg.color: #fcfbfa
 menu.items.text.color: #000000
-menu.items.disabled.text.color: #aaaaaa
+menu.items.disable.text.color: #b5b3ac
 
 menu.items.active.bg: Flat Gradient Vertical
-menu.items.active.bg.color: #628cb2
-menu.items.active.bg.colorTo: #50708d
+menu.items.active.bg.color: #5c9edb
+menu.items.active.bg.colorTo: #4489ca
 menu.items.active.text.color: #ffffff
 
 
-# Window settings (focused)
-window.active.title.bg: Raised Gradient Vertical
-window.active.title.bg.color: #658fb5
-window.active.title.bg.colorTo: #4d6982
+### Window active
+window.active.title.bg: Flat Border Gradient Vertical
+window.active.title.bg.color: #589bda
+window.active.title.bg.colorTo: #3c7cb7
+window.active.title.bg.border.color: #7cb6ec
+window.active.title.separator.color: #334c62
 
 window.active.label.bg: Parentrelative
 window.active.label.text.color: #ffffff
 
-window.active.handle.bg: Raised Gradient Vertical
-window.active.handle.bg.color: #658fb5
-window.active.handle.bg.colorTo: #4d6982
+window.active.handle.bg: Flat Border Solid
+window.active.handle.bg.color: #3c7cb7
+window.active.handle.bg.border.color: #7cb6ec
 
-window.active.grip.bg: Raised Gradient Vertical
-window.active.grip.bg.color: #658fb5
-window.active.grip.bg.colorTo: #4d6982
+window.active.grip.bg: Flat Border Solid
+window.active.grip.bg.color: #3c7cb7
+window.active.grip.bg.border.color: #7cb6ec
 
-window.active.button.unpressed.bg: Flat Gradient Vertical Border
-window.active.button.unpressed.bg.color: #6993b9
-window.active.button.unpressed.bg.colorTo: #55799a
-window.active.button.unpressed.bg.border.color: #3d4c5a
+window.active.button.unpressed.bg: Flat Border Gradient Vertical
+window.active.button.unpressed.bg.color: #5ea0dd
+window.active.button.unpressed.bg.colorTo: #3f85c5
+window.active.button.unpressed.bg.border.color: #36536f
 window.active.button.unpressed.image.color: #ffffff
 
-window.active.button.pressed.bg: Flat Gradient Vertical Border
-window.active.button.pressed.bg.color: #537797
-window.active.button.pressed.bg.colorTo: #50708e
-window.active.button.pressed.bg.border.color: #3d4c5a
+window.active.button.pressed.bg: Flat Border Gradient Vertical
+window.active.button.pressed.bg.color: #3c82c3
+window.active.button.pressed.bg.colorTo: #3c7ab5
+window.active.button.pressed.bg.border.color: #36536f
 window.active.button.pressed.image.color: #ffffff
 
-window.active.button.disabled.bg: Flat Gradient Vertical Border
-window.active.button.disabled.bg.color: #537797
-window.active.button.disabled.bg.colorTo: #50708e
-window.active.button.disabled.bg.border.color: #3d4c5a
-window.active.button.disabled.image.color: #3d4c5a
+window.active.button.disabled.bg: Flat Border Gradient Vertical
+window.active.button.disabled.bg.color: #3c82c3
+window.active.button.disabled.bg.colorTo: #3c7ab5
+window.active.button.disabled.bg.border.color: #36536f
+window.active.button.disabled.image.color: #36536f
 
-window.active.button.toggled.bg: Flat Gradient Vertical Border
-window.active.button.toggled.bg.color: #6993b9
-window.active.button.toggled.bg.colorTo: #55799a
-window.active.button.toggled.bg.border.color: #3d4c5a
-window.active.button.toggled.image.color: #cccccc
+window.active.button.toggled.bg: Flat Border Gradient Vertical
+window.active.button.toggled.bg.color: #5ea0dd
+window.active.button.toggled.bg.colorTo: #3f85c5
+window.active.button.toggled.bg.border.color: #36536f
+window.active.button.toggled.image.color: #dcd4c9
 
 
-# Window settings (unfocused)
-window.inactive.title.bg: Raised Gradient Vertical
-window.inactive.title.bg.color: #f1eeea
-window.inactive.title.bg.colorTo: #d8cfc7
+### Window inactive
+window.inactive.border.color: #3d3a37
+
+window.inactive.title.bg: Flat Border Gradient Vertical
+window.inactive.title.bg.color: #efece6
+window.inactive.title.bg.colorTo: #d9d2c7
+window.inactive.title.bg.border.color: #ffffff
+window.inactive.title.separator.color: #9a8e7c
 
 window.inactive.label.bg: Parentrelative
 window.inactive.label.text.color: #000000
 
-window.inactive.handle.bg: Raised Gradient Vertical
-window.inactive.handle.bg.color: #f1eeea
-window.inactive.handle.bg.colorTo: #d8cfc7
+window.inactive.handle.bg: Flat Border Solid
+window.inactive.handle.bg.color: #d9d2c7
+window.inactive.handle.bg.border.color: #ffffff
 
-window.inactive.grip.bg: Raised Gradient Vertical
-window.inactive.grip.bg.color: #f1eeea
-window.inactive.grip.bg.colorTo: #d8cfc7
+window.inactive.grip.bg: Flat Border Solid
+window.inactive.grip.bg.color: #d9d2c7
+window.inactive.grip.bg.border.color: #ffffff
 
-window.inactive.button.unpressed.bg: Flat Gradient Vertical Border
-window.inactive.button.unpressed.bg.color: #efebe7
-window.inactive.button.unpressed.bg.colorTo: #ddd6ce
-window.inactive.button.unpressed.bg.border.color: #8f8173
+window.inactive.button.unpressed.bg: Flat Border Gradient Vertical
+window.inactive.button.unpressed.bg.color: #ede9e3
+window.inactive.button.unpressed.bg.colorTo: #dbd5ca
+window.inactive.button.unpressed.bg.border.color: #8f8370
 window.inactive.button.unpressed.image.color: #000000
 
-window.inactive.button.pressed.bg: Flat Gradient Vertical Border
-window.inactive.button.pressed.bg.color: #efebe7
-window.inactive.button.pressed.bg.colorTo: #ddd6ce
-window.inactive.button.pressed.bg.border.color: #8f8173
+window.inactive.button.pressed.bg: Flat Border Gradient Vertical
+window.inactive.button.pressed.bg.color: #ede9e3
+window.inactive.button.pressed.bg.colorTo: #dbd5ca
+window.inactive.button.pressed.bg.border.color: #8f8370
 window.inactive.button.pressed.image.color: #000000
 
-window.inactive.button.disabled.bg: Flat Gradient Vertical Border
-window.inactive.button.disabled.bg.color: #efebe7
-window.inactive.button.disabled.bg.colorTo: #ddd6ce
-window.inactive.button.disabled.bg.border.color: #8f8173
-window.inactive.button.disabled.image.color: #8f8173
+window.inactive.button.disabled.bg: Flat Border Gradient Vertical
+window.inactive.button.disabled.bg.color: #ede9e3
+window.inactive.button.disabled.bg.colorTo: #dbd5ca
+window.inactive.button.disabled.bg.border.color: #8f8370
+window.inactive.button.disabled.image.color: #000000
 
-window.inactive.button.toggled.bg: Flat Gradient Vertical Border
-window.inactive.button.toggled.bg.color: #efebe7
-window.inactive.button.toggled.bg.colorTo: #ddd6ce
-window.inactive.button.toggled.bg.border.color: #8f8173
+window.inactive.button.toggled.bg: Flat Border Gradient Vertical
+window.inactive.button.toggled.bg.color: #ede9e3
+window.inactive.button.toggled.bg.colorTo: #dbd5ca
+window.inactive.button.toggled.bg.border.color: #8f8370
 window.inactive.button.toggled.image.color: #000000
 
 
 ### Everything else
 border.width: 1
 padding.width: 2
-window.handle.width: 3
+window.handle.width: 4
 window.client.padding.width: 0
-window.client.padding.height: 0
-border.color: #000000
+border.color: #1f252b
 menu.overlap: 0
 
 ### Fonts
-window.active.label.text.font:shadow=y:shadowtint=70:shadowoffset=1
-window.inactive.label.text.font:shadow=y:shadowtint=20:shadowoffset=1
+window.active.label.text.font:
+window.inactive.label.text.font:
 menu.items.font:
-menu.title.text.font:shadow=y:shadowtint=70
+menu.title.text.font:

From 8a51893e8bf2192eec69eeed9bc49beb78e34312 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 11:21:00 -0500
Subject: [PATCH 09/79] Revert "fix for xkb weirdness, to fix a bug introduced
 in 3.4.3, where releasing the super mod key would not end interactive
 actions."

This reverts commit 47e7aa82dc9f390c809151f87c81f33b5b408221.

This is an XKB problem, and it needs to be properly resolved with XKB functions
---
 openbox/modkeys.c | 54 +++++++++--------------------------------------
 1 file changed, 10 insertions(+), 44 deletions(-)

diff --git a/openbox/modkeys.c b/openbox/modkeys.c
index c993cfc1..9e8da321 100644
--- a/openbox/modkeys.c
+++ b/openbox/modkeys.c
@@ -35,21 +35,7 @@
 
 static void set_modkey_mask(guchar mask, KeySym sym);
 
-/* This is 8 lists of keycodes that are bound to the given mod mask.
-   If contains more than the one given to us by X cuz XKB is weird apparently.
-   We will look up all keycodes for a given keysym that is bound to the mask,
-   and add them all here.
-
-   With XKB, you can have a keycode bound to a modifier that isn't in the
-   modifier map somehow.  So this means that when we try translate from the
-   KeyRelease to a mod mask, we are unable to.  So this array stores *all*
-   the KeyCodes for each KeySym for each KeyCode bound to a mod mask.
-   Confused? Haha...
-
-   ModMask -> n KeyCodes -> n*m KeySyms (up to m for each KeyCode) ->
-     n*m*p KeyCodes (up to p for each KeySym)
-*/
-static GArray *modmap[NUM_MASKS];
+static XModifierKeymap *modmap;
 static KeySym *keymap;
 static gint min_keycode, max_keycode, keysyms_per_keycode;
 /* This is a bitmask of the different masks for each modifier key */
@@ -62,15 +48,14 @@ static gboolean hyper_l = FALSE;
 
 void modkeys_startup(gboolean reconfigure)
 {
-    static XModifierKeymap *xmodmap;
-    gint i, j, k, l, m;
+    gint i, j, k;
 
     /* reset the keys to not be bound to any masks */
     for (i = 0; i < OB_MODKEY_NUM_KEYS; ++i)
         modkeys_keys[i] = 0;
 
-    xmodmap = XGetModifierMapping(ob_display);
-    g_assert(xmodmap->max_keypermod > 0);
+    modmap = XGetModifierMapping(ob_display);
+    g_assert(modmap->max_keypermod > 0);
 
     XDisplayKeycodes(ob_display, &min_keycode, &max_keycode);
     keymap = XGetKeyboardMapping(ob_display, min_keycode,
@@ -81,31 +66,17 @@ void modkeys_startup(gboolean reconfigure)
 
     /* go through each of the modifier masks (eg ShiftMask, CapsMask...) */
     for (i = 0; i < NUM_MASKS; ++i) {
-        /* reset the modmap list */
-        modmap[i] = g_array_new(FALSE, FALSE, sizeof(KeyCode));
-
         /* go through each keycode that is bound to the mask */
-        for (j = 0; j < xmodmap->max_keypermod; ++j) {
+        for (j = 0; j < modmap->max_keypermod; ++j) {
             KeySym sym;
             /* get a keycode that is bound to the mask (i) */
-            KeyCode keycode = xmodmap->modifiermap[i*xmodmap->max_keypermod+j];
+            KeyCode keycode = modmap->modifiermap[i*modmap->max_keypermod + j];
             if (keycode) {
                 /* go through each keysym bound to the given keycode */
                 for (k = 0; k < keysyms_per_keycode; ++k) {
                     sym = keymap[(keycode-min_keycode) * keysyms_per_keycode +
                                  k];
                     if (sym != NoSymbol) {
-                        /* find all keycodes for the given keysym */
-                        for (l = min_keycode; l <= max_keycode; ++l)
-                            for (m = 0; m < keysyms_per_keycode; ++m)
-                                if (keymap[(l-min_keycode) *
-                                           keysyms_per_keycode + m] == sym)
-                                {
-                                    /* add all keycodes for the keysym to our
-                                       modmap */
-                                    g_array_append_val(modmap[i], l);
-                                }
-
                         /* bind the key to the mask (e.g. Alt_L => Mod1Mask) */
                         set_modkey_mask(nth_mask(i), sym);
                     }
@@ -118,22 +89,17 @@ void modkeys_startup(gboolean reconfigure)
     modkeys_keys[OB_MODKEY_KEY_CAPSLOCK] = LockMask;
     modkeys_keys[OB_MODKEY_KEY_SHIFT] = ShiftMask;
     modkeys_keys[OB_MODKEY_KEY_CONTROL] = ControlMask;
-
-    XFreeModifiermap(xmodmap);
 }
 
 void modkeys_shutdown(gboolean reconfigure)
 {
-    guint i;
-
-    for (i = 0; i < NUM_MASKS; ++i)
-        g_array_free(modmap[i], TRUE);
+    XFreeModifiermap(modmap);
     XFree(keymap);
 }
 
 guint modkeys_keycode_to_mask(guint keycode)
 {
-    guint i, j;
+    gint i, j;
     guint mask = 0;
 
     if (keycode == NoSymbol) return 0;
@@ -141,9 +107,9 @@ guint modkeys_keycode_to_mask(guint keycode)
     /* go through each of the modifier masks (eg ShiftMask, CapsMask...) */
     for (i = 0; i < NUM_MASKS; ++i) {
         /* go through each keycode that is bound to the mask */
-        for (j = 0; j < modmap[i]->len; ++j) {
+        for (j = 0; j < modmap->max_keypermod; ++j) {
             /* compare with a keycode that is bound to the mask (i) */
-            if (g_array_index(modmap[i], KeyCode, j) == keycode)
+            if (modmap->modifiermap[i*modmap->max_keypermod + j] == keycode)
                 mask |= nth_mask(i);
         }
     }

From 5a468756c07a43e0ee7fa4e406847c86db09834a Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 11:42:09 -0500
Subject: [PATCH 10/79] reconfigure openbox when the input mapping changes, eg.
 keyboard layout or modifier map

---
 openbox/event.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openbox/event.c b/openbox/event.c
index 5e44bc9f..41bcd350 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -619,6 +619,11 @@ static void event_process(const XEvent *ec, gpointer data)
         event_handle_root(e);
     else if (e->type == MapRequest)
         client_manage(window);
+    else if (e->type == MappingNotify) {
+        /* keyboard layout changes, reconfigure openbox. need to restart the
+           modkeys system, but also to reload the key bindings. */
+        ob_reconfigure();
+    }
     else if (e->type == ClientMessage) {
         /* This is for _NET_WM_REQUEST_FRAME_EXTENTS messages. They come for
            windows that are not managed yet. */

From 162a97e158e0dfa774754aee5198786907f9453b Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 13:05:11 -0500
Subject: [PATCH 11/79] XKB modifiers are strange things, and i don't know how
 to read them properly in modkeys.c and convert it all to the x core stuff. 
 so we use this to get the state of the modifiers, otherwise we end up missing
 them sometimes (like on PPC)

---
 openbox/event.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/openbox/event.c b/openbox/event.c
index 41bcd350..0c97bd93 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -247,6 +247,10 @@ static void event_set_curtime(XEvent *e)
 
 static void event_hack_mods(XEvent *e)
 {
+#ifdef XKB
+    XkbStateRec xkb_state;
+#endif
+
     switch (e->type) {
     case ButtonPress:
     case ButtonRelease:
@@ -256,10 +260,22 @@ static void event_hack_mods(XEvent *e)
         e->xkey.state = modkeys_only_modifier_masks(e->xkey.state);
         break;
     case KeyRelease:
-        e->xkey.state = modkeys_only_modifier_masks(e->xkey.state);
-        /* remove from the state the mask of the modifier key being released,
-           if it is a modifier key being released that is */
-        e->xkey.state &= ~modkeys_keycode_to_mask(e->xkey.keycode);
+#ifdef XKB
+        /* If XKB is present, then the modifiers are all strange from its
+           magic.  Our X core protocol stuff won't work, so we use this to
+           find what the modifier state is instead. */
+        if (XkbGetState(ob_display, XkbUseCoreKbd, &xkb_state) == Success) {
+            e->xkey.state = xkb_state.compat_state;
+            break;
+        }
+        else
+#endif
+        {
+            e->xkey.state = modkeys_only_modifier_masks(e->xkey.state);
+            /* remove from the state the mask of the modifier key being
+               released, if it is a modifier key being released that is */
+            e->xkey.state &= ~modkeys_keycode_to_mask(e->xkey.keycode);
+        }
         break;
     case MotionNotify:
         e->xmotion.state = modkeys_only_modifier_masks(e->xmotion.state);

From b447f16f6080e1a92c3ea6a5848609a7a96ea3ce Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 13:06:37 -0500
Subject: [PATCH 12/79] code clean up

---
 openbox/event.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/openbox/event.c b/openbox/event.c
index 0c97bd93..e3214a7a 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -264,10 +264,8 @@ static void event_hack_mods(XEvent *e)
         /* If XKB is present, then the modifiers are all strange from its
            magic.  Our X core protocol stuff won't work, so we use this to
            find what the modifier state is instead. */
-        if (XkbGetState(ob_display, XkbUseCoreKbd, &xkb_state) == Success) {
+        if (XkbGetState(ob_display, XkbUseCoreKbd, &xkb_state) == Success)
             e->xkey.state = xkb_state.compat_state;
-            break;
-        }
         else
 #endif
         {

From 0ce14a727968736e57fb3fabba3794b46903875f Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 14:40:58 -0500
Subject: [PATCH 13/79] fix a focus race condition in two ways:

1. when focusing a window, ignore any enter events up until the serial of the X event causing the focus, not up until the last thing sent to the server.  if we get 2 enters very quickly, then we don't want to ignore the second one just because we are focusing the first window.
2. there is a race if you check (focus_client != d->client) in the delay_focus_func, because the current focused window might change by the time this focus_client would take effect, so don't check that.
---
 openbox/event.c | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/openbox/event.c b/openbox/event.c
index e3214a7a..03229117 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -91,6 +91,7 @@ static void event_handle_dockapp(ObDockApp *app, XEvent *e);
 static void event_handle_client(ObClient *c, XEvent *e);
 static void event_handle_user_input(ObClient *client, XEvent *e);
 static gboolean is_enter_focus_event_ignored(XEvent *e);
+static void event_ignore_enter_range(gulong start, gulong end);
 
 static void focus_delay_dest(gpointer data);
 static gboolean focus_delay_cmp(gconstpointer d1, gconstpointer d2);
@@ -99,6 +100,8 @@ static void focus_delay_client_dest(ObClient *client, gpointer data);
 
 Time event_curtime = CurrentTime;
 Time event_last_user_time = CurrentTime;
+/*! The serial of the current X event */
+gulong event_curserial;
 
 static gboolean focus_left_screen = FALSE;
 /*! A list of ObSerialRanges which are to be ignored for mouse enter events */
@@ -243,6 +246,7 @@ static void event_set_curtime(XEvent *e)
         event_last_user_time = CurrentTime;
 
     event_curtime = t;
+    event_curserial = 0;
 }
 
 static void event_hack_mods(XEvent *e)
@@ -479,6 +483,7 @@ static void event_process(const XEvent *ec, gpointer data)
     }
 
     event_set_curtime(e);
+    event_curserial = e->xany.serial;
     event_hack_mods(e);
     if (event_ignore(e, client)) {
         if (ed)
@@ -1010,18 +1015,23 @@ static void event_handle_client(ObClient *client, XEvent *e)
                 is_enter_focus_event_ignored(e))
             {
                 ob_debug_type(OB_DEBUG_FOCUS,
-                              "%sNotify mode %d detail %d on %lx IGNORED\n",
+                              "%sNotify mode %d detail %d serial %lu on %lx "
+                              "IGNORED\n",
                               (e->type == EnterNotify ? "Enter" : "Leave"),
                               e->xcrossing.mode,
-                              e->xcrossing.detail, client?client->window:0);
+                              e->xcrossing.detail,
+                              e->xcrossing.serial,
+                              client?client->window:0);
             }
             else {
                 ob_debug_type(OB_DEBUG_FOCUS,
-                              "%sNotify mode %d detail %d on %lx, "
+                              "%sNotify mode %d detail %d serial %lu on %lx, "
                               "focusing window\n",
                               (e->type == EnterNotify ? "Enter" : "Leave"),
                               e->xcrossing.mode,
-                              e->xcrossing.detail, (client?client->window:0));
+                              e->xcrossing.detail,
+                              e->xcrossing.serial,
+                              (client?client->window:0));
                 if (config_focus_follow)
                     event_enter_client(client);
             }
@@ -1864,10 +1874,8 @@ static gboolean focus_delay_func(gpointer data)
     if (menu_frame_visible || moveresize_in_progress) return FALSE;
 
     event_curtime = d->time;
-    if (focus_client != d->client) {
-        if (client_focus(d->client) && config_focus_raise)
-            stacking_raise(CLIENT_AS_WINDOW(d->client));
-    }
+    if (client_focus(d->client) && config_focus_raise)
+        stacking_raise(CLIENT_AS_WINDOW(d->client));
     event_curtime = old;
     return FALSE; /* no repeat */
 }
@@ -1878,35 +1886,44 @@ static void focus_delay_client_dest(ObClient *client, gpointer data)
                                      client, FALSE);
 }
 
-void event_halt_focus_delay(void)
+void event_halt_focus_delay(gulong serial)
 {
-    /* ignore all enter events up till now */
-    event_end_ignore_all_enters(1);
+    /* ignore all enter events up till the event which caused this to occur */
+    if (event_curserial) event_ignore_enter_range(1, event_curserial);
     ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func);
 }
 
 gulong event_start_ignore_all_enters(void)
 {
+    /* increment the serial so we don't ignore events we weren't meant to */
     XSync(ob_display, FALSE);
     return LastKnownRequestProcessed(ob_display);
 }
 
-void event_end_ignore_all_enters(gulong start)
+static void event_ignore_enter_range(gulong start, gulong end)
 {
     ObSerialRange *r;
 
     g_assert(start != 0);
-    XSync(ob_display, FALSE);
+    g_assert(end != 0);
 
     r = g_new(ObSerialRange, 1);
     r->start = start;
-    r->end = LastKnownRequestProcessed(ob_display);
+    r->end = end;
     ignore_serials = g_slist_prepend(ignore_serials, r);
 
+    ob_debug_type(OB_DEBUG_FOCUS, "ignoring enters from %lu until %lu\n",
+                  r->start, r->end);
+
     /* increment the serial so we don't ignore events we weren't meant to */
     XSync(ob_display, FALSE);
 }
 
+void event_end_ignore_all_enters(gulong start)
+{
+    event_ignore_enter_range(start, LastKnownRequestProcessed(ob_display));
+}
+
 static gboolean is_enter_focus_event_ignored(XEvent *e)
 {
     GSList *it, *next;

From fb1d6d9e468f66c047c80b8f4bd66a9f270c624a Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 14:48:21 -0500
Subject: [PATCH 14/79] Bug 3359 - redundant pango flags

---
 render/obrender-3.0.pc.in | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/render/obrender-3.0.pc.in b/render/obrender-3.0.pc.in
index 68e54cb7..ebb17ef3 100644
--- a/render/obrender-3.0.pc.in
+++ b/render/obrender-3.0.pc.in
@@ -6,12 +6,9 @@ includedir=@includedir@
 xcflags=@X_CFLAGS@
 xlibs=@X_LIBS@
 
-pangocflags=@PANGO_CFLAGS@
-pangolibs=@PANGO_LIBS@
-
 Name: ObRender
 Description: Openbox Render Library
 Version: @VERSION@
 Requires: obparser-3.0 glib-2.0 xft pangoxft
-Libs: -L${libdir} -lobrender ${xlibs} ${pangolibs}
-Cflags: -I${includedir}/openbox/@OB_VERSION@ ${xcflags} ${pangocflags}
+Libs: -L${libdir} -lobrender ${xlibs}
+Cflags: -I${includedir}/openbox/@OB_VERSION@ ${xcflags}

From 1cb287e130ee662002baeec809c42498da38b878 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 15:01:03 -0500
Subject: [PATCH 15/79] focus the desktop window when you right click it, same
 as you focus other windows

---
 data/rc.xml            | 4 ++++
 doc/rc-mouse-focus.xml | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/data/rc.xml b/data/rc.xml
index 3859f537..e3a59eb2 100644
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -569,6 +569,10 @@
       <action name="Focus"/>
       <action name="Raise"/>
     </mousebind>
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
   </context>
 
   <context name="Root">
diff --git a/doc/rc-mouse-focus.xml b/doc/rc-mouse-focus.xml
index a8a888be..0e71c03c 100644
--- a/doc/rc-mouse-focus.xml
+++ b/doc/rc-mouse-focus.xml
@@ -516,6 +516,9 @@
     <mousebind button="Left" action="Press">
       <action name="Focus"/>
     </mousebind>
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+    </mousebind>
   </context>
 
   <context name="Root">

From 1789d4564514c4cefe3d2e9d2b7b65119784b53c Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 15:18:04 -0500
Subject: [PATCH 16/79] fix a warning from crappy libc apis

---
 openbox/openbox.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 6f47fbd0..ff226af4 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -512,7 +512,9 @@ static void remove_args(gint *argc, gchar **argv, gint index, gint num)
 static void parse_env()
 {
     /* unset this so we don't pass it on unknowingly */
-    putenv("DESKTOP_STARTUP_ID");
+    gchar *s = g_strdup("DESKTOP_STARTUP_ID");
+    putenv(s);
+    g_free(s);
 }
 
 static void parse_args(gint *argc, gchar **argv)

From abc67cbdc1c1e61e074f8f312eaecb357cd0aa5c Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 15:28:26 -0500
Subject: [PATCH 17/79] make it possible to temporarily raise a window to the
 top, and restore it.  also fix the return val for window_layer.

---
 openbox/actions/lower.c |  1 +
 openbox/actions/raise.c |  1 +
 openbox/client.h        |  1 +
 openbox/stacking.c      | 36 ++++++++++++++++++++++++++++++++++++
 openbox/stacking.h      | 21 ++++++++++++++-------
 openbox/window.c        |  2 +-
 openbox/window.h        |  4 +++-
 7 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/openbox/actions/lower.c b/openbox/actions/lower.c
index 3a214ea7..d34e933b 100644
--- a/openbox/actions/lower.c
+++ b/openbox/actions/lower.c
@@ -1,5 +1,6 @@
 #include "openbox/actions.h"
 #include "openbox/stacking.h"
+#include "openbox/window.h"
 
 static gboolean run_func(ObActionsData *data, gpointer options);
 
diff --git a/openbox/actions/raise.c b/openbox/actions/raise.c
index 5dfe281a..6837bce2 100644
--- a/openbox/actions/raise.c
+++ b/openbox/actions/raise.c
@@ -1,5 +1,6 @@
 #include "openbox/actions.h"
 #include "openbox/stacking.h"
+#include "openbox/window.h"
 
 static gboolean run_func(ObActionsData *data, gpointer options);
 
diff --git a/openbox/client.h b/openbox/client.h
index b4b165f8..e83a6b7a 100644
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -24,6 +24,7 @@
 #include "mwm.h"
 #include "geom.h"
 #include "stacking.h"
+#include "window.h"
 #include "render/color.h"
 
 #include <glib.h>
diff --git a/openbox/stacking.c b/openbox/stacking.c
index b23e6eac..bb8975d4 100644
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -105,6 +105,42 @@ static void do_restack(GList *wins, GList *before)
     stacking_set_list();
 }
 
+void stacking_temp_raise(ObWindow *window)
+{
+    Window win[2];
+    GList *it;
+
+    /* don't use this for internal windows..! it would lower them.. */
+    g_assert(window_layer(window) < OB_STACKING_LAYER_INTERNAL);
+
+    /* find the window to drop it underneath */
+    win[0] = screen_support_win;
+    for (it = stacking_list; it; it = g_list_next(it)) {
+        ObWindow *w = it->data;
+        if (window_layer(w) >= OB_STACKING_LAYER_INTERNAL)
+            win[0] = window_top(w);
+        else
+            break;
+    }
+
+    win[1] = window_top(window);
+    XRestackWindows(ob_display, win, 2);
+}
+
+void stacking_restore()
+{
+    Window *win;
+    GList *it;
+    gint i;
+
+    win = g_new(Window, g_list_length(stacking_list) + 1);
+    win[0] = screen_support_win;
+    for (i = 1, it = stacking_list; it; ++i, it = g_list_next(it))
+        win[i] = window_top(it->data);
+    XRestackWindows(ob_display, win, i);
+    g_free(win);
+}
+
 static void do_raise(GList *wins)
 {
     GList *it;
diff --git a/openbox/stacking.h b/openbox/stacking.h
index ac9c8239..e226f36f 100644
--- a/openbox/stacking.h
+++ b/openbox/stacking.h
@@ -20,11 +20,12 @@
 #ifndef __stacking_h
 #define __stacking_h
 
-#include "window.h"
-
 #include <glib.h>
 #include <X11/Xlib.h>
 
+struct _ObWindow;
+struct _ObClient;
+
 /*! The possible stacking layers a client window can be a part of */
 typedef enum {
     OB_STACKING_LAYER_INVALID,
@@ -44,21 +45,27 @@ extern GList *stacking_list;
   stacking_list */
 void stacking_set_list();
 
-void stacking_add(ObWindow *win);
-void stacking_add_nonintrusive(ObWindow *win);
+void stacking_add(struct _ObWindow *win);
+void stacking_add_nonintrusive(struct _ObWindow *win);
 #define stacking_remove(win) stacking_list = g_list_remove(stacking_list, win);
 
 /*! Raises a window above all others in its stacking layer */
-void stacking_raise(ObWindow *window);
+void stacking_raise(struct _ObWindow *window);
+
+/*! Temporarily raises a window above all others */
+void stacking_temp_raise(struct _ObWindow *window);
+
+/*! Restores any temporarily raised windows to their correct place */
+void stacking_restore();
 
 /*! Lowers a window below all others in its stacking layer */
-void stacking_lower(ObWindow *window);
+void stacking_lower(struct _ObWindow *window);
 
 /*! Moves a window below another if its in the same layer.
   This function does not enforce stacking rules IRT transients n such, and so
   it should really ONLY be used to restore stacking orders from saved sessions
 */
-void stacking_below(ObWindow *window, ObWindow *below);
+void stacking_below(struct _ObWindow *window, struct _ObWindow *below);
 
 /*! Restack a window based upon a sibling (or all windows) in various ways.
   @param client The client to be restacked
diff --git a/openbox/window.c b/openbox/window.c
index 19b39c09..c5e6a4ea 100644
--- a/openbox/window.c
+++ b/openbox/window.c
@@ -63,7 +63,7 @@ Window window_top(ObWindow *self)
     return None;
 }
 
-Window window_layer(ObWindow *self)
+ObStackingLayer window_layer(ObWindow *self)
 {
     switch (self->type) {
     case Window_Menu:
diff --git a/openbox/window.h b/openbox/window.h
index ef29edd7..aaf83995 100644
--- a/openbox/window.h
+++ b/openbox/window.h
@@ -19,6 +19,8 @@
 #ifndef __window_h
 #define __window_h
 
+#include "stacking.h"
+
 #include <X11/Xlib.h>
 #include <glib.h>
 
@@ -74,6 +76,6 @@ void window_startup(gboolean reconfig);
 void window_shutdown(gboolean reconfig);
 
 Window window_top(ObWindow *self);
-Window window_layer(ObWindow *self);
+ObStackingLayer window_layer(ObWindow *self);
 
 #endif

From 746015e88c51dda43b26f35abc25050c502d319b Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 15:36:31 -0500
Subject: [PATCH 18/79] make backport closer to 3.4-working for merging
 purposes

---
 openbox/actions/cyclewindows.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c
index 965ac993..285df370 100644
--- a/openbox/actions/cyclewindows.c
+++ b/openbox/actions/cyclewindows.c
@@ -178,8 +178,7 @@ static void end_cycle(gboolean cancel, guint state, Options *o)
                      TRUE, cancel);
     cycling = FALSE;
 
-    if (ft) {
+    if (ft)
         actions_run_acts(o->actions, OB_USER_ACTION_KEYBOARD_KEY,
                          state, -1, -1, 0, OB_FRAME_CONTEXT_NONE, ft);
-    }
 }

From ea371936cec5f1e7f0eaed698b2cff6fab42f210 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 16:11:51 -0500
Subject: [PATCH 19/79] let you raise the focus target temporarily during focus
 cycling, with the <raise> option.  also a new <bar> option lets you turn off
 the indicator bar

---
 openbox/actions/cyclewindows.c       | 33 +++++++++++++++++++++-------
 openbox/actions/directionalwindows.c | 33 +++++++++++++++++++++-------
 openbox/focus_cycle.c                | 13 ++++++-----
 openbox/focus_cycle.h                |  4 +++-
 openbox/focus_cycle_indicator.c      | 12 ++++++++--
 5 files changed, 70 insertions(+), 25 deletions(-)

diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c
index 285df370..059db93f 100644
--- a/openbox/actions/cyclewindows.c
+++ b/openbox/actions/cyclewindows.c
@@ -1,4 +1,6 @@
 #include "openbox/actions.h"
+#include "openbox/stacking.h"
+#include "openbox/window.h"
 #include "openbox/event.h"
 #include "openbox/focus_cycle.h"
 #include "openbox/openbox.h"
@@ -11,6 +13,8 @@ typedef struct {
     gboolean desktop_windows;
     gboolean all_desktops;
     gboolean forward;
+    gboolean bar;
+    gboolean raise;
     GSList *actions;
 } Options;
 
@@ -46,11 +50,16 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
 
     o = g_new0(Options, 1);
     o->dialog = TRUE;
+    o->bar = TRUE;
 
     if ((n = parse_find_node("linear", node)))
         o->linear = parse_bool(doc, n);
     if ((n = parse_find_node("dialog", node)))
         o->dialog = parse_bool(doc, n);
+    if ((n = parse_find_node("bar", node)))
+        o->bar = parse_bool(doc, n);
+    if ((n = parse_find_node("raise", node)))
+        o->raise = parse_bool(doc, n);
     if ((n = parse_find_node("panels", node)))
         o->dock_windows = parse_bool(doc, n);
     if ((n = parse_find_node("desktop", node)))
@@ -111,17 +120,22 @@ static void free_func(gpointer options)
 static gboolean run_func(ObActionsData *data, gpointer options)
 {
     Options *o = options;
+    struct _ObClient *ft;
 
-    focus_cycle(o->forward,
-                o->all_desktops,
-                o->dock_windows,
-                o->desktop_windows,
-                o->linear,
-                TRUE,
-                o->dialog,
-                FALSE, FALSE);
+    ft = focus_cycle(o->forward,
+                     o->all_desktops,
+                     o->dock_windows,
+                     o->desktop_windows,
+                     o->linear,
+                     TRUE,
+                     o->bar,
+                     o->dialog,
+                     FALSE, FALSE);
     cycling = TRUE;
 
+    stacking_restore();
+    if (o->raise) stacking_temp_raise(CLIENT_AS_WINDOW(ft));
+
     return TRUE;
 }
 
@@ -174,6 +188,7 @@ static void end_cycle(gboolean cancel, guint state, Options *o)
                      o->desktop_windows,
                      o->linear,
                      TRUE,
+                     o->bar,
                      o->dialog,
                      TRUE, cancel);
     cycling = FALSE;
@@ -181,4 +196,6 @@ static void end_cycle(gboolean cancel, guint state, Options *o)
     if (ft)
         actions_run_acts(o->actions, OB_USER_ACTION_KEYBOARD_KEY,
                          state, -1, -1, 0, OB_FRAME_CONTEXT_NONE, ft);
+
+    stacking_restore();
 }
diff --git a/openbox/actions/directionalwindows.c b/openbox/actions/directionalwindows.c
index 707659eb..c575d84e 100644
--- a/openbox/actions/directionalwindows.c
+++ b/openbox/actions/directionalwindows.c
@@ -1,5 +1,7 @@
 #include "openbox/actions.h"
 #include "openbox/event.h"
+#include "openbox/stacking.h"
+#include "openbox/window.h"
 #include "openbox/focus_cycle.h"
 #include "openbox/openbox.h"
 #include "openbox/misc.h"
@@ -11,6 +13,8 @@ typedef struct {
     gboolean dock_windows;
     gboolean desktop_windows;
     ObDirection direction;
+    gboolean bar;
+    gboolean raise;
     GSList *actions;
 } Options;
 
@@ -46,9 +50,14 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
 
     o = g_new0(Options, 1);
     o->dialog = TRUE;
+    o->bar = TRUE;
 
     if ((n = parse_find_node("dialog", node)))
         o->dialog = parse_bool(doc, n);
+    if ((n = parse_find_node("bar", node)))
+        o->bar = parse_bool(doc, n);
+    if ((n = parse_find_node("raise", node)))
+        o->raise = parse_bool(doc, n);
     if ((n = parse_find_node("panels", node)))
         o->dock_windows = parse_bool(doc, n);
     if ((n = parse_find_node("desktop", node)))
@@ -135,13 +144,19 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     if (!o->interactive)
         end_cycle(FALSE, data->state, o);
     else {
-        focus_directional_cycle(o->direction,
-                                o->dock_windows,
-                                o->desktop_windows,
-                                TRUE,
-                                o->dialog,
-                                FALSE, FALSE);
+        struct _ObClient *ft;
+
+        ft = focus_directional_cycle(o->direction,
+                                     o->dock_windows,
+                                     o->desktop_windows,
+                                     TRUE,
+                                     o->bar,
+                                     o->dialog,
+                                     FALSE, FALSE);
         cycling = TRUE;
+
+        stacking_restore();
+        if (o->raise) stacking_temp_raise(CLIENT_AS_WINDOW(ft));
     }
 
     return o->interactive;
@@ -194,12 +209,14 @@ static void end_cycle(gboolean cancel, guint state, Options *o)
                                  o->dock_windows,
                                  o->desktop_windows,
                                  o->interactive,
+                                 o->bar,
                                  o->dialog,
                                  TRUE, cancel);
     cycling = FALSE;
 
-    if (ft) {
+    if (ft)
         actions_run_acts(o->actions, OB_USER_ACTION_KEYBOARD_KEY,
                          state, -1, -1, 0, OB_FRAME_CONTEXT_NONE, ft);
-    }
+
+    stacking_restore();
 }
diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c
index 85cdf480..2348f8d0 100644
--- a/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@ -62,15 +62,16 @@ void focus_cycle_stop(ObClient *ifclient)
                            focus_cycle_dock_windows,
                            focus_cycle_desktop_windows))
     {
-        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
-        focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
+        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,TRUE);
+        focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
     }
 }
 
 ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
                       gboolean dock_windows, gboolean desktop_windows,
                       gboolean linear, gboolean interactive,
-                      gboolean dialog, gboolean done, gboolean cancel)
+                      gboolean showbar, gboolean dialog,
+                      gboolean done, gboolean cancel)
 {
     static ObClient *t = NULL;
     static GList *order = NULL;
@@ -128,7 +129,7 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
             if (interactive) {
                 if (ft != focus_cycle_target) { /* prevents flicker */
                     focus_cycle_target = ft;
-                    focus_cycle_draw_indicator(ft);
+                    focus_cycle_draw_indicator(showbar ? ft : NULL);
                 }
                 if (dialog)
                     /* same arguments as focus_target_valid */
@@ -261,7 +262,7 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir,
 ObClient* focus_directional_cycle(ObDirection dir, gboolean dock_windows,
                                   gboolean desktop_windows,
                                   gboolean interactive,
-                                  gboolean dialog,
+                                  gboolean showbar, gboolean dialog,
                                   gboolean done, gboolean cancel)
 {
     static ObClient *first = NULL;
@@ -307,7 +308,7 @@ ObClient* focus_directional_cycle(ObDirection dir, gboolean dock_windows,
         focus_cycle_target = ft;
         if (!interactive)
             goto done_cycle;
-        focus_cycle_draw_indicator(ft);
+        focus_cycle_draw_indicator(showbar ? ft : NULL);
     }
     if (focus_cycle_target && dialog)
         /* same arguments as focus_target_valid */
diff --git a/openbox/focus_cycle.h b/openbox/focus_cycle.h
index 68b8d929..6e1c2c9d 100644
--- a/openbox/focus_cycle.h
+++ b/openbox/focus_cycle.h
@@ -37,11 +37,13 @@ void focus_cycle_shutdown(gboolean reconfig);
 struct _ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
                               gboolean dock_windows, gboolean desktop_windows,
                               gboolean linear, gboolean interactive,
-                              gboolean dialog, gboolean done, gboolean cancel);
+                              gboolean showbar, gboolean dialog,
+                              gboolean done, gboolean cancel);
 struct _ObClient* focus_directional_cycle(ObDirection dir,
                                           gboolean dock_windows,
                                           gboolean desktop_windows,
                                           gboolean interactive,
+                                          gboolean showbar,
                                           gboolean dialog,
                                           gboolean done, gboolean cancel);
 
diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c
index 79071314..5a6a1029 100644
--- a/openbox/focus_cycle_indicator.c
+++ b/openbox/focus_cycle_indicator.c
@@ -39,6 +39,7 @@ struct
 
 static RrAppearance *a_focus_indicator;
 static RrColor      *color_white;
+static gboolean      visible;
 
 static Window create_window(Window parent, gulong mask,
                             XSetWindowAttributes *attrib)
@@ -53,6 +54,8 @@ void focus_cycle_indicator_startup(gboolean reconfig)
 {
     XSetWindowAttributes attr;
 
+    visible = FALSE;
+
     if (reconfig) return;
 
     focus_indicator.top.obwin.type = Window_Internal;
@@ -118,7 +121,7 @@ void focus_cycle_indicator_shutdown(gboolean reconfig)
 
 void focus_cycle_draw_indicator(ObClient *c)
 {
-    if (!c) {
+    if (!c && visible) {
         gulong ignore_start;
 
         /* kill enter events cause by this unmapping */
@@ -130,7 +133,10 @@ void focus_cycle_draw_indicator(ObClient *c)
         XUnmapWindow(ob_display, focus_indicator.bottom.win);
 
         event_end_ignore_all_enters(ignore_start);
-    } else {
+
+        visible = FALSE;
+    }
+    else if (c) {
         /*
           if (c)
               frame_adjust_focus(c->frame, FALSE);
@@ -249,5 +255,7 @@ void focus_cycle_draw_indicator(ObClient *c)
         XMapWindow(ob_display, focus_indicator.left.win);
         XMapWindow(ob_display, focus_indicator.right.win);
         XMapWindow(ob_display, focus_indicator.bottom.win);
+
+        visible = TRUE;
     }
 }

From 22c102572e892dc36b1c411edbd70415efe1f0e6 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 16:26:16 -0500
Subject: [PATCH 20/79] fix a crash when reconfiguring during focus cycling

---
 openbox/focus_cycle_popup.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 488ecce1..028fa45d 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -146,6 +146,7 @@ void focus_cycle_popup_shutdown(gboolean reconfig)
     }
 
     g_free(popup.hilite_rgba);
+    popup.hilite_rgba = NULL;
 
     XDestroyWindow(ob_display, popup.text);
     XDestroyWindow(ob_display, popup.bg);

From e61f58462fe0cdd85090b621c6906b2885990071 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 16:29:11 -0500
Subject: [PATCH 21/79] freeze onscreen stacking order changes while a temp
 raise for focus cycling is occuring

---
 openbox/stacking.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/openbox/stacking.c b/openbox/stacking.c
index bb8975d4..34ab0588 100644
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -28,6 +28,10 @@
 #include "debug.h"
 
 GList  *stacking_list = NULL;
+/*! When true, stacking changes will not be reflected on the screen.  This is
+  to freeze the on-screen stacking order while a window is being temporarily
+  raised during focus cycling */
+gboolean pause_changes = FALSE;
 
 void stacking_set_list(void)
 {
@@ -99,7 +103,8 @@ static void do_restack(GList *wins, GList *before)
     }
 #endif
 
-    XRestackWindows(ob_display, win, i);
+    if (!pause_changes)
+        XRestackWindows(ob_display, win, i);
     g_free(win);
 
     stacking_set_list();
@@ -125,6 +130,8 @@ void stacking_temp_raise(ObWindow *window)
 
     win[1] = window_top(window);
     XRestackWindows(ob_display, win, 2);
+
+    pause_changes = TRUE;
 }
 
 void stacking_restore()
@@ -139,6 +146,8 @@ void stacking_restore()
         win[i] = window_top(it->data);
     XRestackWindows(ob_display, win, i);
     g_free(win);
+
+    pause_changes = FALSE;
 }
 
 static void do_raise(GList *wins)

From b3764dd433f8e8511bf3045e4ea5e0e5df6b2a70 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@comhem.se>
Date: Sat, 5 Jan 2008 12:40:46 +0100
Subject: [PATCH 22/79] Don't record desktops for lastdesktop when switching
 away quickly again.

When switching desktops, only record the previous desktop as the last
desktop if the user stayed there for a while. This way you can scroll
over a couple desktops quickly, then go back to the previous desktop
you _used_, not the last you scrolled past.
---
 openbox/screen.c | 50 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 5 deletions(-)

diff --git a/openbox/screen.c b/openbox/screen.c
index a8da15c0..e81b9590 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -59,7 +59,9 @@ static void     screen_fallback_focus(void);
 guint    screen_num_desktops;
 guint    screen_num_monitors;
 guint    screen_desktop;
-guint    screen_last_desktop;
+guint    screen_last_desktop = 1;
+guint    screen_old_desktop;
+gboolean screen_desktop_timeout = TRUE;
 Size     screen_physical_size;
 gboolean screen_showing_desktop;
 ObDesktopLayout screen_desktop_layout;
@@ -577,23 +579,61 @@ static void screen_fallback_focus(void)
     }
 }
 
+static gboolean last_desktop_func(gpointer data)
+{
+    screen_desktop_timeout = TRUE;
+    return FALSE;
+}
+
 void screen_set_desktop(guint num, gboolean dofocus)
 {
     GList *it;
-    guint old;
+    guint previous;
     gulong ignore_start;
 
     g_assert(num < screen_num_desktops);
 
-    old = screen_desktop;
+    previous = screen_desktop;
     screen_desktop = num;
 
-    if (old == num) return;
+    if (previous == num) return;
 
     PROP_SET32(RootWindow(ob_display, ob_screen),
                net_current_desktop, cardinal, num);
 
-    screen_last_desktop = old;
+    if (screen_desktop_timeout) {
+        if (screen_desktop == screen_last_desktop) {
+            screen_last_desktop = previous;
+            screen_old_desktop = screen_desktop;
+        } else {
+            screen_old_desktop = screen_last_desktop;
+            screen_last_desktop = previous;
+        }
+    } else {
+        if (screen_desktop == screen_last_desktop) {
+            if (previous == screen_old_desktop) {
+                screen_last_desktop = screen_old_desktop;
+            } else if (screen_last_desktop == screen_old_desktop) {
+                screen_last_desktop = previous;
+            } else {
+                screen_last_desktop = screen_old_desktop;
+            }
+        } else {
+            if (screen_desktop == screen_old_desktop) {
+                /* do nothing */
+            } else if (previous == screen_old_desktop) {
+                /* do nothing */
+            } else if (screen_last_desktop == screen_old_desktop) {
+                screen_last_desktop = previous;
+            } else {
+                /* do nothing */
+            }
+        }
+    }
+    screen_desktop_timeout = FALSE;
+    ob_main_loop_timeout_remove(ob_main_loop, last_desktop_func);
+    ob_main_loop_timeout_add(ob_main_loop, 500000, last_desktop_func,
+            NULL, NULL, NULL);
 
     ob_debug("Moving to desktop %d\n", num+1);
 

From 8a2adbb0585dfc150c4809327a2c41265174b533 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 16:49:55 -0500
Subject: [PATCH 23/79] make the time to remember last desktop a #define, and
 make it 750ms

---
 openbox/screen.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/openbox/screen.c b/openbox/screen.c
index e81b9590..5e0f67d4 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -79,6 +79,10 @@ static GSList *struts_bottom = NULL;
 
 static ObPagerPopup *desktop_popup;
 
+/*! The number of microseconds that you need to be on a desktop before it will
+  replace the remembered "last desktop" */
+#define REMEMBER_LAST_DESKTOP_TIME 750000
+
 static gboolean replace_wm(void)
 {
     gchar *wm_sn;
@@ -632,8 +636,8 @@ void screen_set_desktop(guint num, gboolean dofocus)
     }
     screen_desktop_timeout = FALSE;
     ob_main_loop_timeout_remove(ob_main_loop, last_desktop_func);
-    ob_main_loop_timeout_add(ob_main_loop, 500000, last_desktop_func,
-            NULL, NULL, NULL);
+    ob_main_loop_timeout_add(ob_main_loop, REMEMBER_LAST_DESKTOP_TIME,
+                             last_desktop_func, NULL, NULL, NULL);
 
     ob_debug("Moving to desktop %d\n", num+1);
 

From 6133bbd5f732622d8d5650d262413429c38af842 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 17:24:13 -0500
Subject: [PATCH 24/79] try to comment the code for when to save the "last
 desktop"

---
 openbox/screen.c | 69 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 20 deletions(-)

diff --git a/openbox/screen.c b/openbox/screen.c
index 5e0f67d4..379a12d8 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -605,32 +605,61 @@ void screen_set_desktop(guint num, gboolean dofocus)
     PROP_SET32(RootWindow(ob_display, ob_screen),
                net_current_desktop, cardinal, num);
 
+    /* This whole thing decides when/how to save the screen_last_desktop so
+       that it can be restored later if you want */
     if (screen_desktop_timeout) {
+        /* If screen_desktop_timeout is true, then we've been on this desktop
+           long enough and we can save it as the last desktop. */
+
+        /* save the "last desktop" as the "old desktop" */
+        screen_old_desktop = screen_last_desktop;
+        /* save the desktop we're coming from as the "last desktop" */
+        screen_last_desktop = previous;
+    }
+    else {
+        /* If screen_desktop_timeout is false, then we just got to this desktop
+           and we are moving away again. */
+
         if (screen_desktop == screen_last_desktop) {
-            screen_last_desktop = previous;
-            screen_old_desktop = screen_desktop;
-        } else {
-            screen_old_desktop = screen_last_desktop;
-            screen_last_desktop = previous;
-        }
-    } else {
-        if (screen_desktop == screen_last_desktop) {
+            /* If we are moving to the "last desktop" .. */
             if (previous == screen_old_desktop) {
-                screen_last_desktop = screen_old_desktop;
-            } else if (screen_last_desktop == screen_old_desktop) {
-                screen_last_desktop = previous;
-            } else {
+                /* .. from the "old desktop", change the last desktop to
+                   be where we are coming from */
                 screen_last_desktop = screen_old_desktop;
             }
-        } else {
-            if (screen_desktop == screen_old_desktop) {
-                /* do nothing */
-            } else if (previous == screen_old_desktop) {
-                /* do nothing */
-            } else if (screen_last_desktop == screen_old_desktop) {
+            else if (screen_last_desktop == screen_old_desktop) {
+                /* .. and also to the "old desktop", change the "last
+                   desktop" to be where we are coming from */
                 screen_last_desktop = previous;
-            } else {
-                /* do nothing */
+            }
+            else {
+                /* .. from some other desktop, then set the "last desktop" to
+                   be the saved "old desktop", i.e. where we were before the
+                   "last desktop" */
+                screen_last_desktop = screen_old_desktop;
+            }
+        }
+        else {
+            /* If we are moving to any desktop besides the "last desktop"..
+               (this is the normal case) */
+            if (screen_desktop == screen_old_desktop) {
+                /* If moving to the "old desktop", which is not the
+                   "last desktop", don't save anything */
+            }
+            else if (previous == screen_old_desktop) {
+                /* If moving from the "old desktop", and not to the
+                   "last desktop", don't save anything */
+            }
+            else if (screen_last_desktop == screen_old_desktop) {
+                /* If the "last desktop" is the same as "old desktop" and
+                   you're not moving to the "last desktop" then save where
+                   we're coming from as the "last desktop" */
+                screen_last_desktop = previous;
+            }
+            else {
+                /* If the "last desktop" is different from the "old desktop"
+                   and you're not moving to the "last desktop", then don't save
+                   anything */
             }
         }
     }

From 2b80e4e8ef56bb4fba614139601e750344418e5b Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 18:13:12 -0500
Subject: [PATCH 25/79] ignore mouse clicks on override-redirect windows that
 aren't owned by openbox

---
 openbox/event.c             | 48 +++++++++++++++++++++++++++++++++----
 openbox/focus_cycle_popup.c |  2 ++
 openbox/popup.c             |  2 ++
 openbox/window.h            |  3 ++-
 4 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/openbox/event.c b/openbox/event.c
index 03229117..cd562599 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -694,12 +694,50 @@ static void event_process(const XEvent *ec, gpointer data)
     }
 #endif
 
-    if (e->type == ButtonPress || e->type == ButtonRelease ||
-        e->type == MotionNotify || e->type == KeyPress ||
-        e->type == KeyRelease)
-    {
-        event_handle_user_input(client, e);
+    if (e->type == ButtonPress || e->type == ButtonRelease) {
+        /* If the button press was on some non-root window, or was physically
+           on the root window, the process it */
+        if (window != RootWindow(ob_display, ob_screen) ||
+            e->xbutton.subwindow == None)
+        {
+            event_handle_user_input(client, e);
+        }
+        /* Otherwise only process it if it was physically on an openbox
+           internal window */
+        else {
+            Window target, parent, root, *children;
+            unsigned int nchildren;
+            ObWindow *w;
+
+            /* Find the top level ancestor of the subwindow, besides the
+               root */
+            target = e->xbutton.subwindow;
+            ob_debug("subwindow 0x%x\n", target);
+            while (XQueryTree(ob_display, target, &root, &parent, &children,
+                              &nchildren) != 0)
+            {
+                XFree(children);
+                if (parent == root) {
+                    ob_debug("parent is root\n");
+                    break;
+                }
+                target = parent;
+            }
+            ob_debug("toplevel 0x%x\n", target);
+
+            w = g_hash_table_lookup(window_map, &target);
+            ob_debug("w 0x%x\n", w);
+                
+            if ((w = g_hash_table_lookup(window_map, &target)) &&
+                WINDOW_IS_INTERNAL(w))
+            {
+                event_handle_user_input(client, e);
+            }
+        }
     }
+    else if (e->type == KeyPress || e->type == KeyRelease ||
+             e->type == MotionNotify)
+        event_handle_user_input(client, e);
 
     /* if something happens and it's not from an XEvent, then we don't know
        the time */
diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 028fa45d..9a6f2420 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -128,12 +128,14 @@ void focus_cycle_popup_startup(gboolean reconfig)
     XMapWindow(ob_display, popup.text);
 
     stacking_add(INTERNAL_AS_WINDOW(&popup));
+    g_hash_table_insert(window_map, &popup.bg, &popup);
 }
 
 void focus_cycle_popup_shutdown(gboolean reconfig)
 {
     icon_popup_free(single_popup);
 
+    g_hash_table_remove(window_map, &popup.bg);
     stacking_remove(INTERNAL_AS_WINDOW(&popup));
 
     while(popup.targets) {
diff --git a/openbox/popup.c b/openbox/popup.c
index 071f5b62..283348e7 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -58,6 +58,7 @@ ObPopup *popup_new(void)
     XMapWindow(ob_display, self->text);
 
     stacking_add(INTERNAL_AS_WINDOW(self));
+    g_hash_table_insert(window_map, &self->bg, self);
     return self;
 }
 
@@ -68,6 +69,7 @@ void popup_free(ObPopup *self)
         XDestroyWindow(ob_display, self->text);
         RrAppearanceFree(self->a_bg);
         RrAppearanceFree(self->a_text);
+        g_hash_table_remove(window_map, &self->bg);
         stacking_remove(self);
         g_free(self);
     }
diff --git a/openbox/window.h b/openbox/window.h
index aaf83995..a172cfce 100644
--- a/openbox/window.h
+++ b/openbox/window.h
@@ -32,7 +32,8 @@ typedef enum {
     Window_Dock,
     Window_DockApp, /* used for events but not stacking */
     Window_Client,
-    Window_Internal /* used for stacking but not events */
+    Window_Internal /* used for stacking but not events (except to filter
+                       events on the root window) */
 } Window_InternalType;
 
 struct _ObWindow

From bf259be653b9c37c79f9cd8ababffe225857ce9f Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 18:28:35 -0500
Subject: [PATCH 26/79] fixes from commit
 0ce14a727968736e57fb3fabba3794b46903875f the xsync was needed to get the
 right serial for the end of the ignore range

---
 openbox/event.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/openbox/event.c b/openbox/event.c
index cd562599..cc3ea68f 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -74,6 +74,7 @@ typedef struct
 {
     ObClient *client;
     Time time;
+    gulong serial;
 } ObFocusDelayData;
 
 typedef struct
@@ -246,7 +247,6 @@ static void event_set_curtime(XEvent *e)
         event_last_user_time = CurrentTime;
 
     event_curtime = t;
-    event_curserial = 0;
 }
 
 static void event_hack_mods(XEvent *e)
@@ -742,6 +742,7 @@ static void event_process(const XEvent *ec, gpointer data)
     /* if something happens and it's not from an XEvent, then we don't know
        the time */
     event_curtime = CurrentTime;
+    event_curserial = 0;
 }
 
 static void event_handle_root(XEvent *e)
@@ -816,6 +817,7 @@ void event_enter_client(ObClient *client)
             data = g_new(ObFocusDelayData, 1);
             data->client = client;
             data->time = event_curtime;
+            data->serial = event_curserial;
 
             ob_main_loop_timeout_add(ob_main_loop,
                                      config_focus_delay * 1000,
@@ -825,6 +827,7 @@ void event_enter_client(ObClient *client)
             ObFocusDelayData data;
             data.client = client;
             data.time = event_curtime;
+            data.serial = event_curserial;
             focus_delay_func(&data);
         }
     }
@@ -1912,6 +1915,7 @@ static gboolean focus_delay_func(gpointer data)
     if (menu_frame_visible || moveresize_in_progress) return FALSE;
 
     event_curtime = d->time;
+    event_curserial = d->serial;
     if (client_focus(d->client) && config_focus_raise)
         stacking_raise(CLIENT_AS_WINDOW(d->client));
     event_curtime = old;
@@ -1924,7 +1928,7 @@ static void focus_delay_client_dest(ObClient *client, gpointer data)
                                      client, FALSE);
 }
 
-void event_halt_focus_delay(gulong serial)
+void event_halt_focus_delay()
 {
     /* ignore all enter events up till the event which caused this to occur */
     if (event_curserial) event_ignore_enter_range(1, event_curserial);
@@ -1933,7 +1937,6 @@ void event_halt_focus_delay(gulong serial)
 
 gulong event_start_ignore_all_enters(void)
 {
-    /* increment the serial so we don't ignore events we weren't meant to */
     XSync(ob_display, FALSE);
     return LastKnownRequestProcessed(ob_display);
 }
@@ -1959,6 +1962,7 @@ static void event_ignore_enter_range(gulong start, gulong end)
 
 void event_end_ignore_all_enters(gulong start)
 {
+    XSync(ob_display, FALSE);
     event_ignore_enter_range(start, LastKnownRequestProcessed(ob_display));
 }
 

From 78cd9bba523f4986413e3aefe87704e9d11cd081 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 18:33:43 -0500
Subject: [PATCH 27/79] continue commit
 2b80e4e8ef56bb4fba614139601e750344418e5b - remove debug code, and some
 unneeded stuff

---
 openbox/event.c | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/openbox/event.c b/openbox/event.c
index cc3ea68f..d2cb7567 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -705,30 +705,9 @@ static void event_process(const XEvent *ec, gpointer data)
         /* Otherwise only process it if it was physically on an openbox
            internal window */
         else {
-            Window target, parent, root, *children;
-            unsigned int nchildren;
             ObWindow *w;
 
-            /* Find the top level ancestor of the subwindow, besides the
-               root */
-            target = e->xbutton.subwindow;
-            ob_debug("subwindow 0x%x\n", target);
-            while (XQueryTree(ob_display, target, &root, &parent, &children,
-                              &nchildren) != 0)
-            {
-                XFree(children);
-                if (parent == root) {
-                    ob_debug("parent is root\n");
-                    break;
-                }
-                target = parent;
-            }
-            ob_debug("toplevel 0x%x\n", target);
-
-            w = g_hash_table_lookup(window_map, &target);
-            ob_debug("w 0x%x\n", w);
-                
-            if ((w = g_hash_table_lookup(window_map, &target)) &&
+            if ((w = g_hash_table_lookup(window_map, &e->xbutton.subwindow)) &&
                 WINDOW_IS_INTERNAL(w))
             {
                 event_handle_user_input(client, e);

From 040d344a89f40487de8a1920e0aaeccd93a6a995 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 18:57:32 -0500
Subject: [PATCH 28/79] don't take KeyRelease events for menus until they
 receive a KeyPress event first.  avoid using the key binding used to show the
 menu to execute something inside it.

---
 openbox/event.c     | 4 +++-
 openbox/menuframe.h | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/openbox/event.c b/openbox/event.c
index d2cb7567..6b0ecdd7 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1671,6 +1671,8 @@ static gboolean event_handle_menu_keyboard(XEvent *ev)
 
     /* Allow control while going thru the menu */
     else if (ev->type == KeyPress && (state & ~ControlMask) == 0) {
+        frame->got_press = TRUE;
+
         if (keycode == ob_keycode(OB_KEY_ESCAPE)) {
             menu_frame_hide_all();
             ret = TRUE;
@@ -1704,7 +1706,7 @@ static gboolean event_handle_menu_keyboard(XEvent *ev)
 
        Allow ControlMask only, and don't bother if the menu is empty */
     else if (ev->type == KeyRelease && (state & ~ControlMask) == 0 &&
-             frame->entries)
+             frame->entries && frame->got_press)
     {
         if (keycode == ob_keycode(OB_KEY_RETURN)) {
             /* Enter runs the active item or goes into the submenu.
diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index 191bcfe8..06975972 100644
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -73,6 +73,11 @@ struct _ObMenuFrame
 
     RrAppearance *a_title;
     RrAppearance *a_items;
+
+    gboolean got_press; /* don't allow a KeyRelease event to run things in the
+                           menu until it has seen a KeyPress.  this is to
+                           avoid having the keybinding used to show the menu
+                           end up running something inside the menu */
 };
 
 struct _ObMenuEntryFrame

From d7b25da169d0a466e3fd88bec9344e25d64584f6 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 19:05:04 -0500
Subject: [PATCH 29/79] make the window_startup happen before the
 focus_cycle_popup startup, so that the popups can be added to the window map
 properly

---
 openbox/openbox.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openbox/openbox.c b/openbox/openbox.c
index ff226af4..c7e28324 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -292,12 +292,12 @@ gint main(gint argc, gchar **argv)
             event_startup(reconfigure);
             /* focus_backup is used for stacking, so this needs to come before
                anything that calls stacking_add */
+            sn_startup(reconfigure);
+            window_startup(reconfigure);
             focus_startup(reconfigure);
             focus_cycle_startup(reconfigure);
             focus_cycle_indicator_startup(reconfigure);
             focus_cycle_popup_startup(reconfigure);
-            window_startup(reconfigure);
-            sn_startup(reconfigure);
             screen_startup(reconfigure);
             grab_startup(reconfigure);
             group_startup(reconfigure);
@@ -367,8 +367,8 @@ gint main(gint argc, gchar **argv)
             focus_cycle_indicator_shutdown(reconfigure);
             focus_cycle_shutdown(reconfigure);
             focus_shutdown(reconfigure);
-            sn_shutdown(reconfigure);
             window_shutdown(reconfigure);
+            sn_shutdown(reconfigure);
             event_shutdown(reconfigure);
             config_shutdown();
             actions_shutdown(reconfigure);

From 602a73c15ce22250a604e443a994ad6c8726f3f5 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 19:30:29 -0500
Subject: [PATCH 30/79] make fake xinerama happen even when xinerama is enabled

---
 openbox/extensions.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/openbox/extensions.c b/openbox/extensions.c
index ee73e9ec..d1088361 100644
--- a/openbox/extensions.c
+++ b/openbox/extensions.c
@@ -86,6 +86,16 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
 {
     guint i;
     gint l, r, t, b;
+    if (ob_debug_xinerama) {
+        g_print("Using fake xinerama !\n");
+        gint w = WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen));
+        gint h = HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen));
+        *nxin = 2;
+        *xin_areas = g_new(Rect, *nxin + 1);
+        RECT_SET((*xin_areas)[0], 0, 0, w/2, h);
+        RECT_SET((*xin_areas)[1], w/2, 0, w-(w/2), h);
+    }
+    else
 #ifdef XINERAMA
     if (extensions_xinerama) {
         guint i;
@@ -97,17 +107,10 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin)
             RECT_SET((*xin_areas)[i], info[i].x_org, info[i].y_org,
                      info[i].width, info[i].height);
         XFree(info);
-    } else
-#endif
-    if (ob_debug_xinerama) {
-        gint w = WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen));
-        gint h = HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen));
-        *nxin = 2;
-        *xin_areas = g_new(Rect, *nxin + 1);
-        RECT_SET((*xin_areas)[0], 0, 0, w/2, h);
-        RECT_SET((*xin_areas)[1], w/2, 0, w-(w/2), h);
     }
-    else {
+    else
+#endif
+    {
         *nxin = 1;
         *xin_areas = g_new(Rect, *nxin + 1);
         RECT_SET((*xin_areas)[0], 0, 0,

From 22333336d3ba36784955c67444f996b557f3838a Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 19:32:45 -0500
Subject: [PATCH 31/79] add an <active> option for window placement, to try
 force new windows on the active monitor (for xinerama)

---
 data/rc.xml      |  3 +++
 data/rc.xsd      |  1 +
 openbox/config.c |  4 ++++
 openbox/config.h |  4 ++++
 openbox/place.c  | 13 ++++++++-----
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/data/rc.xml b/data/rc.xml
index e3a59eb2..efbd8a9c 100644
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -35,6 +35,9 @@
   <center>yes</center>
   <!-- whether to place windows in the center of the free area found or
        the top left corner -->
+  <active>no</active>
+  <!-- force new windows ont the active monitor on a multi-head system, unless
+       they are part of an application already on another monitor -->
 </placement>
 
 <theme>
diff --git a/data/rc.xsd b/data/rc.xsd
index adafc5f4..ef610bfa 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -54,6 +54,7 @@
         </xsd:annotation>
         <xsd:element name="policy" type="ob:placementpolicy"/>
         <xsd:element name="center" type="ob:bool"/>
+        <xsd:element name="active" type="ob:bool"/>
     </xsd:complexType>
     <xsd:complexType name="margins">
         <xsd:annotation>
diff --git a/openbox/config.c b/openbox/config.c
index ff4c542b..25e30fff 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -38,6 +38,7 @@ gboolean config_focus_under_mouse;
 
 ObPlacePolicy config_place_policy;
 gboolean      config_place_center;
+gboolean      config_place_active;
 
 StrutPartial config_margins;
 
@@ -500,6 +501,8 @@ static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             config_place_policy = OB_PLACE_POLICY_MOUSE;
     if ((n = parse_find_node("center", node)))
         config_place_center = parse_bool(doc, n);
+    if ((n = parse_find_node("active", node)))
+        config_place_active = parse_bool(doc, n);
 }
 
 static void parse_margins(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -880,6 +883,7 @@ void config_startup(ObParseInst *i)
 
     config_place_policy = OB_PLACE_POLICY_SMART;
     config_place_center = TRUE;
+    config_place_active = FALSE;
 
     parse_register(i, "placement", parse_placement, NULL);
 
diff --git a/openbox/config.h b/openbox/config.h
index 9d0602e2..2c4b4dba 100644
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -75,9 +75,13 @@ extern gboolean config_focus_last;
  */
 extern gboolean config_focus_under_mouse;
 
+/*! The algorithm to use for placing new windows */
 extern ObPlacePolicy config_place_policy;
 /*! Place windows in the center of the free area */
 extern gboolean config_place_center;
+/*! Place windows on the active monitor (unless they are part of an application
+  already on another monitor) */
+extern gboolean config_place_active;
 
 /*! User-specified margins around the edge of the screen(s) */
 extern StrutPartial config_margins;
diff --git a/openbox/place.c b/openbox/place.c
index aa572db2..276d9288 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -108,9 +108,9 @@ static Rect **pick_head(ObClient *c)
         }
     }
 
-    if (focus_client) {
+    if (focus_client && client_normal(focus_client)) {
         add_choice(choice, client_monitor(focus_client));
-        ob_debug("placement adding choice %d for focused window\n",
+        ob_debug("placement adding choice %d for normal focused window\n",
                  client_monitor(focus_client));
     }
 
@@ -146,7 +146,7 @@ static gboolean place_random(ObClient *client, gint *x, gint *y)
     guint i;
 
     areas = pick_head(client);
-    i = g_random_int_range(0, screen_num_monitors);
+    i = config_place_active ? 0 : g_random_int_range(0, screen_num_monitors);
 
     l = areas[i]->x;
     t = areas[i]->y;
@@ -254,8 +254,11 @@ static gboolean place_nooverlap(ObClient *c, gint *x, gint *y)
 
     /* try ignoring different things to find empty space */
     for (ignore = 0; ignore < IGNORE_END && !ret; ignore++) {
-        /* try all monitors in order of preference */
-        for (i = 0; i < screen_num_monitors && !ret; ++i) {
+        /* try all monitors in order of preference, but only the first one
+           if config_place_active is true */
+        for (i = 0; (i < (config_place_active ? 1 : screen_num_monitors) &&
+                     !ret); ++i)
+        {
             GList *it;
 
             /* add the whole monitor */

From b7e23f286a53b7beb259afac7e1a4cdf5fca47a4 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 19:45:30 -0500
Subject: [PATCH 32/79] make the focus cycle indicator be in the window_map so
 button presses on it are handled right

---
 openbox/focus_cycle_indicator.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c
index 5a6a1029..340abec6 100644
--- a/openbox/focus_cycle_indicator.c
+++ b/openbox/focus_cycle_indicator.c
@@ -82,6 +82,14 @@ void focus_cycle_indicator_startup(gboolean reconfig)
     stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.left));
     stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.right));
     stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.bottom));
+    g_hash_table_insert(window_map, &focus_indicator.top.win,
+                        &focus_indicator.top);
+    g_hash_table_insert(window_map, &focus_indicator.left.win,
+                        &focus_indicator.left);
+    g_hash_table_insert(window_map, &focus_indicator.right.win,
+                        &focus_indicator.right);
+    g_hash_table_insert(window_map, &focus_indicator.bottom.win,
+                        &focus_indicator.bottom);
 
     color_white = RrColorNew(ob_rr_inst, 0xff, 0xff, 0xff);
 
@@ -108,6 +116,11 @@ void focus_cycle_indicator_shutdown(gboolean reconfig)
 
     RrAppearanceFree(a_focus_indicator);
 
+    g_hash_table_remove(window_map, &focus_indicator.top.win);
+    g_hash_table_remove(window_map, &focus_indicator.left.win);
+    g_hash_table_remove(window_map, &focus_indicator.right.win);
+    g_hash_table_remove(window_map, &focus_indicator.bottom.win);
+
     stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.top));
     stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.left));
     stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.right));

From 17bc51aab8be25cd44c55eb0a652c92518bd9b0f Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 20:24:16 -0500
Subject: [PATCH 33/79] let you specify the resize popup to be in a fixed place

---
 data/rc.xml          | 12 ++++++++-
 data/rc.xsd          |  5 ++++
 openbox/config.c     | 63 ++++++++++++++++++++++++++++++++++++++------
 openbox/config.h     | 21 +++++++++++++--
 openbox/moveresize.c | 47 +++++++++++++++++++++++++++++++--
 openbox/moveresize.h |  6 +++++
 6 files changed, 141 insertions(+), 13 deletions(-)

diff --git a/data/rc.xml b/data/rc.xml
index efbd8a9c..3cd88ee8 100644
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -129,7 +129,17 @@
   <popupShow>Nonpixel</popupShow>
   <!-- 'Always', 'Never', or 'Nonpixel' (xterms and such) -->
   <popupPosition>Center</popupPosition>
-  <!-- 'Center' or 'Top' -->
+  <!-- 'Center', 'Top', or 'Fixed' -->
+  <popupFixedPosition>
+    <!-- these are used if popupPosition is set to 'Fixed' -->
+
+    <x>10</x>
+    <!-- positive number for distance from left edge, negative number for
+         distance from right edge, or 'Center' -->
+    <y>10</y>
+    <!-- positive number for distance from top edge, negative number for
+         distance from bottom edge, or 'Center' -->
+  </popupFixedPosition>
 </resize>
 
 <!-- You can reserve a portion of your screen where windows will not cover when
diff --git a/data/rc.xsd b/data/rc.xsd
index ef610bfa..0544cfd4 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -96,6 +96,11 @@
         <xsd:element minOccurs="0" name="drawContents" type="ob:bool"/>
         <xsd:element minOccurs="0" name="popupShow" type="ob:popupshow"/>
         <xsd:element minOccurs="0" name="popupPosition" type="ob:popupposition"/>
+        <xsd:element minOccurs="0" name="popupPosition" type="ob:popupfixedposition"/>
+    </xsd:complexType>
+    <xsd:complexType name="popupfixedposition">
+        <xsd:element minOccurs="0" name="x" type="ob:center_or_int"/>
+        <xsd:element minOccurs="0" name="y" type="ob:center_or_int"/>
     </xsd:complexType>
     <xsd:complexType name="dock">
         <xsd:element minOccurs="0" name="position" type="ob:dock_position"/>
diff --git a/openbox/config.c b/openbox/config.c
index 25e30fff..05853666 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -60,10 +60,16 @@ GSList *config_desktops_names;
 guint   config_screen_firstdesk;
 guint   config_desktop_popup_time;
 
-gboolean config_resize_redraw;
-gboolean config_resize_four_corners;
-gint     config_resize_popup_show;
-gint     config_resize_popup_pos;
+gboolean         config_resize_redraw;
+gboolean         config_resize_four_corners;
+gint             config_resize_popup_show;
+ObResizePopupPos config_resize_popup_pos;
+gboolean         config_resize_popup_x_center;
+gboolean         config_resize_popup_y_center;
+gboolean         config_resize_popup_x_opposite;
+gboolean         config_resize_popup_y_opposite;
+gint             config_resize_popup_x;
+gint             config_resize_popup_y;
 
 ObStackingLayer config_dock_layer;
 gboolean        config_dock_floating;
@@ -661,11 +667,46 @@ static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             config_resize_popup_show = 1;
     }
     if ((n = parse_find_node("popupPosition", node))) {
-        config_resize_popup_pos = parse_int(doc, n);
         if (parse_contains("Top", doc, n))
-            config_resize_popup_pos = 1;
+            config_resize_popup_pos = OB_RESIZE_POS_TOP;
         else if (parse_contains("Center", doc, n))
-            config_resize_popup_pos = 0;
+            config_resize_popup_pos = OB_RESIZE_POS_CENTER;
+        else if (parse_contains("Fixed", doc, n)) {
+            config_resize_popup_pos = OB_RESIZE_POS_FIXED;
+
+            if ((n = parse_find_node("popupFixedPosition", node))) {
+                xmlNodePtr n2;
+
+                if ((n2 = parse_find_node("x", n->children))) {
+                    gchar *s = parse_string(doc, n2);
+                    if (!g_ascii_strcasecmp(s, "center"))
+                        config_resize_popup_x_center = TRUE;
+                    else {
+                        if (s[0] == '-')
+                            config_resize_popup_x_opposite = TRUE;
+                        if (s[0] == '-' || s[0] == '+')
+                            config_resize_popup_x = atoi(s+1);
+                        else
+                            config_resize_popup_x = atoi(s);
+                    }
+                }
+                if ((n2 = parse_find_node("y", n->children))) {
+                    gchar *s = parse_string(doc, n2);
+                    if (!g_ascii_strcasecmp(s, "center"))
+                        config_resize_popup_y_center = TRUE;
+                    else {
+                        if (s[0] == '-')
+                            config_resize_popup_y_opposite = TRUE;
+                        if (s[0] == '-' || s[0] == '+')
+                            config_resize_popup_y = atoi(s+1);
+                        else
+                            config_resize_popup_y = atoi(s);
+                    }
+                }
+                g_print("X %d %d %d\n", config_resize_popup_x_center, config_resize_popup_x_opposite, config_resize_popup_x);
+                g_print("Y %d %d %d\n", config_resize_popup_y_center, config_resize_popup_y_opposite, config_resize_popup_y);
+            }
+        }
     }
 }
 
@@ -914,7 +955,13 @@ void config_startup(ObParseInst *i)
     config_resize_redraw = TRUE;
     config_resize_four_corners = FALSE;
     config_resize_popup_show = 1; /* nonpixel increments */
-    config_resize_popup_pos = 0;  /* center of client */
+    config_resize_popup_pos = OB_RESIZE_POS_CENTER;
+    config_resize_popup_x_center = FALSE;
+    config_resize_popup_x_opposite = FALSE;
+    config_resize_popup_x = 0;
+    config_resize_popup_y_center = FALSE;
+    config_resize_popup_y_opposite = FALSE;
+    config_resize_popup_y = 0;
 
     parse_register(i, "resize", parse_resize, NULL);
 
diff --git a/openbox/config.h b/openbox/config.h
index 2c4b4dba..4fa9c70b 100644
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -24,6 +24,7 @@
 #include "stacking.h"
 #include "place.h"
 #include "geom.h"
+#include "moveresize.h"
 #include "render/render.h"
 
 #include <glib.h>
@@ -92,8 +93,24 @@ extern gboolean config_resize_redraw;
 /*! show move/resize popups? 0 = no, 1 = always, 2 = only
   resizing !1 increments */
 extern gint config_resize_popup_show;
-/*! where to show the popup, currently above the window or centered */
-extern gint config_resize_popup_pos;
+/*! where to show the resize popup */
+extern ObResizePopupPos config_resize_popup_pos;
+/*! if the resize popup should be centered horizontally if it is being
+  placed in a fixed position */
+extern gboolean config_resize_popup_x_center;
+/*! if the resize popup should be centered vertically if it is being
+  placed in a fixed position */
+extern gboolean config_resize_popup_y_center;
+/*! if the resize popup should be placed from the right side of the screen when
+  placed in a fixed position */
+extern gboolean config_resize_popup_x_opposite;
+/*! if the resize popup should be placed from the bottom side of the screen
+  when placed in a fixed position */
+extern gboolean config_resize_popup_y_opposite;
+/*! where the resize popup should be if it is placed in a fixed position */
+extern gint config_resize_popup_x;
+/*! where the resize popup should be if it is placed in a fixed position */
+extern gint config_resize_popup_y;
 
 /*! The stacking layer the dock will reside in */
 extern ObStackingLayer config_dock_layer;
diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index bb17d4a0..07b8e22b 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -101,17 +101,60 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
     gchar *text;
 
     text = g_strdup_printf(format, a, b);
-    if (config_resize_popup_pos == 1) /* == "Top" */
+    if (config_resize_popup_pos == OB_RESIZE_POS_TOP)
         popup_position(popup, SouthGravity,
                        c->frame->area.x
                      + c->frame->area.width/2,
                        c->frame->area.y - ob_rr_theme->fbwidth);
-    else /* == "Center" */
+    else if (config_resize_popup_pos == OB_RESIZE_POS_CENTER)
         popup_position(popup, CenterGravity,
                        c->frame->area.x + c->frame->size.left +
                        c->area.width / 2,
                        c->frame->area.y + c->frame->size.top +
                        c->area.height / 2);
+    else /* Fixed */ {
+        Rect *area = screen_physical_area_active();
+        gint gravity, x, y;
+
+        x = config_resize_popup_x;
+        if (config_resize_popup_x_center) x = area->x + area->width/2;
+        else if (config_resize_popup_x_opposite) x = RECT_RIGHT(*area) - x;
+        else x = area->x + x;
+
+        y = config_resize_popup_y;
+        if (config_resize_popup_y_center) y = area->y + area->height/2;
+        else if (config_resize_popup_y_opposite) y = RECT_BOTTOM(*area) - y;
+        else y = area->y + y;
+
+        if (config_resize_popup_x_center) {
+            if (config_resize_popup_y_center)
+                gravity = CenterGravity;
+            else if (config_resize_popup_y_opposite)
+                gravity = SouthGravity;
+            else
+                gravity = NorthGravity;
+        }
+        else if (config_resize_popup_x_opposite) {
+            if (config_resize_popup_y_center)
+                gravity = EastGravity;
+            else if (config_resize_popup_y_opposite)
+                gravity = SouthEastGravity;
+            else
+                gravity = NorthEastGravity;
+        }
+        else {
+            if (config_resize_popup_y_center)
+                gravity = WestGravity;
+            else if (config_resize_popup_y_opposite)
+                gravity = SouthWestGravity;
+            else
+                gravity = NorthWestGravity;
+        }
+
+        popup_position(popup, gravity, x, y);
+
+        g_free(area);
+    }
     popup_show(popup, text);
     g_free(text);
 }
diff --git a/openbox/moveresize.h b/openbox/moveresize.h
index 2f8d3e6a..2d0f7dce 100644
--- a/openbox/moveresize.h
+++ b/openbox/moveresize.h
@@ -27,6 +27,12 @@
 
 struct _ObClient;
 
+typedef enum {
+    OB_RESIZE_POS_CENTER,
+    OB_RESIZE_POS_TOP,
+    OB_RESIZE_POS_FIXED
+} ObResizePopupPos;
+
 extern gboolean moveresize_in_progress;
 extern struct _ObClient *moveresize_client;
 #ifdef SYNC

From c2e495c720d93521bdb0e1bfd7e76584a1b329b7 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 20:58:03 -0500
Subject: [PATCH 34/79] make a GravityPoint and GravityCoord data structures
 for those --x, ++y type values

---
 openbox/config.c     | 107 +++++++++++++------------------------------
 openbox/config.h     |  24 ++--------
 openbox/geom.h       |  17 +++++++
 openbox/moveresize.c |  38 ++++++++-------
 openbox/place.c      |  16 +++----
 5 files changed, 83 insertions(+), 119 deletions(-)

diff --git a/openbox/config.c b/openbox/config.c
index 05853666..7ec2b3e0 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -64,12 +64,7 @@ gboolean         config_resize_redraw;
 gboolean         config_resize_four_corners;
 gint             config_resize_popup_show;
 ObResizePopupPos config_resize_popup_pos;
-gboolean         config_resize_popup_x_center;
-gboolean         config_resize_popup_y_center;
-gboolean         config_resize_popup_x_opposite;
-gboolean         config_resize_popup_y_opposite;
-gint             config_resize_popup_x;
-gint             config_resize_popup_y;
+GravityPoint     config_resize_popup_fixed;
 
 ObStackingLayer config_dock_layer;
 gboolean        config_dock_floating;
@@ -143,16 +138,28 @@ void config_app_settings_copy_non_defaults(const ObAppSettings *src,
 
     if (src->pos_given) {
         dst->pos_given = TRUE;
-        dst->center_x = src->center_x;
-        dst->center_y = src->center_y;
-        dst->opposite_x = src->opposite_x;
-        dst->opposite_y = src->opposite_y;
-        dst->position.x = src->position.x;
-        dst->position.y = src->position.y;
+        dst->position = src->position;
         dst->monitor = src->monitor;
     }
 }
 
+static void config_parse_gravity_coord(xmlDocPtr doc, xmlNodePtr node,
+                                       GravityCoord *c)
+{
+    gchar *s = parse_string(doc, node);
+    if (!g_ascii_strcasecmp(s, "center"))
+        c->center = TRUE;
+    else {
+        if (s[0] == '-')
+            c->opposite = TRUE;
+        if (s[0] == '-' || s[0] == '+')
+            c->pos = atoi(s+1);
+        else
+            c->pos = atoi(s);
+    }
+    g_free(s);
+}
+
 /*
   <applications>
     <application name="aterm">
@@ -218,38 +225,16 @@ static void parse_per_app_settings(ObParseInst *inst, xmlDocPtr doc,
             if ((n = parse_find_node("position", app->children))) {
                 if ((c = parse_find_node("x", n->children)))
                     if (!parse_contains("default", doc, c)) {
-                        gchar *s = parse_string(doc, c);
-                        if (!g_ascii_strcasecmp(s, "center")) {
-                            settings->center_x = TRUE;
-                            x_pos_given = TRUE;
-                        } else {
-                            if (s[0] == '-')
-                                settings->opposite_x = TRUE;
-                            if (s[0] == '-' || s[0] == '+')
-                                settings->position.x = atoi(s+1);
-                            else
-                                settings->position.x = atoi(s);
-                            x_pos_given = TRUE;
-                        }
-                        g_free(s);
+                        config_parse_gravity_coord(doc, c,
+                                                   &settings->position.x);
+                        settings->pos_given = TRUE;
                     }
 
                 if (x_pos_given && (c = parse_find_node("y", n->children)))
                     if (!parse_contains("default", doc, c)) {
-                        gchar *s = parse_string(doc, c);
-                        if (!g_ascii_strcasecmp(s, "center")) {
-                            settings->center_y = TRUE;
-                            settings->pos_given = TRUE;
-                        } else {
-                            if (s[0] == '-')
-                                settings->opposite_y = TRUE;
-                            if (s[0] == '-' || s[0] == '+')
-                                settings->position.y = atoi(s+1);
-                            else
-                                settings->position.y = atoi(s);
-                            settings->pos_given = TRUE;
-                        }
-                        g_free(s);
+                        config_parse_gravity_coord(doc, c,
+                                                   &settings->position.y);
+                        settings->pos_given = TRUE;
                     }
 
                 if (settings->pos_given &&
@@ -677,34 +662,12 @@ static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             if ((n = parse_find_node("popupFixedPosition", node))) {
                 xmlNodePtr n2;
 
-                if ((n2 = parse_find_node("x", n->children))) {
-                    gchar *s = parse_string(doc, n2);
-                    if (!g_ascii_strcasecmp(s, "center"))
-                        config_resize_popup_x_center = TRUE;
-                    else {
-                        if (s[0] == '-')
-                            config_resize_popup_x_opposite = TRUE;
-                        if (s[0] == '-' || s[0] == '+')
-                            config_resize_popup_x = atoi(s+1);
-                        else
-                            config_resize_popup_x = atoi(s);
-                    }
-                }
-                if ((n2 = parse_find_node("y", n->children))) {
-                    gchar *s = parse_string(doc, n2);
-                    if (!g_ascii_strcasecmp(s, "center"))
-                        config_resize_popup_y_center = TRUE;
-                    else {
-                        if (s[0] == '-')
-                            config_resize_popup_y_opposite = TRUE;
-                        if (s[0] == '-' || s[0] == '+')
-                            config_resize_popup_y = atoi(s+1);
-                        else
-                            config_resize_popup_y = atoi(s);
-                    }
-                }
-                g_print("X %d %d %d\n", config_resize_popup_x_center, config_resize_popup_x_opposite, config_resize_popup_x);
-                g_print("Y %d %d %d\n", config_resize_popup_y_center, config_resize_popup_y_opposite, config_resize_popup_y);
+                if ((n2 = parse_find_node("x", n->children)))
+                    config_parse_gravity_coord(doc, n2,
+                                               &config_resize_popup_fixed.x);
+                if ((n2 = parse_find_node("y", n->children)))
+                    config_parse_gravity_coord(doc, n2,
+                                               &config_resize_popup_fixed.y);
             }
         }
     }
@@ -956,12 +919,8 @@ void config_startup(ObParseInst *i)
     config_resize_four_corners = FALSE;
     config_resize_popup_show = 1; /* nonpixel increments */
     config_resize_popup_pos = OB_RESIZE_POS_CENTER;
-    config_resize_popup_x_center = FALSE;
-    config_resize_popup_x_opposite = FALSE;
-    config_resize_popup_x = 0;
-    config_resize_popup_y_center = FALSE;
-    config_resize_popup_y_opposite = FALSE;
-    config_resize_popup_y = 0;
+    GRAVITY_COORD_SET(config_resize_popup_fixed.x, 0, FALSE, FALSE);
+    GRAVITY_COORD_SET(config_resize_popup_fixed.y, 0, FALSE, FALSE);
 
     parse_register(i, "resize", parse_resize, NULL);
 
diff --git a/openbox/config.h b/openbox/config.h
index 4fa9c70b..240b04f1 100644
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -39,11 +39,7 @@ struct _ObAppSettings
     GPatternSpec *name;
     GPatternSpec *role;
 
-    Point position;
-    gboolean center_x;
-    gboolean center_y;
-    gboolean opposite_x;
-    gboolean opposite_y;
+    GravityPoint position;
     gboolean pos_given;
 
     guint desktop;
@@ -95,22 +91,8 @@ extern gboolean config_resize_redraw;
 extern gint config_resize_popup_show;
 /*! where to show the resize popup */
 extern ObResizePopupPos config_resize_popup_pos;
-/*! if the resize popup should be centered horizontally if it is being
-  placed in a fixed position */
-extern gboolean config_resize_popup_x_center;
-/*! if the resize popup should be centered vertically if it is being
-  placed in a fixed position */
-extern gboolean config_resize_popup_y_center;
-/*! if the resize popup should be placed from the right side of the screen when
-  placed in a fixed position */
-extern gboolean config_resize_popup_x_opposite;
-/*! if the resize popup should be placed from the bottom side of the screen
-  when placed in a fixed position */
-extern gboolean config_resize_popup_y_opposite;
-/*! where the resize popup should be if it is placed in a fixed position */
-extern gint config_resize_popup_x;
-/*! where the resize popup should be if it is placed in a fixed position */
-extern gint config_resize_popup_y;
+/*! where to place the popup if it's in a fixed position */
+extern GravityPoint config_resize_popup_fixed;
 
 /*! The stacking layer the dock will reside in */
 extern ObStackingLayer config_dock_layer;
diff --git a/openbox/geom.h b/openbox/geom.h
index 43eb8ea3..bdcd3c55 100644
--- a/openbox/geom.h
+++ b/openbox/geom.h
@@ -20,6 +20,23 @@
 #ifndef __geom_h
 #define __geom_h
 
+#include <glib.h>
+
+typedef struct _GravityCoord {
+    int pos;
+    gboolean center;
+    gboolean opposite;
+} GravityCoord;
+
+typedef struct _GravityPoint {
+    GravityCoord x;
+    GravityCoord y;
+} GravityPoint;
+
+#define GRAVITY_COORD_SET(c, p, cen, opp) \
+    (c).pos = (p), (c).center = (cen), (c).opposite = (opp)
+  
+
 typedef struct _Point {
     int x;
     int y;
diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 07b8e22b..8dc122c7 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -116,36 +116,42 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
         Rect *area = screen_physical_area_active();
         gint gravity, x, y;
 
-        x = config_resize_popup_x;
-        if (config_resize_popup_x_center) x = area->x + area->width/2;
-        else if (config_resize_popup_x_opposite) x = RECT_RIGHT(*area) - x;
-        else x = area->x + x;
+        x = config_resize_popup_fixed.x.pos;
+        if (config_resize_popup_fixed.x.center)
+            x = area->x + area->width/2;
+        else if (config_resize_popup_fixed.x.opposite)
+            x = RECT_RIGHT(*area) - x;
+        else
+            x = area->x + x;
 
-        y = config_resize_popup_y;
-        if (config_resize_popup_y_center) y = area->y + area->height/2;
-        else if (config_resize_popup_y_opposite) y = RECT_BOTTOM(*area) - y;
-        else y = area->y + y;
+        y = config_resize_popup_fixed.y.pos;
+        if (config_resize_popup_fixed.y.center)
+            y = area->y + area->width/2;
+        else if (config_resize_popup_fixed.y.opposite)
+            y = RECT_RIGHT(*area) - y;
+        else
+            y = area->y + y;
 
-        if (config_resize_popup_x_center) {
-            if (config_resize_popup_y_center)
+        if (config_resize_popup_fixed.x.center) {
+            if (config_resize_popup_fixed.y.center)
                 gravity = CenterGravity;
-            else if (config_resize_popup_y_opposite)
+            else if (config_resize_popup_fixed.y.opposite)
                 gravity = SouthGravity;
             else
                 gravity = NorthGravity;
         }
-        else if (config_resize_popup_x_opposite) {
-            if (config_resize_popup_y_center)
+        else if (config_resize_popup_fixed.x.opposite) {
+            if (config_resize_popup_fixed.y.center)
                 gravity = EastGravity;
-            else if (config_resize_popup_y_opposite)
+            else if (config_resize_popup_fixed.y.opposite)
                 gravity = SouthEastGravity;
             else
                 gravity = NorthEastGravity;
         }
         else {
-            if (config_resize_popup_y_center)
+            if (config_resize_popup_fixed.y.center)
                 gravity = WestGravity;
-            else if (config_resize_popup_y_opposite)
+            else if (config_resize_popup_fixed.y.opposite)
                 gravity = SouthWestGravity;
             else
                 gravity = NorthWestGravity;
diff --git a/openbox/place.c b/openbox/place.c
index 276d9288..058bbfbe 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -407,21 +407,21 @@ static gboolean place_per_app_setting(ObClient *client, gint *x, gint *y,
         g_free(areas);
     }
 
-    if (settings->center_x)
+    if (settings->position.x.center)
         *x = screen->x + screen->width / 2 - client->area.width / 2;
-    else if (settings->opposite_x)
+    else if (settings->position.x.opposite)
         *x = screen->x + screen->width - client->frame->area.width -
-            settings->position.x;
+            settings->position.x.pos;
     else
-        *x = screen->x + settings->position.x;
+        *x = screen->x + settings->position.x.pos;
 
-    if (settings->center_y)
+    if (settings->position.y.center)
         *y = screen->y + screen->height / 2 - client->area.height / 2;
-    else if (settings->opposite_y)
+    else if (settings->position.y.opposite)
         *y = screen->y + screen->height - client->frame->area.height -
-            settings->position.y;
+            settings->position.y.pos;
     else
-        *y = screen->y + settings->position.y;
+        *y = screen->y + settings->position.y.pos;
 
     g_free(screen);
     return TRUE;

From 405d9a3e431b01a221be65f41bccb6c80c43b0a4 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 21:19:58 -0500
Subject: [PATCH 35/79] dont reparse the config file when the keyboard map
 changes. just rebind everything. yay for mika as inspiration

---
 openbox/event.c     |  9 ++++++---
 openbox/keyboard.c  | 11 +++++++++--
 openbox/keyboard.h  |  2 ++
 openbox/keytree.c   | 12 ++++++++----
 openbox/keytree.h   |  1 +
 openbox/translate.c |  2 ++
 6 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/openbox/event.c b/openbox/event.c
index 6b0ecdd7..bc59d67e 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -639,9 +639,12 @@ static void event_process(const XEvent *ec, gpointer data)
     else if (e->type == MapRequest)
         client_manage(window);
     else if (e->type == MappingNotify) {
-        /* keyboard layout changes, reconfigure openbox. need to restart the
-           modkeys system, but also to reload the key bindings. */
-        ob_reconfigure();
+        /* keyboard layout changes for modifier mapping changes. reload the
+           modifier map, and rebind all the key bindings as appropriate */
+        ob_debug("Kepboard map changed. Reloading keyboard bindings.\n");
+        modkeys_shutdown(TRUE);
+        modkeys_startup(TRUE);
+        keyboard_rebind();
     }
     else if (e->type == ClientMessage) {
         /* This is for _NET_WM_REQUEST_FRAME_EXTENTS messages. They come for
diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 0aade9ab..eddda577 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -51,8 +51,9 @@ static void grab_keys(gboolean grab)
     if (grab) {
         p = curpos ? curpos->first_child : keyboard_firstnode;
         while (p) {
-            grab_key(p->key, p->state, RootWindow(ob_display, ob_screen),
-                     GrabModeAsync);
+            if (p->key)
+                grab_key(p->key, p->state, RootWindow(ob_display, ob_screen),
+                         GrabModeAsync);
             p = p->next_sibling;
         }
         if (curpos)
@@ -264,6 +265,12 @@ void keyboard_event(ObClient *client, const XEvent *e)
     }
 }
 
+void keyboard_rebind()
+{
+    tree_rebind(keyboard_firstnode);
+    grab_keys(TRUE);
+}
+
 void keyboard_startup(gboolean reconfig)
 {
     grab_keys(TRUE);
diff --git a/openbox/keyboard.h b/openbox/keyboard.h
index 1c55e050..995cdbc5 100644
--- a/openbox/keyboard.h
+++ b/openbox/keyboard.h
@@ -34,6 +34,8 @@ extern KeyBindingTree *keyboard_firstnode;
 void keyboard_startup(gboolean reconfig);
 void keyboard_shutdown(gboolean reconfig);
 
+void keyboard_rebind();
+
 void keyboard_chroot(GList *keylist);
 gboolean keyboard_bind(GList *keylist, struct _ObActionsAct *action);
 void keyboard_unbind_all();
diff --git a/openbox/keytree.c b/openbox/keytree.c
index fb26624d..714fffda 100644
--- a/openbox/keytree.c
+++ b/openbox/keytree.c
@@ -63,14 +63,18 @@ KeyBindingTree *tree_build(GList *keylist)
                                           g_strdup(kit->data)); /* deep copy */
         ret->first_child = p;
         if (p != NULL) p->parent = ret;
-        if (!translate_key(it->data, &ret->state, &ret->key)) {
-            tree_destroy(ret);
-            return NULL;
-        }
+        translate_key(it->data, &ret->state, &ret->key);
     }
     return ret;
 }
 
+void tree_rebind(KeyBindingTree *node) {
+    GList *it = g_list_last(node->keylist);
+    translate_key(it->data, &node->state, &node->key);
+    if (node->next_sibling) tree_rebind(node->next_sibling);
+    if (node->first_child) tree_rebind(node->first_child);
+}
+
 void tree_assimilate(KeyBindingTree *node)
 {
     KeyBindingTree *a, *b, *tmp, *last;
diff --git a/openbox/keytree.h b/openbox/keytree.h
index 391cb154..0307378d 100644
--- a/openbox/keytree.h
+++ b/openbox/keytree.h
@@ -41,6 +41,7 @@ KeyBindingTree *tree_build(GList *keylist);
 void tree_assimilate(KeyBindingTree *node);
 KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict);
 gboolean tree_chroot(KeyBindingTree *tree, GList *keylist);
+void tree_rebind(KeyBindingTree *node);
 
 
 #endif
diff --git a/openbox/translate.c b/openbox/translate.c
index 21015578..b2ae7d67 100644
--- a/openbox/translate.c
+++ b/openbox/translate.c
@@ -111,6 +111,8 @@ gboolean translate_key(const gchar *str, guint *state, guint *keycode)
 
     parsed = g_strsplit(str, "-", -1);
 
+    *state = *keycode = 0;
+
     /* first, find the key (last token) */
     l = NULL;
     for (i = 0; parsed[i] != NULL; ++i)

From d575fb65d7b440471f3d313748ec0092c02aa27e Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@comhem.se>
Date: Sat, 12 Jan 2008 03:29:48 +0100
Subject: [PATCH 36/79]   --exit              Sulje Openbox

---
 po/fi.po | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index 63c92690..8cbdc3bf 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.4.3\n"
+"Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2007-11-12 19:12+0100\n"
-"PO-Revision-Date: 2007-10-22 15:58+0200\n"
+"PO-Revision-Date: 2008-01-12 03:29+0100\n"
 "Last-Translator: Elias Julkunen <elias.julkunen@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -239,9 +239,8 @@ msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Käynnistä Openbox uudelleen\n"
 
 #: openbox/openbox.c:492
-#, fuzzy
 msgid "  --exit              Exit Openbox\n"
-msgstr ""
+msgstr "  --exit              Sulje Openbox\n"
 
 #: openbox/openbox.c:493
 msgid ""

From 5d533d9fe2139bb0096482201e765c0905de5152 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 21:33:46 -0500
Subject: [PATCH 37/79] fix a small bug introduced that broke per-app placement

---
 openbox/config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openbox/config.c b/openbox/config.c
index 7ec2b3e0..c094732e 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -227,7 +227,7 @@ static void parse_per_app_settings(ObParseInst *inst, xmlDocPtr doc,
                     if (!parse_contains("default", doc, c)) {
                         config_parse_gravity_coord(doc, c,
                                                    &settings->position.x);
-                        settings->pos_given = TRUE;
+                        x_pos_given = TRUE;
                     }
 
                 if (x_pos_given && (c = parse_find_node("y", n->children)))

From 669c7655be8fef885e2f5ea0b0d389046ebb6753 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 Jan 2008 23:16:06 -0500
Subject: [PATCH 38/79] since the internal windows are in window_map now, it's
 possible we'll get them back when we check what window an event happened on. 
 so don't abort if that happens anymore.

---
 openbox/event.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openbox/event.c b/openbox/event.c
index bc59d67e..04ecf383 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -475,10 +475,12 @@ static void event_process(const XEvent *ec, gpointer data)
             client = WINDOW_AS_CLIENT(obwin);
             break;
         case Window_Menu:
-        case Window_Internal:
             /* not to be used for events */
             g_assert_not_reached();
             break;
+        case Window_Internal:
+            /* we don't do anything with events directly on these windows */
+            break;
         }
     }
 

From 32c3a97f2e6d029cfb183deb03ebd6963166ead1 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sat, 12 Jan 2008 13:31:46 -0500
Subject: [PATCH 39/79] fix a copy/paste bug in placing the move&resize popup

---
 openbox/moveresize.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 8dc122c7..675cbe9c 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -126,7 +126,7 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
 
         y = config_resize_popup_fixed.y.pos;
         if (config_resize_popup_fixed.y.center)
-            y = area->y + area->width/2;
+            y = area->y + area->height/2;
         else if (config_resize_popup_fixed.y.opposite)
             y = RECT_RIGHT(*area) - y;
         else

From df73dfa049b9d0bb81e09b27ecf678dce9b46301 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sat, 12 Jan 2008 16:15:45 -0500
Subject: [PATCH 40/79] make the dock's hiding always have at least 1px on
 screen

---
 openbox/dock.c | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/openbox/dock.c b/openbox/dock.c
index 9d4b56c4..ed8bed4b 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -227,8 +227,10 @@ void dock_configure(void)
     gint l, r, t, b;
     gint strw, strh;
     Rect *a;
+    gint hidesize;
 
     RrMargins(dock->a_frame, &l, &t, &r, &b);
+    hidesize = MAX(1, ob_rr_theme->obwidth);
 
     dock->area.width = dock->area.height = 0;
 
@@ -361,51 +363,51 @@ void dock_configure(void)
             case OB_DIRECTION_NORTHWEST:
                 switch (config_dock_orient) {
                 case OB_ORIENTATION_HORZ:
-                    dock->area.y -= dock->area.height - ob_rr_theme->obwidth;
+                    dock->area.y -= dock->area.height - hidesize;
                     break;
                 case OB_ORIENTATION_VERT:
-                    dock->area.x -= dock->area.width - ob_rr_theme->obwidth;
+                    dock->area.x -= dock->area.width - hidesize;
                     break;
                 }
                 break;
             case OB_DIRECTION_NORTH:
-                dock->area.y -= dock->area.height - ob_rr_theme->obwidth;
+                dock->area.y -= dock->area.height - hidesize;
                 break;
             case OB_DIRECTION_NORTHEAST:
                 switch (config_dock_orient) {
                 case OB_ORIENTATION_HORZ:
-                    dock->area.y -= dock->area.height - ob_rr_theme->obwidth;
+                    dock->area.y -= dock->area.height - hidesize;
                     break;
                 case OB_ORIENTATION_VERT:
-                    dock->area.x += dock->area.width - ob_rr_theme->obwidth;
+                    dock->area.x += dock->area.width - hidesize;
                     break;
                 }
                 break;
             case OB_DIRECTION_WEST:
-                dock->area.x -= dock->area.width - ob_rr_theme->obwidth;
+                dock->area.x -= dock->area.width - hidesize;
                 break;
             case OB_DIRECTION_EAST:
-                dock->area.x += dock->area.width - ob_rr_theme->obwidth;
+                dock->area.x += dock->area.width - hidesize;
                 break;
             case OB_DIRECTION_SOUTHWEST:
                 switch (config_dock_orient) {
                 case OB_ORIENTATION_HORZ:
-                    dock->area.y += dock->area.height - ob_rr_theme->obwidth;
+                    dock->area.y += dock->area.height - hidesize;
                     break;
                 case OB_ORIENTATION_VERT:
-                    dock->area.x -= dock->area.width - ob_rr_theme->obwidth;
+                    dock->area.x -= dock->area.width - hidesize;
                     break;
                 } break;
             case OB_DIRECTION_SOUTH:
-                dock->area.y += dock->area.height - ob_rr_theme->obwidth;
+                dock->area.y += dock->area.height - hidesize;
                 break;
             case OB_DIRECTION_SOUTHEAST:
                 switch (config_dock_orient) {
                 case OB_ORIENTATION_HORZ:
-                    dock->area.y += dock->area.height - ob_rr_theme->obwidth;
+                    dock->area.y += dock->area.height - hidesize;
                     break;
                 case OB_ORIENTATION_VERT:
-                    dock->area.x += dock->area.width - ob_rr_theme->obwidth;
+                    dock->area.x += dock->area.width - hidesize;
                     break;
                 }
                 break;
@@ -414,8 +416,8 @@ void dock_configure(void)
     }
 
     if (!config_dock_floating && config_dock_hide) {
-        strw = ob_rr_theme->obwidth;
-        strh = ob_rr_theme->obwidth;
+        strw = hidesize;
+        strh = hidesize;
     } else {
         strw = dock->area.width;
         strh = dock->area.height;

From 64905704e92deca4caa7e63954f236860418d370 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@comhem.se>
Date: Sat, 12 Jan 2008 18:36:49 +0100
Subject: [PATCH 41/79] Update --version output copyright year to 2008.

---
 openbox/openbox.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openbox/openbox.c b/openbox/openbox.c
index c7e28324..30a26609 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -470,9 +470,9 @@ static void print_version()
 {
     g_print("Openbox %s\n", PACKAGE_VERSION);
     g_print(_("Copyright (c)"));
-    g_print(" 2007        Mikael Magnusson\n");
+    g_print(" 2008        Mikael Magnusson\n");
     g_print(_("Copyright (c)"));
-    g_print(" 2003-2007   Dana Jansens\n\n");
+    g_print(" 2003-2006   Dana Jansens\n\n");
     g_print("This program comes with ABSOLUTELY NO WARRANTY.\n");
     g_print("This is free software, and you are welcome to redistribute it\n");
     g_print("under certain conditions. See the file COPYING for details.\n\n");

From 1e6e2041bf58c6187430bde2632fb2c7aec1e950 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sat, 12 Jan 2008 18:25:22 -0500
Subject: [PATCH 42/79] update the icon to the pretty one by david barr

---
 AUTHORS          |   2 ++
 data/openbox.png | Bin 9402 -> 1528 bytes
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index a4673d1d..b00cb387 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,6 +16,8 @@ John McKnight (jmcknight@gmail.com)
  - Clearlooks themes
 David Barr (david@chalkskeletons.com)
  - Bear2 theme
+ - Clearlooks theme
+ - Icon
 Brandon Cash
  - SplitVertical gradient style
 Dan Rise
diff --git a/data/openbox.png b/data/openbox.png
index 6e57964bb6a9abc876386a08c6e1e64657bfce5a..70d1f07462d2f2a27b7cdd08ee550bc486ff9fdd 100644
GIT binary patch
delta 1485
zcmV;;1v2`&N%#wpJ%1JI000&00oEYr)Bpeg2XskIMF-ai1`Y=thbncb000GrNkl<Z
zXx{BvO>Z1U5PdZ}yY?pj2(n@cAz~CzIOKvN@gEQ;4qV`mKqSs^;6LyukiwY*LL3kh
zNDxKFu@M40Bqn&hUhjIgABX9l>7K5hT{}2-Bt{y0cGNRnuYc;*tLh%$|Knm0aTl+>
z``I#p-V0*)Wc%LTK>*;*_dfp$BIg1?L_qSH-{B5p%w#etKG?o@_i1jufBVkujd$LD
z>lTiVi*t1yy}#~~!8QGXXu|F<<oNpApYZeMAFlu?0hFkSA2y$0XLs;ixp3OJ+<bW%
z#(Ss&Ff}Ekq<_=7m?WI@FvxTOh6E);mSvYZdkKN@5O@(FAQ?KH{Bi@3L<FWR1A5sb
zAP`Wckc&Y6B1Ax;(7Ad|B+&6^%Yg)iNC6~+oCAgaE914p0|4|FySNq!TddStQDyUo
zoKEOD>%P6{bvt?v91aeUkN(1{VjWL2F=tqCnkuagIDZC;@hApx>(y)c=)*gpVe(}q
zwsu1te#aUr0JM8SOVI*EB*Uj)46yt7pAbN=+re@_M^O|u{tX_mw5qi!vj7uQm#^Tw
z-X;jCAF#voJV&qFQB;To-P!E0eAoF=XaQ75ORPT>lS%6%u?9E&QO+lx6Pxn|GD>4$
zj459xqJP9yVnBiO84al?c8!3N@LtqJiK2gPj7bA9Bxp=+Oq7S5os5L)O&5&PtCFM;
zt8p%HY!!(x0%X|}&C(r8lIfMLDrEwcWnPdFX-IRl7GT9(L(>j`jR8IvHIc7xOJmAd
z9wnhPRlabJy3m#bhJ-PM?qAF0ipA9U;qp<ZM}Gxc^lBJQ7mqO}yqibTWelti=?N$F
zqGDx^i8WwSRv846dLd{MD2j5}N?3G;rh2(?hWXD?>nW^P5i5<h2CnpsvF!TK#^$nJ
zg-CAz11FYch?tSO<vRodMuaaxivPc*r*cBTv~p_zj4fpGNKZE^zO$|}4JWfsHfm&`
zQ-9mC&bc{72^PbAAm@yLqkA(O*zgkxKXZ|g|H>(%uu$mJn=04mQX!g<V^sam_7;@7
z0I<PzCD(nXr$I2>$;iVdp-f`24^xtr$cs>$WV)P4jgX{gVfinOd$S9fp~ts67c?VC
zD9M`WE>x*x2&EZ4YIC;Kfk1^6EhZ%{a(|5LL~Eh44PWJ!X3ODHAfZw-dm++<eY=Ej
zXHX@TxP;Q7s!M%sN<4{PNXrjH6Rfe72r%q+sJumy#nwe_TX)&)g=TdbsR&S!QLW8Q
z$|V_Yqbt>$Ej>=uiLw@!uwP3gaXGnHD5%oAQJy7e+<fm=6`2XD&EXivX`bFzaer0L
z-#D$-r75u_>m>C1x~SP^1*8@M2}2X)ReF1)y^#4UvZ!;U-TX>#3~@#~4cF%e3nDhk
z0;9G>qiO>{jc#fSPrWN(TL20u1~74xKr2-dwx*Jak978OF_mkjqo?8k$aFmD8e_1w
zwuaT!)o0tgbcIi3X2PE3yIHr}1%G)T#qjY0fNl=p>g3?hrEh+`j`u(LGN}xP#9%PQ
z>dF$*t7f)tEzUBR00x60mY1$1la?e74u+T<?yUe=$pQ4I<Kbfe>I&9xyq<h{F)c89
z_z>$GZ=?+&&$Kn_2jckGO|0Lz36U(Z?@COzwlJL>EduE00D8q}zc@O4ihoDj_tVQd
zLlj5H*xUMLuHELdepa21MtHLGpt-3ReBc-lhnODi8vqMA01STnZtw4xHa_0pne<F?
zvPe@bxQ?WG>^_I@3A?&SGRZn8(&-*c)*TOi|NfD~b{)VK080S+_UyG*pNsgi1Y`h;
za(^1f01g3+a{EK<SpYck>PEw5126?J0WbzI0x)uh_W&%|vkRbe2?01poY->&VC?fe
nvxd9#vQen)ze|=(?TLQ@F?by-780bh00000NkvXXu0mjf*G0G#

literal 9402
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7l!{JxM1({$v_d#0*}aI
z1_o{+5N5n|x9$&6kiEpy*OmP;Cm)xn%H|1S1q=)d44y8IAr-e64OGtG2C5hZqaiS&
zLx2&B@Bd>F8%#ndZf3#evc<bDViO*4u~;{K3^!o)z~6uW7(RaafuVRX3SjlXzrX(&
z{sQq(09ZZn_wQez2mTHP_cLJiz&~IT8uA_hd15F4tT6z}#6vm;e*gN-@C%5C0zj!0
zpbj4T71{MW_XcI)YpN(=xC?6@0I3q<#wmqi2t5SeeFb$6FaZ;$(9jYY^}s;K*Juok
z#sGyOFq(uY3_yytkH!GSK}ewiqcK2X08*@dGzKURLJAESjR6V+kYeqlF+gz;QfR<v
z3{V(=6l))i0g8i=LIZ|;4B#C6!8Hy;VSrIx`|uoEoVeyV-jK=<v1A~m2Co5FB#AK-
zqy`;eO+v(sOk-DbVOr%*1_l;u&{_a=t4QNxHy^(lLq0j-_ui=NXb24d5Xi0Yu3_9g
QJr(3rPgg&ebxsLQ00*aU*Z=?k


From 5148b839fefe16b54f26bc0d2c7a500127cf2725 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sun, 13 Jan 2008 02:50:34 -0500
Subject: [PATCH 43/79] sync when killing all keyboard grabs, so that we can be
 sure they are gone before proceeding (fixes a race condition when running
 things that want to grab the keyboard very quickly.  yes, arch is that fast
 somehow..)

---
 openbox/event.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openbox/event.c b/openbox/event.c
index 04ecf383..44e0f532 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1997,6 +1997,8 @@ void event_cancel_all_key_grabs(void)
     }
     else
         ungrab_passive_key();
+
+    XSync(ob_display, FALSE);
 }
 
 gboolean event_time_after(Time t1, Time t2)

From 6dfc3c726a2164ba70cfac3df436ee035822bdb1 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sun, 13 Jan 2008 03:40:14 -0500
Subject: [PATCH 44/79] don't skip windows that are skip_taskbar unless they
 are normal typed.. i.e. if a dialog sets this don't skip it (gnome
 shutdown/logout dialogs don't get focused otherwise in arch linux)

---
 openbox/client.c |  2 ++
 openbox/focus.c  | 10 +++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/openbox/client.c b/openbox/client.c
index 1e2040fd..22eb8403 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -450,6 +450,8 @@ void client_manage(Window window)
     g_free(monitor);
     monitor = NULL;
 
+    ob_debug_type(OB_DEBUG_FOCUS, "Going to try activate new window? %s\n",
+                  activate ? "yes" : "no");
     if (activate) {
         gboolean raise = FALSE;
 
diff --git a/openbox/focus.c b/openbox/focus.c
index df02cb76..a4eb2cfa 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -337,13 +337,9 @@ gboolean focus_valid_target(ObClient *ft,
                   that can be focused instead */
                !focus_target_has_siblings(ft, iconic_windows, all_desktops))));
 
-    /* it's not set to skip the taskbar (unless it is a type that would be
-       expected to set this hint, or modal) */
-    ok = ok && ((ft->type == OB_CLIENT_TYPE_DOCK ||
-                 ft->type == OB_CLIENT_TYPE_DESKTOP ||
-                 ft->type == OB_CLIENT_TYPE_TOOLBAR ||
-                 ft->type == OB_CLIENT_TYPE_MENU ||
-                 ft->type == OB_CLIENT_TYPE_UTILITY) ||
+    /* it's not set to skip the taskbar (but this only applies to normal typed
+       windows, and is overridden if the window is modal) */
+    ok = ok && (ft->type != OB_CLIENT_TYPE_NORMAL ||
                 ft->modal ||
                 !ft->skip_taskbar);
 

From 28971b82f58e65348829f8aba34b4627cd375a1b Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@comhem.se>
Date: Sun, 13 Jan 2008 00:45:09 +0100
Subject: [PATCH 45/79] Add --exit translation to de.po.

---
 po/de.po | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/po/de.po b/po/de.po
index f35437f1..375e60ae 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.4.3\n"
+"Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2007-11-12 19:12+0100\n"
-"PO-Revision-Date: 2007-08-23 15:00+0200\n"
+"PO-Revision-Date: 2008-01-13 00:44+0100\n"
 "Last-Translator: Peter Schwindt <schwindt@ba-loerrach.de>\n"
 "Language-Team:  <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -240,9 +240,8 @@ msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Openbox neu starten\n"
 
 #: openbox/openbox.c:492
-#, fuzzy
 msgid "  --exit              Exit Openbox\n"
-msgstr ""
+msgstr "  --exit              Beende Openbox\n"
 
 #: openbox/openbox.c:493
 msgid ""

From ed51baa95808ad0235e30d3c5215deca4b9faa6b Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 19:36:36 -0500
Subject: [PATCH 46/79] remove the visible window title hints when unmanaging a
 window.  not all WMs set those and it messes them up, and we'll set them
 again appropriately, they don't need to be saved.

---
 openbox/client.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openbox/client.c b/openbox/client.c
index 22eb8403..5e4e52e7 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -762,6 +762,11 @@ void client_unmanage(ObClient *self)
         XMapWindow(ob_display, self->window);
     }
 
+    /* these should not be left on the window ever.  other window managers
+       don't necessarily use them and it will mess them up (like compiz) */
+    PROP_ERASE(self->window, net_wm_visible_name);
+    PROP_ERASE(self->window, net_wm_visible_icon_name);
+
     /* update the list hints */
     client_set_list();
 

From 26f34d3ba0794c09757393881610b552e7bbbbeb Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 19:54:30 -0500
Subject: [PATCH 47/79] resizing was defaulting to the topleft corner instead
 of to the auto-ness or something..

---
 openbox/actions/resize.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/openbox/actions/resize.c b/openbox/actions/resize.c
index 81901bdd..3714e38b 100644
--- a/openbox/actions/resize.c
+++ b/openbox/actions/resize.c
@@ -5,6 +5,7 @@
 #include "openbox/frame.h"
 
 typedef struct {
+    gboolean corner_specified;
     guint32 corner;
 } Options;
 
@@ -33,6 +34,8 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
 
     if ((n = parse_find_node("edge", node))) {
         gchar *s = parse_string(doc, n);
+
+        o->corner_specified = TRUE;
         if (!g_ascii_strcasecmp(s, "top"))
             o->corner = prop_atoms.net_wm_moveresize_size_top;
         else if (!g_ascii_strcasecmp(s, "bottom"))
@@ -49,6 +52,9 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
             o->corner = prop_atoms.net_wm_moveresize_size_bottomleft;
         else if (!g_ascii_strcasecmp(s, "bottomright"))
             o->corner = prop_atoms.net_wm_moveresize_size_bottomright;
+        else
+            o->corner_specified = FALSE;
+
         g_free(s);
     }
     return o;
@@ -72,7 +78,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
 
         if (!data->button)
             corner = prop_atoms.net_wm_moveresize_size_keyboard;
-        else if (o->corner)
+        else if (o->corner_specified)
             corner = o->corner; /* it was specified in the binding */
         else
             corner = pick_corner(data->x, data->y,

From d122c973ca78cd4ac4e17931269f31b0abfffbb0 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 20:00:08 -0500
Subject: [PATCH 48/79] fix the context given off by the borders in the br
 corner

---
 openbox/frame.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openbox/frame.c b/openbox/frame.c
index b49139ac..b0666b27 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -1438,9 +1438,9 @@ ObFrameContext frame_context(ObClient *client, Window win, gint x, gint y)
     if (win == self->lgripbottom)       return OB_FRAME_CONTEXT_BLCORNER;
     if (win == self->handleright)       return OB_FRAME_CONTEXT_BRCORNER;
     if (win == self->rgrip)             return OB_FRAME_CONTEXT_BRCORNER;
-    if (win == self->rgripright)        return OB_FRAME_CONTEXT_BLCORNER;
-    if (win == self->rgriptop)          return OB_FRAME_CONTEXT_BLCORNER;
-    if (win == self->rgripbottom)       return OB_FRAME_CONTEXT_BLCORNER;
+    if (win == self->rgripright)        return OB_FRAME_CONTEXT_BRCORNER;
+    if (win == self->rgriptop)          return OB_FRAME_CONTEXT_BRCORNER;
+    if (win == self->rgripbottom)       return OB_FRAME_CONTEXT_BRCORNER;
     if (win == self->title)             return OB_FRAME_CONTEXT_TITLEBAR;
     if (win == self->titlebottom)       return OB_FRAME_CONTEXT_TITLEBAR;
     if (win == self->titleleft)         return OB_FRAME_CONTEXT_TLCORNER;

From 2b5d4b69974aba63f0c22cd5e4b91c456cd70f68 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 20:33:56 -0500
Subject: [PATCH 49/79] the inner border's corners weren't having events
 handled on them correctly, which was messing with resizing.  yay akk for
 finding this.

---
 openbox/frame.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/openbox/frame.c b/openbox/frame.c
index b0666b27..a47c2f06 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -1007,6 +1007,10 @@ void frame_grab_client(ObFrame *self)
     g_hash_table_insert(window_map, &self->innertop, self->client);
     g_hash_table_insert(window_map, &self->innerright, self->client);
     g_hash_table_insert(window_map, &self->innerbottom, self->client);
+    g_hash_table_insert(window_map, &self->innerblb, self->client);
+    g_hash_table_insert(window_map, &self->innerbll, self->client);
+    g_hash_table_insert(window_map, &self->innerbrb, self->client);
+    g_hash_table_insert(window_map, &self->innerbrr, self->client);
     g_hash_table_insert(window_map, &self->title, self->client);
     g_hash_table_insert(window_map, &self->label, self->client);
     g_hash_table_insert(window_map, &self->max, self->client);
@@ -1087,6 +1091,10 @@ void frame_release_client(ObFrame *self)
     g_hash_table_remove(window_map, &self->innertop);
     g_hash_table_remove(window_map, &self->innerright);
     g_hash_table_remove(window_map, &self->innerbottom);
+    g_hash_table_remove(window_map, &self->innerblb);
+    g_hash_table_remove(window_map, &self->innerbll);
+    g_hash_table_remove(window_map, &self->innerbrb);
+    g_hash_table_remove(window_map, &self->innerbrr);
     g_hash_table_remove(window_map, &self->title);
     g_hash_table_remove(window_map, &self->label);
     g_hash_table_remove(window_map, &self->max);
@@ -1459,6 +1467,10 @@ ObFrameContext frame_context(ObClient *client, Window win, gint x, gint y)
     if (win == self->innerleft)         return OB_FRAME_CONTEXT_LEFT;
     if (win == self->innerbottom)       return OB_FRAME_CONTEXT_BOTTOM;
     if (win == self->innerright)        return OB_FRAME_CONTEXT_RIGHT;
+    if (win == self->innerbll)          return OB_FRAME_CONTEXT_BLCORNER;
+    if (win == self->innerblb)          return OB_FRAME_CONTEXT_BLCORNER;
+    if (win == self->innerbrr)          return OB_FRAME_CONTEXT_BRCORNER;
+    if (win == self->innerbrb)          return OB_FRAME_CONTEXT_BRCORNER;
     if (win == self->max)               return OB_FRAME_CONTEXT_MAXIMIZE;
     if (win == self->iconify)           return OB_FRAME_CONTEXT_ICONIFY;
     if (win == self->close)             return OB_FRAME_CONTEXT_CLOSE;

From d790dc162d24cfdcc236114b50c51af62612646a Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 20:48:28 -0500
Subject: [PATCH 50/79] check if a client will respond to pings

---
 openbox/client.c | 4 ++++
 openbox/client.h | 3 +++
 openbox/prop.c   | 2 +-
 openbox/prop.h   | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/openbox/client.c b/openbox/client.c
index 5e4e52e7..7019f690 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1507,6 +1507,10 @@ void client_update_protocols(ObClient *self)
                 /* if this protocol is requested, then the window will be
                    notified whenever we want it to receive focus */
                 self->focus_notify = TRUE;
+            else if (proto[i] == prop_atoms.net_wm_ping)
+                /* if this protocol is requested, then the window will allow
+                   pings to determine if it is still alive */
+                self->ping = TRUE;
 #ifdef SYNC
             else if (proto[i] == prop_atoms.net_wm_sync_request)
                 /* if this protocol is requested, then resizing the
diff --git a/openbox/client.h b/openbox/client.h
index e83a6b7a..49ff72bc 100644
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -220,6 +220,9 @@ struct _ObClient
     /*! Notify the window when it receives focus? */
     gboolean focus_notify;
 
+    /*! Will the client respond to pings? */
+    gboolean ping;
+
 #ifdef SYNC
     /*! The client wants to sync during resizes */
     gboolean sync_request;
diff --git a/openbox/prop.c b/openbox/prop.c
index 44abdfe6..1e343e16 100644
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -98,7 +98,7 @@ void prop_startup(void)
     CREATE(kde_net_wm_frame_strut, "_KDE_NET_WM_FRAME_STRUT");
     CREATE(net_frame_extents, "_NET_FRAME_EXTENTS");
 
-/*   CREATE(net_wm_ping, "_NET_WM_PING"); */
+    CREATE(net_wm_ping, "_NET_WM_PING");
 #ifdef SYNC
     CREATE(net_wm_sync_request, "_NET_WM_SYNC_REQUEST");
     CREATE(net_wm_sync_request_counter, "_NET_WM_SYNC_REQUEST_COUNTER");
diff --git a/openbox/prop.h b/openbox/prop.h
index f0c4f5e9..fd12f98a 100644
--- a/openbox/prop.h
+++ b/openbox/prop.h
@@ -136,7 +136,7 @@ typedef struct Atoms {
     Atom net_frame_extents;
 
     /* application protocols */
-/*  Atom net_wm_ping; */
+    Atom net_wm_ping;
 #ifdef SYNC
     Atom net_wm_sync_request;
     Atom net_wm_sync_request_counter;

From fb7a71da202632c7301ada67c8b4420bfb8d8fbe Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 21:40:15 -0500
Subject: [PATCH 51/79] can tell when a window that was "closed" has stopped
 responding now

---
 Makefile.am        |   2 +
 openbox/client.c   |  26 ++++----
 openbox/event.c    |   3 +
 openbox/mainloop.c |   4 +-
 openbox/ping.c     | 151 +++++++++++++++++++++++++++++++++++++++++++++
 openbox/ping.h     |  41 ++++++++++++
 openbox/prop.c     |  13 +++-
 openbox/prop.h     |   8 +++
 8 files changed, 231 insertions(+), 17 deletions(-)
 create mode 100644 openbox/ping.c
 create mode 100644 openbox/ping.h

diff --git a/Makefile.am b/Makefile.am
index 34ee07e4..6b474a65 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -243,6 +243,8 @@ openbox_openbox_SOURCES = \
 	openbox/mwm.h \
 	openbox/openbox.c \
 	openbox/openbox.h \
+	openbox/ping.c \
+	openbox/ping.h \
 	openbox/place.c \
 	openbox/place.h \
 	openbox/popup.c \
diff --git a/openbox/client.c b/openbox/client.c
index 7019f690..0f592ebe 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -3166,10 +3166,16 @@ void client_shade(ObClient *self, gboolean shade)
     frame_adjust_area(self->frame, FALSE, TRUE, FALSE);
 }
 
+static void client_ping_event(ObClient *self, gboolean dead)
+{
+    if (dead)
+        ob_debug("client 0x%x window 0x%x is not responding !!\n");
+    else
+        ob_debug("client 0x%x window 0x%x started responding again..\n");
+}
+
 void client_close(ObClient *self)
 {
-    XEvent ce;
-
     if (!(self->functions & OB_CLIENT_FUNC_CLOSE)) return;
 
     /* in the case that the client provides no means to requesting that it
@@ -3185,17 +3191,11 @@ void client_close(ObClient *self)
       explicitly killed.
     */
 
-    ce.xclient.type = ClientMessage;
-    ce.xclient.message_type =  prop_atoms.wm_protocols;
-    ce.xclient.display = ob_display;
-    ce.xclient.window = self->window;
-    ce.xclient.format = 32;
-    ce.xclient.data.l[0] = prop_atoms.wm_delete_window;
-    ce.xclient.data.l[1] = event_curtime;
-    ce.xclient.data.l[2] = 0l;
-    ce.xclient.data.l[3] = 0l;
-    ce.xclient.data.l[4] = 0l;
-    XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
+    PROP_MSG_TO(self->window, self->window, wm_protocols,
+                prop_atoms.wm_delete_window, event_curtime, 0, 0, 0,
+                NoEventMask);
+
+    ping_start(self, client_ping_event);
 }
 
 void client_kill(ObClient *self)
diff --git a/openbox/event.c b/openbox/event.c
index 44e0f532..5d85eaeb 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -767,6 +767,9 @@ static void event_handle_root(XEvent *e)
                 ob_restart();
             else if (e->xclient.data.l[0] == 3)
                 ob_exit(0);
+        } else if (msgtype == prop_atoms.wm_protocols) {
+            if (e->xclient.data.l[0] == prop_atoms.net_wm_ping)
+                ping_got_pong(e->xclient.data.l[1]);
         }
         break;
     case PropertyNotify:
diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 7c6a9566..c1ede830 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -560,7 +560,9 @@ void ob_main_loop_timeout_remove_data(ObMainLoop *loop, GSourceFunc handler,
 
     for (it = loop->timers; it; it = g_slist_next(it)) {
         ObMainLoopTimer *t = it->data;
-        if (t->func == handler && t->equal(t->data, data)) {
+        if (t->func == handler &&
+            (t->equal ? t->equal(t->data, data) : (t->data == data)))
+        {
             t->del_me = TRUE;
             if (cancel_dest)
                 t->destroy = NULL;
diff --git a/openbox/ping.c b/openbox/ping.c
new file mode 100644
index 00000000..d8c10c83
--- /dev/null
+++ b/openbox/ping.c
@@ -0,0 +1,151 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   client.h for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2008   Dana Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
+#include "ping.h"
+#include "client.h"
+#include "prop.h"
+#include "event.h"
+#include "mainloop.h"
+#include "openbox.h"
+
+typedef struct _ObPingTarget
+{
+    ObClient *client;
+    ObPingEventHandler h;
+    Time sent;
+    gint waiting;
+} ObPingTarget;
+
+static GSList *ping_targets = NULL;
+static gboolean active = FALSE;
+
+#define PING_TIMEOUT (G_USEC_PER_SEC * 1)
+/*! Warn the user after this many PING_TIMEOUT intervals */
+#define PING_TIMEOUT_WARN 3
+
+static void ping_send(ObPingTarget *t);
+static void ping_end(ObClient *client, gpointer data);
+static gboolean ping_timeout(gpointer data);
+
+void ping_start(struct _ObClient *client, ObPingEventHandler h)
+{
+    GSList *it;
+    ObPingTarget *t;
+
+    /* make sure we're not already pinging it */
+    for (it = ping_targets; it != NULL; it = g_slist_next(it)) {
+        t = it->data;
+        if (t->client == client) return;
+    }
+
+    t = g_new(ObPingTarget, 1);
+    t->client = client;
+    t->h = h;
+    t->waiting = 1; /* first wait for a reply */
+
+    ping_send(t);
+    ping_targets = g_slist_prepend(ping_targets, t);
+    ob_main_loop_timeout_add(ob_main_loop, PING_TIMEOUT, ping_timeout,
+                             t, NULL, NULL);
+
+    if (!active) {
+        active = TRUE;
+        /* listen for the client to disappear */
+        client_add_destroy_notify(ping_end, NULL);
+    }
+}
+
+void ping_stop(struct _ObClient *c)
+{
+    ping_end(c, NULL);
+}
+
+void ping_got_pong(Time timestamp)
+{
+    GSList *it;
+    ObPingTarget *t;
+
+    /* make sure we're not already pinging it */
+    for (it = ping_targets; it != NULL; it = g_slist_next(it)) {
+        t = it->data;
+        if (t->sent == timestamp) {
+            ob_debug("Got PONG with timestamp %lu\n", timestamp);
+            if (t->waiting > PING_TIMEOUT_WARN) {
+                /* we had notified that they weren't responding, so now we
+                   need to notify that they are again */
+                t->h(t->client, FALSE);
+            }
+            t->waiting = 0; /* not waiting for a reply anymore */
+            break;
+        }
+    }
+
+    if (it == NULL)
+        ob_debug("Got PONG with timestamp %lu but not waiting for one\n",
+                 timestamp);
+}
+
+static void ping_send(ObPingTarget *t)
+{
+    t->sent = event_get_server_time();
+    ob_debug("PINGing client 0x%x at %lu\n", t->client->window, t->sent);
+    PROP_MSG_TO(t->client->window, t->client->window, wm_protocols,
+                prop_atoms.net_wm_ping, t->sent, t->client->window, 0, 0,
+                NoEventMask);
+}
+
+static gboolean ping_timeout(gpointer data)
+{
+    ObPingTarget *t = data;
+
+    if (t->waiting == 0) { /* got a reply already */
+        /* send another ping to make sure it's still alive */
+        ping_send(t);
+    }
+
+    if (t->waiting == PING_TIMEOUT_WARN)
+        t->h(t->client, TRUE); /* notify that the client isn't responding */
+
+    ++t->waiting;
+
+    return TRUE; /* repeat */
+}
+
+static void ping_end(ObClient *client, gpointer data)
+{
+    GSList *it;
+    ObPingTarget *t;
+
+    for (it = ping_targets; it != NULL; it = g_slist_next(it)) {
+        t = it->data;
+        if (t->client == client) {
+            ping_targets = g_slist_remove_link(ping_targets, it);
+            ob_main_loop_timeout_remove_data(ob_main_loop, ping_timeout, t,
+                                             FALSE);
+            g_free(t);
+            break;
+        }
+    }
+
+    /* stop listening if we're not waiting for any more pings */
+    if (!ping_targets) {
+        active = TRUE;
+        client_remove_destroy_notify(ping_end);
+    }    
+}
diff --git a/openbox/ping.h b/openbox/ping.h
new file mode 100644
index 00000000..0b6dfead
--- /dev/null
+++ b/openbox/ping.h
@@ -0,0 +1,41 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   client.h for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2008   Dana Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
+#ifndef __ping_h
+#define __ping_h
+
+#include <X11/Xlib.h>
+#include <glib.h>
+
+struct _ObClient;
+
+/*!
+  Notifies when the client application isn't responding to pings, or when it
+  starts responding again.
+  @param dead TRUE if the app isn't responding, FALSE if it starts responding
+              again
+*/
+typedef void (*ObPingEventHandler) (struct _ObClient *c, gboolean dead);
+
+void ping_start(struct _ObClient *c, ObPingEventHandler h);
+void ping_stop(struct _ObClient *c);
+
+void ping_got_pong(Time timestamp);
+
+#endif
diff --git a/openbox/prop.c b/openbox/prop.c
index 1e343e16..b43dcd13 100644
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -446,6 +446,14 @@ void prop_erase(Window win, Atom prop)
 
 void prop_message(Window about, Atom messagetype, glong data0, glong data1,
                   glong data2, glong data3, glong mask)
+{
+    prop_message_to(RootWindow(ob_display, ob_screen), about, messagetype,
+                    data0, data1, data2, data3, 0, mask);
+}
+
+void prop_message_to(Window to, Window about, Atom messagetype,
+                     glong data0, glong data1, glong data2,
+                     glong data3, glong data4, glong mask)
 {
     XEvent ce;
     ce.xclient.type = ClientMessage;
@@ -457,7 +465,6 @@ void prop_message(Window about, Atom messagetype, glong data0, glong data1,
     ce.xclient.data.l[1] = data1;
     ce.xclient.data.l[2] = data2;
     ce.xclient.data.l[3] = data3;
-    ce.xclient.data.l[4] = 0;
-    XSendEvent(ob_display, RootWindow(ob_display, ob_screen), FALSE,
-               mask, &ce);
+    ce.xclient.data.l[4] = data4;
+    XSendEvent(ob_display, to, FALSE, mask, &ce);
 }
diff --git a/openbox/prop.h b/openbox/prop.h
index fd12f98a..13c338ef 100644
--- a/openbox/prop.h
+++ b/openbox/prop.h
@@ -218,6 +218,9 @@ void prop_erase(Window win, Atom prop);
 
 void prop_message(Window about, Atom messagetype, glong data0, glong data1,
                   glong data2, glong data3, glong mask);
+void prop_message_to(Window to, Window about, Atom messagetype,
+                     glong data0, glong data1, glong data2,
+                     glong data3, glong data4, glong mask);
 
 #define PROP_GET32(win, prop, type, ret) \
     (prop_get32(win, prop_atoms.prop, prop_atoms.type, ret))
@@ -244,4 +247,9 @@ void prop_message(Window about, Atom messagetype, glong data0, glong data1,
   (prop_message(about, prop_atoms.msgtype, data0, data1, data2, data3, \
                 SubstructureNotifyMask | SubstructureRedirectMask))
 
+#define PROP_MSG_TO(to, about, msgtype, data0, data1, data2, data3, data4, \
+                    mask) \
+    (prop_message_to(to, about, prop_atoms.msgtype,                        \
+                     data0, data1, data2, data3, data4, mask))
+
 #endif

From d3e9fc8941831477b50678b9bd676e29f4bed1a7 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 21:57:47 -0500
Subject: [PATCH 52/79] show [Not Responding] in the titlebar when closing an
 app and it stops responding to pings

---
 openbox/client.c | 23 ++++++++++++++++++-----
 openbox/client.h |  3 +++
 openbox/ping.c   |  2 ++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/openbox/client.c b/openbox/client.c
index 0f592ebe..a4d045dc 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -40,6 +40,7 @@
 #include "keyboard.h"
 #include "mouse.h"
 #include "render/render.h"
+#include "gettext.h"
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
@@ -93,6 +94,7 @@ static GSList *client_search_all_top_parents_internal(ObClient *self,
                                                       gboolean bylayer,
                                                       ObStackingLayer layer);
 static void client_call_notifies(ObClient *self, GSList *list);
+static void client_ping_event(ObClient *self, gboolean dead);
 
 
 void client_startup(gboolean reconfig)
@@ -1947,6 +1949,12 @@ void client_update_title(ObClient *self)
     } else
         visible = data;
 
+    if (self->not_responding) {
+        data = visible;
+        visible = g_strdup_printf("%s - [%s]", data, _("Not Responding"));
+        g_free(data);
+    }
+
     PROP_SETS(self->window, net_wm_visible_name, visible);
     self->title = visible;
 
@@ -1970,6 +1978,12 @@ void client_update_title(ObClient *self)
     } else
         visible = data;
 
+    if (self->not_responding) {
+        data = visible;
+        visible = g_strdup_printf("%s - [%s]", data, _("Not Responding"));
+        g_free(data);
+    }
+
     PROP_SETS(self->window, net_wm_visible_icon_name, visible);
     self->icon_title = visible;
 }
@@ -3168,10 +3182,8 @@ void client_shade(ObClient *self, gboolean shade)
 
 static void client_ping_event(ObClient *self, gboolean dead)
 {
-    if (dead)
-        ob_debug("client 0x%x window 0x%x is not responding !!\n");
-    else
-        ob_debug("client 0x%x window 0x%x started responding again..\n");
+    self->not_responding = dead;
+    client_update_title(self);
 }
 
 void client_close(ObClient *self)
@@ -3195,7 +3207,8 @@ void client_close(ObClient *self)
                 prop_atoms.wm_delete_window, event_curtime, 0, 0, 0,
                 NoEventMask);
 
-    ping_start(self, client_ping_event);
+    if (self->ping)
+        ping_start(self, client_ping_event);
 }
 
 void client_kill(ObClient *self)
diff --git a/openbox/client.h b/openbox/client.h
index 49ff72bc..672b3822 100644
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -222,6 +222,9 @@ struct _ObClient
 
     /*! Will the client respond to pings? */
     gboolean ping;
+    /*! Indicates if the client is trying to close but has stopped responding
+      to pings */
+    gboolean not_responding;
 
 #ifdef SYNC
     /*! The client wants to sync during resizes */
diff --git a/openbox/ping.c b/openbox/ping.c
index d8c10c83..687dd7f4 100644
--- a/openbox/ping.c
+++ b/openbox/ping.c
@@ -48,6 +48,8 @@ void ping_start(struct _ObClient *client, ObPingEventHandler h)
     GSList *it;
     ObPingTarget *t;
 
+    g_assert(client->ping == TRUE);
+
     /* make sure we're not already pinging it */
     for (it = ping_targets; it != NULL; it = g_slist_next(it)) {
         t = it->data;

From 07994cb2dcafe33db99da5f7234caefdc0baa809 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 22:00:21 -0500
Subject: [PATCH 53/79] when you close a window that you already tried to close
 and its not responding to pings, then do a kill the next time

---
 openbox/client.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/openbox/client.c b/openbox/client.c
index a4d045dc..517482c7 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -3195,20 +3195,16 @@ void client_close(ObClient *self)
     if (!self->delete_window)
         client_kill(self);
 
-    /*
-      XXX: itd be cool to do timeouts and shit here for killing the client's
-      process off
-      like... if the window is around after 5 seconds, then the close button
-      turns a nice red, and if this function is called again, the client is
-      explicitly killed.
-    */
+    if (self->not_responding)
+        client_kill(self);
+    else {
+        PROP_MSG_TO(self->window, self->window, wm_protocols,
+                    prop_atoms.wm_delete_window, event_curtime, 0, 0, 0,
+                    NoEventMask);
 
-    PROP_MSG_TO(self->window, self->window, wm_protocols,
-                prop_atoms.wm_delete_window, event_curtime, 0, 0, 0,
-                NoEventMask);
-
-    if (self->ping)
-        ping_start(self, client_ping_event);
+        if (self->ping)
+            ping_start(self, client_ping_event);
+    }
 }
 
 void client_kill(ObClient *self)

From e6d33facc8f02a068f62b4f60c2872589b620dab Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 22:13:16 -0500
Subject: [PATCH 54/79] when you close an app and it stops responding..  if you
 hit close again, it will try kill -TERM.  if that fails and you close again,
 it will kill -9 !  (assuming the app is running on the local host and
 provided its PID)

---
 openbox/client.c | 29 +++++++++++++++++++++++++----
 openbox/client.h |  8 ++++++++
 openbox/prop.c   |  2 +-
 openbox/prop.h   |  2 +-
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/openbox/client.c b/openbox/client.c
index 517482c7..d768ecc1 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -46,6 +46,10 @@
 #  include <unistd.h>
 #endif
 
+#ifdef HAVE_SIGNAL_H
+#  include <signal.h> /* for kill() */
+#endif
+
 #include <glib.h>
 #include <X11/Xutil.h>
 
@@ -2244,6 +2248,7 @@ static void client_get_session_ids(ObClient *self)
 
     if (got) {
         gchar localhost[128];
+        guint32 pid;
 
         gethostname(localhost, 127);
         localhost[127] = '\0';
@@ -2251,6 +2256,11 @@ static void client_get_session_ids(ObClient *self)
             self->client_machine = s;
         else
             g_free(s);
+
+        /* see if it has the PID set too (the PID requires that the
+           WM_CLIENT_MACHINE be set) */
+        if (PROP_GET32(self->window, net_wm_pid, cardinal, &pid))
+            self->pid = pid;
     }
 }
 
@@ -3193,9 +3203,10 @@ void client_close(ObClient *self)
     /* in the case that the client provides no means to requesting that it
        close, we just kill it */
     if (!self->delete_window)
-        client_kill(self);
-
-    if (self->not_responding)
+        /* don't use client_kill(), we should only kill based on PID in
+           response to a lack of PING replies */
+        XKillClient(ob_display, self->window);
+    else if (self->not_responding)
         client_kill(self);
     else {
         PROP_MSG_TO(self->window, self->window, wm_protocols,
@@ -3209,7 +3220,17 @@ void client_close(ObClient *self)
 
 void client_kill(ObClient *self)
 {
-    XKillClient(ob_display, self->window);
+    if (!self->client_machine && self->pid) {
+        /* running on the local host */
+        if (!self->kill_tried_term) {
+            kill(self->pid, SIGTERM);
+            self->kill_tried_term = TRUE;
+        }
+        else
+            kill(self->pid, SIGKILL); /* kill -9 */
+    }
+    else
+        XKillClient(ob_display, self->window);
 }
 
 void client_hilite(ObClient *self, gboolean hilite)
diff --git a/openbox/client.h b/openbox/client.h
index 672b3822..f568b008 100644
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -30,6 +30,10 @@
 #include <glib.h>
 #include <X11/Xlib.h>
 
+#ifdef HAVE_SYS_TYPES_H
+#  include <sys/types.h> /* for pid_t */
+#endif
+
 struct _ObFrame;
 struct _ObGroup;
 struct _ObSessionState;
@@ -115,6 +119,8 @@ struct _ObClient
     gchar *client_machine;
     /*! The command used to run the program. Pre-XSMP window identification. */
     gchar *wm_command;
+    /*! The PID of the process which owns the window */
+    pid_t pid;
 
     /*! The application that created the window */
     gchar *name;
@@ -225,6 +231,8 @@ struct _ObClient
     /*! Indicates if the client is trying to close but has stopped responding
       to pings */
     gboolean not_responding;
+    /*! We tried to kill the client with SIGTERM */
+    gboolean kill_tried_term;
 
 #ifdef SYNC
     /*! The client wants to sync during resizes */
diff --git a/openbox/prop.c b/openbox/prop.c
index b43dcd13..c4b8baea 100644
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -91,7 +91,7 @@ void prop_startup(void)
     CREATE(net_wm_strut_partial, "_NET_WM_STRUT_PARTIAL");
     CREATE(net_wm_icon, "_NET_WM_ICON");
     CREATE(net_wm_icon_geometry, "_NET_WM_ICON_GEOMETRY");
-/*   CREATE(net_wm_pid, "_NET_WM_PID"); */
+    CREATE(net_wm_pid, "_NET_WM_PID");
     CREATE(net_wm_allowed_actions, "_NET_WM_ALLOWED_ACTIONS");
     CREATE(net_wm_user_time, "_NET_WM_USER_TIME");
 /*    CREATE(net_wm_user_time_window, "_NET_WM_USER_TIME_WINDOW"); */
diff --git a/openbox/prop.h b/openbox/prop.h
index 13c338ef..92884144 100644
--- a/openbox/prop.h
+++ b/openbox/prop.h
@@ -129,7 +129,7 @@ typedef struct Atoms {
     Atom net_wm_strut_partial;
     Atom net_wm_icon;
     Atom net_wm_icon_geometry;
-/*  Atom net_wm_pid; */
+    Atom net_wm_pid;
     Atom net_wm_allowed_actions;
     Atom net_wm_user_time;
 /*  Atom net_wm_user_time_window; */

From dbce9ee24320baa01e62d88485fb536c8d9a5e55 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 22:15:45 -0500
Subject: [PATCH 55/79] its possible we did kill -TERM and it stayed alive and
 started responding again, so handle that case

---
 openbox/client.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/openbox/client.c b/openbox/client.c
index d768ecc1..5443b158 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -3213,8 +3213,13 @@ void client_close(ObClient *self)
                     prop_atoms.wm_delete_window, event_curtime, 0, 0, 0,
                     NoEventMask);
 
-        if (self->ping)
+        if (self->ping) {
+            /* may have tried to kill it earlier but the window is still
+               around and started responding again */
+            self->kill_tried_term = FALSE;
+
             ping_start(self, client_ping_event);
+        }
     }
 }
 

From 810afd8597da355039e289218abed6c062585870 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 22:34:04 -0500
Subject: [PATCH 56/79] ping all the windows every 3 seconds, and show "not
 responding" if they stop replying for 3 times (9-12 seconds).  show
 [Killing...] in the titlebar when trying to kill an app off

---
 openbox/client.c | 50 ++++++++++++++++++++++++++++++++++--------------
 openbox/client.h |  6 ++++--
 openbox/ping.c   |  6 +++---
 3 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/openbox/client.c b/openbox/client.c
index 5443b158..85f5e691 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -602,6 +602,9 @@ void client_manage(Window window)
     /* update the list hints */
     client_set_list();
 
+    /* watch for when the application stops responding */
+    if (self->ping) ping_start(self, client_ping_event);
+
     /* free the ObAppSettings shallow copy */
     g_free(settings);
 
@@ -683,6 +686,9 @@ void client_unmanage(ObClient *self)
     /* remove the window from our save set */
     XChangeSaveSet(ob_display, self->window, SetModeDelete);
 
+    /* stop pinging the window */
+    if (self->ping) ping_stop(self);
+
     /* update the focus lists */
     focus_order_remove(self);
     if (client_focused(self)) {
@@ -1955,7 +1961,10 @@ void client_update_title(ObClient *self)
 
     if (self->not_responding) {
         data = visible;
-        visible = g_strdup_printf("%s - [%s]", data, _("Not Responding"));
+        if (self->close_tried_term)
+            visible = g_strdup_printf("%s - [%s]", data, _("Killing..."));
+        else
+            visible = g_strdup_printf("%s - [%s]", data, _("Not Responding"));
         g_free(data);
     }
 
@@ -1984,7 +1993,10 @@ void client_update_title(ObClient *self)
 
     if (self->not_responding) {
         data = visible;
-        visible = g_strdup_printf("%s - [%s]", data, _("Not Responding"));
+        if (self->close_tried_term)
+            visible = g_strdup_printf("%s - [%s]", data, _("Killing..."));
+        else
+            visible = g_strdup_printf("%s - [%s]", data, _("Not Responding"));
         g_free(data);
     }
 
@@ -3194,6 +3206,14 @@ static void client_ping_event(ObClient *self, gboolean dead)
 {
     self->not_responding = dead;
     client_update_title(self);
+
+    if (!dead) {
+        /* the window has started responding again, so don't kill it the first
+           time they click on close, even if it stops responding again in the 
+           future */
+        self->close_tried_destroy = FALSE;
+        self->close_tried_term = FALSE;
+    }
 }
 
 void client_close(ObClient *self)
@@ -3206,20 +3226,14 @@ void client_close(ObClient *self)
         /* don't use client_kill(), we should only kill based on PID in
            response to a lack of PING replies */
         XKillClient(ob_display, self->window);
-    else if (self->not_responding)
+    else if (self->not_responding && self->close_tried_destroy)
         client_kill(self);
     else {
         PROP_MSG_TO(self->window, self->window, wm_protocols,
                     prop_atoms.wm_delete_window, event_curtime, 0, 0, 0,
                     NoEventMask);
-
-        if (self->ping) {
-            /* may have tried to kill it earlier but the window is still
-               around and started responding again */
-            self->kill_tried_term = FALSE;
-
-            ping_start(self, client_ping_event);
-        }
+        self->close_tried_destroy = TRUE;
+        self->close_tried_term = FALSE;
     }
 }
 
@@ -3227,12 +3241,20 @@ void client_kill(ObClient *self)
 {
     if (!self->client_machine && self->pid) {
         /* running on the local host */
-        if (!self->kill_tried_term) {
+        if (!self->close_tried_term) {
+            ob_debug("killing window 0x%x with pid %lu, with SIGTERM\n",
+                     self->window, self->pid);
             kill(self->pid, SIGTERM);
-            self->kill_tried_term = TRUE;
+            self->close_tried_term = TRUE;
+
+            /* show that we're trying to kill it */
+            client_update_title(self);
         }
-        else
+        else {
+            ob_debug("killing window 0x%x with pid %lu, with SIGKILL\n",
+                     self->window, self->pid);
             kill(self->pid, SIGKILL); /* kill -9 */
+        }
     }
     else
         XKillClient(ob_display, self->window);
diff --git a/openbox/client.h b/openbox/client.h
index f568b008..b9dd9e5a 100644
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -231,8 +231,10 @@ struct _ObClient
     /*! Indicates if the client is trying to close but has stopped responding
       to pings */
     gboolean not_responding;
-    /*! We tried to kill the client with SIGTERM */
-    gboolean kill_tried_term;
+    /*! We tried to close the window with a DESTROY message */
+    gboolean close_tried_destroy;
+    /*! We tried to close the window with a SIGTERM */
+    gboolean close_tried_term;
 
 #ifdef SYNC
     /*! The client wants to sync during resizes */
diff --git a/openbox/ping.c b/openbox/ping.c
index 687dd7f4..874d020c 100644
--- a/openbox/ping.c
+++ b/openbox/ping.c
@@ -35,7 +35,7 @@ typedef struct _ObPingTarget
 static GSList *ping_targets = NULL;
 static gboolean active = FALSE;
 
-#define PING_TIMEOUT (G_USEC_PER_SEC * 1)
+#define PING_TIMEOUT (G_USEC_PER_SEC * 3)
 /*! Warn the user after this many PING_TIMEOUT intervals */
 #define PING_TIMEOUT_WARN 3
 
@@ -87,7 +87,7 @@ void ping_got_pong(Time timestamp)
     for (it = ping_targets; it != NULL; it = g_slist_next(it)) {
         t = it->data;
         if (t->sent == timestamp) {
-            ob_debug("Got PONG with timestamp %lu\n", timestamp);
+            /*ob_debug("Got PONG with timestamp %lu\n", timestamp);*/
             if (t->waiting > PING_TIMEOUT_WARN) {
                 /* we had notified that they weren't responding, so now we
                    need to notify that they are again */
@@ -106,7 +106,7 @@ void ping_got_pong(Time timestamp)
 static void ping_send(ObPingTarget *t)
 {
     t->sent = event_get_server_time();
-    ob_debug("PINGing client 0x%x at %lu\n", t->client->window, t->sent);
+    /*ob_debug("PINGing client 0x%x at %lu\n", t->client->window, t->sent);*/
     PROP_MSG_TO(t->client->window, t->client->window, wm_protocols,
                 prop_atoms.net_wm_ping, t->sent, t->client->window, 0, 0,
                 NoEventMask);

From d5c824cfd4ec84155772a5c482b0ffdc99dc1ab9 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 22:36:45 -0500
Subject: [PATCH 57/79] only ping windows that we need to

---
 openbox/client.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/openbox/client.c b/openbox/client.c
index 85f5e691..1f7ce97b 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -602,8 +602,11 @@ void client_manage(Window window)
     /* update the list hints */
     client_set_list();
 
-    /* watch for when the application stops responding */
-    if (self->ping) ping_start(self, client_ping_event);
+    /* watch for when the application stops responding.  only do this for
+       normal windows, i.e. windows which have titlebars and close buttons 
+       and things like that */
+    if (self->ping && client_normal(self))
+        ping_start(self, client_ping_event);
 
     /* free the ObAppSettings shallow copy */
     g_free(settings);
@@ -687,7 +690,8 @@ void client_unmanage(ObClient *self)
     XChangeSaveSet(ob_display, self->window, SetModeDelete);
 
     /* stop pinging the window */
-    if (self->ping) ping_stop(self);
+    if (self->ping && client_normal(self))
+        ping_stop(self);
 
     /* update the focus lists */
     focus_order_remove(self);

From f9f32d9fbaae9ca415603bb61b36393994afbd16 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 22:51:04 -0500
Subject: [PATCH 58/79] cant consistently tell if we should use WM_DESTROY
 after the first time they try close a window.. so just kill when "not
 responding" is showing

---
 openbox/client.c | 10 +++-------
 openbox/client.h |  2 --
 openbox/ping.c   |  5 +++--
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/openbox/client.c b/openbox/client.c
index 1f7ce97b..2f8f58a9 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -3212,10 +3212,8 @@ static void client_ping_event(ObClient *self, gboolean dead)
     client_update_title(self);
 
     if (!dead) {
-        /* the window has started responding again, so don't kill it the first
-           time they click on close, even if it stops responding again in the 
-           future */
-        self->close_tried_destroy = FALSE;
+        /* try kill it nicely the first time again, if it started responding
+           at some point */
         self->close_tried_term = FALSE;
     }
 }
@@ -3230,14 +3228,12 @@ void client_close(ObClient *self)
         /* don't use client_kill(), we should only kill based on PID in
            response to a lack of PING replies */
         XKillClient(ob_display, self->window);
-    else if (self->not_responding && self->close_tried_destroy)
+    else if (self->not_responding)
         client_kill(self);
     else {
         PROP_MSG_TO(self->window, self->window, wm_protocols,
                     prop_atoms.wm_delete_window, event_curtime, 0, 0, 0,
                     NoEventMask);
-        self->close_tried_destroy = TRUE;
-        self->close_tried_term = FALSE;
     }
 }
 
diff --git a/openbox/client.h b/openbox/client.h
index b9dd9e5a..0efeb197 100644
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -231,8 +231,6 @@ struct _ObClient
     /*! Indicates if the client is trying to close but has stopped responding
       to pings */
     gboolean not_responding;
-    /*! We tried to close the window with a DESTROY message */
-    gboolean close_tried_destroy;
     /*! We tried to close the window with a SIGTERM */
     gboolean close_tried_term;
 
diff --git a/openbox/ping.c b/openbox/ping.c
index 874d020c..531b8938 100644
--- a/openbox/ping.c
+++ b/openbox/ping.c
@@ -87,7 +87,8 @@ void ping_got_pong(Time timestamp)
     for (it = ping_targets; it != NULL; it = g_slist_next(it)) {
         t = it->data;
         if (t->sent == timestamp) {
-            /*ob_debug("Got PONG with timestamp %lu\n", timestamp);*/
+            ob_debug("Got PONG with timestamp %lu for %s\n", timestamp,
+                t->client->title);
             if (t->waiting > PING_TIMEOUT_WARN) {
                 /* we had notified that they weren't responding, so now we
                    need to notify that they are again */
@@ -106,7 +107,7 @@ void ping_got_pong(Time timestamp)
 static void ping_send(ObPingTarget *t)
 {
     t->sent = event_get_server_time();
-    /*ob_debug("PINGing client 0x%x at %lu\n", t->client->window, t->sent);*/
+    ob_debug("PINGing client %s at %lu\n", t->client->title, t->sent);
     PROP_MSG_TO(t->client->window, t->client->window, wm_protocols,
                 prop_atoms.net_wm_ping, t->sent, t->client->window, 0, 0,
                 NoEventMask);

From 053558dc5ffa7f561d06cfd43926e19b4d4da422 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 22:53:05 -0500
Subject: [PATCH 59/79] add a comment

---
 openbox/client.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openbox/client.c b/openbox/client.c
index 2f8f58a9..c90c39bf 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -3230,11 +3230,11 @@ void client_close(ObClient *self)
         XKillClient(ob_display, self->window);
     else if (self->not_responding)
         client_kill(self);
-    else {
+    else
+        /* request the client to close with WM_DELETE_WINDOW */
         PROP_MSG_TO(self->window, self->window, wm_protocols,
                     prop_atoms.wm_delete_window, event_curtime, 0, 0, 0,
                     NoEventMask);
-    }
 }
 
 void client_kill(ObClient *self)

From 7bd8e97fbb751f2a4b9b4feea140a703540bc4e3 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 22:56:24 -0500
Subject: [PATCH 60/79] rework and comment out some debugging prints

---
 openbox/ping.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openbox/ping.c b/openbox/ping.c
index 531b8938..daabbfb5 100644
--- a/openbox/ping.c
+++ b/openbox/ping.c
@@ -87,8 +87,8 @@ void ping_got_pong(Time timestamp)
     for (it = ping_targets; it != NULL; it = g_slist_next(it)) {
         t = it->data;
         if (t->sent == timestamp) {
-            ob_debug("Got PONG with timestamp %lu for %s\n", timestamp,
-                t->client->title);
+            /*ob_debug("PONG: '%s' (timestamp %lu)\n", t->client->title,
+                     t->sent);*/
             if (t->waiting > PING_TIMEOUT_WARN) {
                 /* we had notified that they weren't responding, so now we
                    need to notify that they are again */
@@ -107,6 +107,7 @@ void ping_got_pong(Time timestamp)
 static void ping_send(ObPingTarget *t)
 {
     t->sent = event_get_server_time();
+    /*ob_debug("PING: '%s' (timestamp %lu)\n", t->client->title, t->sent);*/
     ob_debug("PINGing client %s at %lu\n", t->client->title, t->sent);
     PROP_MSG_TO(t->client->window, t->client->window, wm_protocols,
                 prop_atoms.net_wm_ping, t->sent, t->client->window, 0, 0,

From cfc8101333535e3336eff5e929839c5262231db6 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 Jan 2008 23:28:30 -0500
Subject: [PATCH 61/79] don't let repeating timers, with a very fast timer in
 the queue, cause the main loop to run the timers forever

---
 openbox/mainloop.c | 23 ++++++++++++++++++++---
 openbox/ping.c     |  2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index c1ede830..30ecbebd 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -104,6 +104,10 @@ struct _ObMainLoopTimer
     GTimeVal last;
     /* When this timer will next trigger */
     GTimeVal timeout;
+
+    /* Only allow a timer's function to fire once per run through the list,
+       so that it doesn't get locked in there forever */
+    gboolean fired;
 };
 
 struct _ObMainLoopSignalHandlerType
@@ -558,11 +562,11 @@ void ob_main_loop_timeout_remove_data(ObMainLoop *loop, GSourceFunc handler,
 {
     GSList *it;
 
+    ob_debug("removing data 0x%x\n", data);
     for (it = loop->timers; it; it = g_slist_next(it)) {
         ObMainLoopTimer *t = it->data;
-        if (t->func == handler &&
-            (t->equal ? t->equal(t->data, data) : (t->data == data)))
-        {
+        if (t->func == handler && t->equal(t->data, data)) {
+            ob_debug("found data 0x%x\n", data);
             t->del_me = TRUE;
             if (cancel_dest)
                 t->destroy = NULL;
@@ -599,6 +603,12 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
 
     g_get_current_time(&loop->now);
 
+    /* do this first, cuz the list can get reordered */
+    for (it = loop->timers; it; it = g_slist_next(it)) {
+        ObMainLoopTimer *curr = it->data;
+        curr->fired = FALSE;
+    }
+
     for (it = loop->timers; it; it = next) {
         ObMainLoopTimer *curr;
 
@@ -623,6 +633,12 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
         if (timecompare(&NEAREST_TIMEOUT(loop), &loop->now) < 0)
             break;
 
+        /* don't let it fire again this time around. otherwise, if the first
+           timer in the queue becomes ready, we'll loop on the later ones
+           forever if they repeat */
+        if (curr->fired)
+            continue;
+
         /* we set the last fired time to delay msec after the previous firing,
            then re-insert.  timers maintain their order and may trigger more
            than once if they've waited more than one delay's worth of time.
@@ -638,6 +654,7 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
             g_free(curr);
         }
 
+        curr->fired = TRUE;
         fired = TRUE;
     }
 
diff --git a/openbox/ping.c b/openbox/ping.c
index daabbfb5..d159805d 100644
--- a/openbox/ping.c
+++ b/openbox/ping.c
@@ -64,7 +64,7 @@ void ping_start(struct _ObClient *client, ObPingEventHandler h)
     ping_send(t);
     ping_targets = g_slist_prepend(ping_targets, t);
     ob_main_loop_timeout_add(ob_main_loop, PING_TIMEOUT, ping_timeout,
-                             t, NULL, NULL);
+                             t, g_direct_equal, NULL);
 
     if (!active) {
         active = TRUE;

From ba6dcc15f8893b1d72f185e838c3d34c62f335b4 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Wed, 16 Jan 2008 00:24:56 -0500
Subject: [PATCH 62/79] add the new pid and ping atoms to the NET_SUPPORTED
 list

---
 openbox/screen.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openbox/screen.c b/openbox/screen.c
index 379a12d8..b88562fe 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -289,6 +289,8 @@ gboolean screen_annex(void)
     supported[i++] = prop_atoms.net_wm_sync_request;
     supported[i++] = prop_atoms.net_wm_sync_request_counter;
 #endif
+    supported[i++] = prop_atoms.net_wm_pid;
+    supported[i++] = prop_atoms.net_wm_ping;
 
     supported[i++] = prop_atoms.kde_wm_change_state;
     supported[i++] = prop_atoms.kde_net_wm_frame_strut;

From ff78d28f8bcdbbdd42fe9501ee81185f67a4166a Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Wed, 16 Jan 2008 00:54:17 -0500
Subject: [PATCH 63/79] fix timers so that they work when theres lots of
 repeating timers in the queue..

---
 openbox/mainloop.c | 29 ++++++++---------------------
 openbox/ping.c     |  1 -
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 30ecbebd..825d3f4f 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -504,10 +504,8 @@ void ob_main_loop_fd_remove(ObMainLoop *loop,
 static glong timecompare(GTimeVal *a, GTimeVal *b)
 {
     glong r;
-
-    if ((r = b->tv_sec - a->tv_sec)) return r;
-    return b->tv_usec - a->tv_usec;
-
+    if ((r = a->tv_sec - b->tv_sec)) return r;
+    return a->tv_usec - b->tv_usec;
 }
 
 static void insert_timer(ObMainLoop *loop, ObMainLoopTimer *ins)
@@ -515,7 +513,7 @@ static void insert_timer(ObMainLoop *loop, ObMainLoopTimer *ins)
     GSList *it;
     for (it = loop->timers; it; it = g_slist_next(it)) {
         ObMainLoopTimer *t = it->data;
-        if (timecompare(&ins->timeout, &t->timeout) >= 0) {
+        if (timecompare(&ins->timeout, &t->timeout) <= 0) {
             loop->timers = g_slist_insert_before(loop->timers, it, ins);
             break;
         }
@@ -562,11 +560,9 @@ void ob_main_loop_timeout_remove_data(ObMainLoop *loop, GSourceFunc handler,
 {
     GSList *it;
 
-    ob_debug("removing data 0x%x\n", data);
     for (it = loop->timers; it; it = g_slist_next(it)) {
         ObMainLoopTimer *t = it->data;
         if (t->func == handler && t->equal(t->data, data)) {
-            ob_debug("found data 0x%x\n", data);
             t->del_me = TRUE;
             if (cancel_dest)
                 t->destroy = NULL;
@@ -603,12 +599,6 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
 
     g_get_current_time(&loop->now);
 
-    /* do this first, cuz the list can get reordered */
-    for (it = loop->timers; it; it = g_slist_next(it)) {
-        ObMainLoopTimer *curr = it->data;
-        curr->fired = FALSE;
-    }
-
     for (it = loop->timers; it; it = next) {
         ObMainLoopTimer *curr;
 
@@ -630,15 +620,9 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
 
         /* the queue is sorted, so if this timer shouldn't fire, none are
            ready */
-        if (timecompare(&NEAREST_TIMEOUT(loop), &loop->now) < 0)
+        if (timecompare(&NEAREST_TIMEOUT(loop), &loop->now) > 0)
             break;
 
-        /* don't let it fire again this time around. otherwise, if the first
-           timer in the queue becomes ready, we'll loop on the later ones
-           forever if they repeat */
-        if (curr->fired)
-            continue;
-
         /* we set the last fired time to delay msec after the previous firing,
            then re-insert.  timers maintain their order and may trigger more
            than once if they've waited more than one delay's worth of time.
@@ -654,7 +638,10 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
             g_free(curr);
         }
 
-        curr->fired = TRUE;
+        /* the timer queue has been shuffled, start from the beginning
+           (which is the next one to fire) */
+        next = loop->timers;
+
         fired = TRUE;
     }
 
diff --git a/openbox/ping.c b/openbox/ping.c
index d159805d..19922b25 100644
--- a/openbox/ping.c
+++ b/openbox/ping.c
@@ -108,7 +108,6 @@ static void ping_send(ObPingTarget *t)
 {
     t->sent = event_get_server_time();
     /*ob_debug("PING: '%s' (timestamp %lu)\n", t->client->title, t->sent);*/
-    ob_debug("PINGing client %s at %lu\n", t->client->title, t->sent);
     PROP_MSG_TO(t->client->window, t->client->window, wm_protocols,
                 prop_atoms.net_wm_ping, t->sent, t->client->window, 0, 0,
                 NoEventMask);

From cafba3acf3ef5b34be867a155ec05b35e82384e9 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Wed, 16 Jan 2008 01:16:47 -0500
Subject: [PATCH 64/79] active = FALSE when not active !

---
 openbox/ping.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openbox/ping.c b/openbox/ping.c
index 19922b25..d4217fdd 100644
--- a/openbox/ping.c
+++ b/openbox/ping.c
@@ -148,7 +148,7 @@ static void ping_end(ObClient *client, gpointer data)
 
     /* stop listening if we're not waiting for any more pings */
     if (!ping_targets) {
-        active = TRUE;
+        active = FALSE;
         client_remove_destroy_notify(ping_end);
     }    
 }

From 0be98fee4743c795b06aa23881b82eff5bab3ef6 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@comhem.se>
Date: Wed, 16 Jan 2008 15:25:08 +0100
Subject: [PATCH 65/79] Various fixes for sparse warnings.

Define void functions with (void), not ().
Add missing includes.
Some functions were declared static but defined non-static.
Some variables that should be file static were file global but not used in any other file.
prop.h defined a new prop_atoms in each file that included it instead of declaring it extern.
---
 openbox/actions.c                   |  2 +-
 openbox/client.c                    | 15 ++++++++++-----
 openbox/client_list_combined_menu.c |  2 +-
 openbox/event.c                     |  5 +++--
 openbox/focus_cycle_indicator.c     |  3 ++-
 openbox/keyboard.c                  |  2 +-
 openbox/mainloop.c                  |  4 ++--
 openbox/ping.c                      |  1 +
 openbox/prop.h                      |  2 +-
 openbox/resist.c                    |  1 +
 openbox/screen.c                    |  6 +++---
 openbox/stacking.c                  |  4 ++--
 openbox/translate.c                 |  1 +
 openbox/xerror.c                    |  1 +
 render/instance.c                   |  4 ++--
 15 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/openbox/actions.c b/openbox/actions.c
index 75d4af05..0c84489a 100644
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -124,7 +124,7 @@ static void actions_definition_unref(ObActionsDefinition *def)
     }
 }
 
-ObActionsAct* actions_build_act_from_string(const gchar *name)
+static ObActionsAct* actions_build_act_from_string(const gchar *name)
 {
     GSList *it;
     ObActionsDefinition *def = NULL;
diff --git a/openbox/client.c b/openbox/client.c
index c90c39bf..6a6ec2bd 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -24,6 +24,7 @@
 #include "xerror.h"
 #include "screen.h"
 #include "moveresize.h"
+#include "ping.h"
 #include "place.h"
 #include "prop.h"
 #include "extensions.h"
@@ -79,6 +80,10 @@ static void client_get_state(ObClient *self);
 static void client_get_shaped(ObClient *self);
 static void client_get_mwm_hints(ObClient *self);
 static void client_get_colormap(ObClient *self);
+static void client_set_desktop_recursive(ObClient *self,
+                                         guint target,
+                                         gboolean donthide,
+                                         gboolean dontraise);
 static void client_change_allowed_actions(ObClient *self);
 static void client_change_state(ObClient *self);
 static void client_change_wm_state(ObClient *self);
@@ -1551,7 +1556,7 @@ void client_update_sync_request_counter(ObClient *self)
 }
 #endif
 
-void client_get_colormap(ObClient *self)
+static void client_get_colormap(ObClient *self)
 {
     XWindowAttributes wa;
 
@@ -3276,10 +3281,10 @@ void client_hilite(ObClient *self, gboolean hilite)
     }
 }
 
-void client_set_desktop_recursive(ObClient *self,
-                                  guint target,
-                                  gboolean donthide,
-                                  gboolean dontraise)
+static void client_set_desktop_recursive(ObClient *self,
+                                         guint target,
+                                         gboolean donthide,
+                                         gboolean dontraise)
 {
     guint old;
     GSList *it;
diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index 194c927e..f7fc36b8 100644
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -30,7 +30,7 @@
 
 #define MENU_NAME "client-list-combined-menu"
 
-ObMenu *combined_menu;
+static ObMenu *combined_menu;
 
 #define SEPARATOR -1
 #define ADD_DESKTOP -2
diff --git a/openbox/event.c b/openbox/event.c
index 5d85eaeb..f4ebfa47 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -43,6 +43,7 @@
 #include "stacking.h"
 #include "extensions.h"
 #include "translate.h"
+#include "ping.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -102,8 +103,8 @@ static void focus_delay_client_dest(ObClient *client, gpointer data);
 Time event_curtime = CurrentTime;
 Time event_last_user_time = CurrentTime;
 /*! The serial of the current X event */
-gulong event_curserial;
 
+static gulong event_curserial;
 static gboolean focus_left_screen = FALSE;
 /*! A list of ObSerialRanges which are to be ignored for mouse enter events */
 static GSList *ignore_serials = NULL;
@@ -1917,7 +1918,7 @@ static void focus_delay_client_dest(ObClient *client, gpointer data)
                                      client, FALSE);
 }
 
-void event_halt_focus_delay()
+void event_halt_focus_delay(void)
 {
     /* ignore all enter events up till the event which caused this to occur */
     if (event_curserial) event_ignore_enter_range(1, event_curserial);
diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c
index 340abec6..0aa65a75 100644
--- a/openbox/focus_cycle_indicator.c
+++ b/openbox/focus_cycle_indicator.c
@@ -18,6 +18,7 @@
 */
 
 #include "focus_cycle.h"
+#include "focus_cycle_indicator.h"
 #include "client.h"
 #include "openbox.h"
 #include "frame.h"
@@ -29,7 +30,7 @@
 
 #define FOCUS_INDICATOR_WIDTH 6
 
-struct
+static struct
 {
     InternalWindow top;
     InternalWindow left;
diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index eddda577..4c570dfb 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -265,7 +265,7 @@ void keyboard_event(ObClient *client, const XEvent *e)
     }
 }
 
-void keyboard_rebind()
+void keyboard_rebind(void)
 {
     tree_rebind(keyboard_firstnode);
     grab_keys(TRUE);
diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 825d3f4f..f78f5b12 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -39,13 +39,13 @@ typedef struct _ObMainLoopFdHandlerType     ObMainLoopFdHandlerType;
 static GSList *all_loops;
 
 /* signals are global to all loops */
-struct {
+static struct {
     guint installed; /* a ref count */
     struct sigaction oldact;
 } all_signals[NUM_SIGNALS];
 
 /* a set of all possible signals */
-sigset_t all_signals_set;
+static sigset_t all_signals_set;
 
 /* signals which cause a core dump, these can't be used for callbacks */
 static gint core_signals[] =
diff --git a/openbox/ping.c b/openbox/ping.c
index d4217fdd..eed09479 100644
--- a/openbox/ping.c
+++ b/openbox/ping.c
@@ -21,6 +21,7 @@
 #include "client.h"
 #include "prop.h"
 #include "event.h"
+#include "debug.h"
 #include "mainloop.h"
 #include "openbox.h"
 
diff --git a/openbox/prop.h b/openbox/prop.h
index 92884144..5ca70470 100644
--- a/openbox/prop.h
+++ b/openbox/prop.h
@@ -196,7 +196,7 @@ typedef struct Atoms {
     Atom ob_theme;
     Atom ob_control;
 } Atoms;
-Atoms prop_atoms;
+extern Atoms prop_atoms;
 
 void prop_startup();
 
diff --git a/openbox/resist.c b/openbox/resist.c
index 62c2b293..f21eb8e6 100644
--- a/openbox/resist.c
+++ b/openbox/resist.c
@@ -23,6 +23,7 @@
 #include "screen.h"
 #include "dock.h"
 #include "config.h"
+#include "resist.h"
 #include "parser/parse.h"
 
 #include <glib.h>
diff --git a/openbox/screen.c b/openbox/screen.c
index b88562fe..e008ffe5 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -60,15 +60,15 @@ guint    screen_num_desktops;
 guint    screen_num_monitors;
 guint    screen_desktop;
 guint    screen_last_desktop = 1;
-guint    screen_old_desktop;
-gboolean screen_desktop_timeout = TRUE;
-Size     screen_physical_size;
 gboolean screen_showing_desktop;
 ObDesktopLayout screen_desktop_layout;
 gchar  **screen_desktop_names;
 Window   screen_support_win;
 Time     screen_desktop_user_time = CurrentTime;
 
+static Size     screen_physical_size;
+static guint    screen_old_desktop;
+static gboolean screen_desktop_timeout = TRUE;
 /*! An array of desktops, holding array of areas per monitor */
 static Rect  *monitor_area = NULL;
 /*! An array of desktops, holding an array of struts */
diff --git a/openbox/stacking.c b/openbox/stacking.c
index 34ab0588..b18c02af 100644
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -31,7 +31,7 @@ GList  *stacking_list = NULL;
 /*! When true, stacking changes will not be reflected on the screen.  This is
   to freeze the on-screen stacking order while a window is being temporarily
   raised during focus cycling */
-gboolean pause_changes = FALSE;
+static gboolean pause_changes = FALSE;
 
 void stacking_set_list(void)
 {
@@ -134,7 +134,7 @@ void stacking_temp_raise(ObWindow *window)
     pause_changes = TRUE;
 }
 
-void stacking_restore()
+void stacking_restore(void)
 {
     Window *win;
     GList *it;
diff --git a/openbox/translate.c b/openbox/translate.c
index b2ae7d67..c697679d 100644
--- a/openbox/translate.c
+++ b/openbox/translate.c
@@ -20,6 +20,7 @@
 #include "openbox.h"
 #include "mouse.h"
 #include "modkeys.h"
+#include "translate.h"
 #include "gettext.h"
 #include <glib.h>
 #include <string.h>
diff --git a/openbox/xerror.c b/openbox/xerror.c
index 6e884607..2657b8ea 100644
--- a/openbox/xerror.c
+++ b/openbox/xerror.c
@@ -20,6 +20,7 @@
 #include "openbox.h"
 #include "gettext.h"
 #include "debug.h"
+#include "xerror.h"
 #include <glib.h>
 #include <X11/Xlib.h>
 
diff --git a/render/instance.c b/render/instance.c
index 91f9db77..b867815c 100644
--- a/render/instance.c
+++ b/render/instance.c
@@ -91,7 +91,7 @@ RrInstance* RrInstanceNew (Display *display, gint screen)
     return definst;
 }
 
-void RrTrueColorSetup (RrInstance *inst)
+static void RrTrueColorSetup (RrInstance *inst)
 {
   gulong red_mask, green_mask, blue_mask;
   XImage *timage = NULL;
@@ -121,7 +121,7 @@ void RrTrueColorSetup (RrInstance *inst)
 
 #define RrPseudoNcolors(inst) (1 << (inst->pseudo_bpc * 3))
 
-void RrPseudoColorSetup (RrInstance *inst)
+static void RrPseudoColorSetup (RrInstance *inst)
 {
     XColor icolors[256];
     gint tr, tg, tb, n, r, g, b, i, incolors, ii;

From 9e18dbe0eed4f23909a0566dbc8b55b1bac470b8 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Wed, 16 Jan 2008 10:31:12 -0500
Subject: [PATCH 66/79] friendly check for the timer's delay being > 0

---
 openbox/mainloop.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index f78f5b12..b2921207 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -530,6 +530,9 @@ void ob_main_loop_timeout_add(ObMainLoop *loop,
                               GDestroyNotify notify)
 {
     ObMainLoopTimer *t = g_new(ObMainLoopTimer, 1);
+
+    g_assert(microseconds > 0); /* if it's 0 it'll cause an infinite loop */
+
     t->delay = microseconds;
     t->func = handler;
     t->data = data;

From 2ee4251092a70af6a7c1826aaef01506dfcbf556 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Wed, 16 Jan 2008 18:16:49 -0500
Subject: [PATCH 67/79] use unique IDs for pings rather than a timestamp. 
 avoids duplicates.

---
 openbox/ping.c | 19 +++++++++----------
 openbox/ping.h |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/openbox/ping.c b/openbox/ping.c
index eed09479..92fb8630 100644
--- a/openbox/ping.c
+++ b/openbox/ping.c
@@ -29,12 +29,13 @@ typedef struct _ObPingTarget
 {
     ObClient *client;
     ObPingEventHandler h;
-    Time sent;
+    guint32 id;
     gint waiting;
 } ObPingTarget;
 
 static GSList *ping_targets = NULL;
 static gboolean active = FALSE;
+static guint32 ping_next_id = 1;
 
 #define PING_TIMEOUT (G_USEC_PER_SEC * 3)
 /*! Warn the user after this many PING_TIMEOUT intervals */
@@ -79,7 +80,7 @@ void ping_stop(struct _ObClient *c)
     ping_end(c, NULL);
 }
 
-void ping_got_pong(Time timestamp)
+void ping_got_pong(guint32 id)
 {
     GSList *it;
     ObPingTarget *t;
@@ -87,9 +88,8 @@ void ping_got_pong(Time timestamp)
     /* make sure we're not already pinging it */
     for (it = ping_targets; it != NULL; it = g_slist_next(it)) {
         t = it->data;
-        if (t->sent == timestamp) {
-            /*ob_debug("PONG: '%s' (timestamp %lu)\n", t->client->title,
-                     t->sent);*/
+        if (t->id == id) {
+            /*g_print("-PONG: '%s' (id %u)\n", t->client->title, t->id);*/
             if (t->waiting > PING_TIMEOUT_WARN) {
                 /* we had notified that they weren't responding, so now we
                    need to notify that they are again */
@@ -101,16 +101,15 @@ void ping_got_pong(Time timestamp)
     }
 
     if (it == NULL)
-        ob_debug("Got PONG with timestamp %lu but not waiting for one\n",
-                 timestamp);
+        ob_debug("Got PONG with id %u but not waiting for one\n", id);
 }
 
 static void ping_send(ObPingTarget *t)
 {
-    t->sent = event_get_server_time();
-    /*ob_debug("PING: '%s' (timestamp %lu)\n", t->client->title, t->sent);*/
+    t->id = ping_next_id++;
+    /*g_print("+PING: '%s' (id %u)\n", t->client->title, t->id);*/
     PROP_MSG_TO(t->client->window, t->client->window, wm_protocols,
-                prop_atoms.net_wm_ping, t->sent, t->client->window, 0, 0,
+                prop_atoms.net_wm_ping, t->id, t->client->window, 0, 0,
                 NoEventMask);
 }
 
diff --git a/openbox/ping.h b/openbox/ping.h
index 0b6dfead..9f5c157b 100644
--- a/openbox/ping.h
+++ b/openbox/ping.h
@@ -36,6 +36,6 @@ typedef void (*ObPingEventHandler) (struct _ObClient *c, gboolean dead);
 void ping_start(struct _ObClient *c, ObPingEventHandler h);
 void ping_stop(struct _ObClient *c);
 
-void ping_got_pong(Time timestamp);
+void ping_got_pong(guint32 id);
 
 #endif

From 299687110d478a4928932f72031c345b27a01840 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Wed, 16 Jan 2008 18:44:22 -0500
Subject: [PATCH 68/79] use hash tables in ping.[ch] instead of a list. we're
 pinging every window, not just windows youre trying to close, so don't use
 datastructures that suck with lots of windows..

---
 openbox/event.c   |   2 +-
 openbox/openbox.c |   3 ++
 openbox/ping.c    | 119 ++++++++++++++++++++++++----------------------
 openbox/ping.h    |   3 ++
 4 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/openbox/event.c b/openbox/event.c
index f4ebfa47..025f1188 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -769,7 +769,7 @@ static void event_handle_root(XEvent *e)
             else if (e->xclient.data.l[0] == 3)
                 ob_exit(0);
         } else if (msgtype == prop_atoms.wm_protocols) {
-            if (e->xclient.data.l[0] == prop_atoms.net_wm_ping)
+            if ((Atom)e->xclient.data.l[0] == prop_atoms.net_wm_ping)
                 ping_got_pong(e->xclient.data.l[1]);
         }
         break;
diff --git a/openbox/openbox.c b/openbox/openbox.c
index 30a26609..48f31f91 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -43,6 +43,7 @@
 #include "grab.h"
 #include "group.h"
 #include "config.h"
+#include "ping.h"
 #include "mainloop.h"
 #include "gettext.h"
 #include "parser/parse.h"
@@ -301,6 +302,7 @@ gint main(gint argc, gchar **argv)
             screen_startup(reconfigure);
             grab_startup(reconfigure);
             group_startup(reconfigure);
+            ping_startup(reconfigure);
             client_startup(reconfigure);
             dock_startup(reconfigure);
             moveresize_startup(reconfigure);
@@ -360,6 +362,7 @@ gint main(gint argc, gchar **argv)
             moveresize_shutdown(reconfigure);
             dock_shutdown(reconfigure);
             client_shutdown(reconfigure);
+            ping_shutdown(reconfigure);
             group_shutdown(reconfigure);
             grab_shutdown(reconfigure);
             screen_shutdown(reconfigure);
diff --git a/openbox/ping.c b/openbox/ping.c
index 92fb8630..065cb60a 100644
--- a/openbox/ping.c
+++ b/openbox/ping.c
@@ -33,46 +33,59 @@ typedef struct _ObPingTarget
     gint waiting;
 } ObPingTarget;
 
-static GSList *ping_targets = NULL;
-static gboolean active = FALSE;
-static guint32 ping_next_id = 1;
+static GHashTable *ping_targets = NULL;
+static GHashTable *ping_ids     = NULL;
+static guint32     ping_next_id = 1;
 
 #define PING_TIMEOUT (G_USEC_PER_SEC * 3)
 /*! Warn the user after this many PING_TIMEOUT intervals */
 #define PING_TIMEOUT_WARN 3
 
-static void ping_send(ObPingTarget *t);
-static void ping_end(ObClient *client, gpointer data);
+static void     ping_send(ObPingTarget *t);
+static void     ping_end(ObClient *client, gpointer data);
 static gboolean ping_timeout(gpointer data);
 
+void ping_startup(gboolean reconfigure)
+{
+    if (reconfigure) return;
+
+    ping_targets = g_hash_table_new(g_direct_hash, g_int_equal);
+    ping_ids = g_hash_table_new(g_direct_hash, g_int_equal);
+
+    /* listen for clients to disappear */
+    client_add_destroy_notify(ping_end, NULL);
+}
+
+void ping_shutdown(gboolean reconfigure)
+{
+    if (reconfigure) return;
+
+    g_hash_table_unref(ping_targets);
+    g_hash_table_unref(ping_ids);
+
+    client_remove_destroy_notify(ping_end);
+}
+
 void ping_start(struct _ObClient *client, ObPingEventHandler h)
 {
-    GSList *it;
     ObPingTarget *t;
 
     g_assert(client->ping == TRUE);
 
     /* make sure we're not already pinging it */
-    for (it = ping_targets; it != NULL; it = g_slist_next(it)) {
-        t = it->data;
-        if (t->client == client) return;
-    }
+    g_assert(g_hash_table_lookup(ping_targets, &client) == NULL);
 
-    t = g_new(ObPingTarget, 1);
+    t = g_new0(ObPingTarget, 1);
     t->client = client;
     t->h = h;
-    t->waiting = 1; /* first wait for a reply */
 
-    ping_send(t);
-    ping_targets = g_slist_prepend(ping_targets, t);
+    g_hash_table_insert(ping_targets, &t->client, t);
+
     ob_main_loop_timeout_add(ob_main_loop, PING_TIMEOUT, ping_timeout,
                              t, g_direct_equal, NULL);
-
-    if (!active) {
-        active = TRUE;
-        /* listen for the client to disappear */
-        client_add_destroy_notify(ping_end, NULL);
-    }
+    /* act like we just timed out immediately, to start the pinging process
+       now instead of after the first delay */
+    ping_timeout(t);
 }
 
 void ping_stop(struct _ObClient *c)
@@ -82,31 +95,35 @@ void ping_stop(struct _ObClient *c)
 
 void ping_got_pong(guint32 id)
 {
-    GSList *it;
     ObPingTarget *t;
 
-    /* make sure we're not already pinging it */
-    for (it = ping_targets; it != NULL; it = g_slist_next(it)) {
-        t = it->data;
-        if (t->id == id) {
-            /*g_print("-PONG: '%s' (id %u)\n", t->client->title, t->id);*/
-            if (t->waiting > PING_TIMEOUT_WARN) {
-                /* we had notified that they weren't responding, so now we
-                   need to notify that they are again */
-                t->h(t->client, FALSE);
-            }
-            t->waiting = 0; /* not waiting for a reply anymore */
-            break;
+    if ((t = g_hash_table_lookup(ping_ids, &id))) {
+        /*g_print("-PONG: '%s' (id %u)\n", t->client->title, t->id);*/
+        if (t->waiting > PING_TIMEOUT_WARN) {
+            /* we had notified that they weren't responding, so now we
+               need to notify that they are again */
+            t->h(t->client, FALSE);
         }
+        t->waiting = 0; /* not waiting for a reply anymore */
     }
-
-    if (it == NULL)
+    else
         ob_debug("Got PONG with id %u but not waiting for one\n", id);
 }
 
 static void ping_send(ObPingTarget *t)
 {
-    t->id = ping_next_id++;
+    /* t->id is 0 when it hasn't been assigned an id ever yet.
+       we can reuse ids when t->waiting == 0, because we won't be getting a
+       pong for that id in the future again.  that way for apps that aren't
+       timing out we don't need to remove/add them from/to the hash table */
+    if (t->id == 0 || t->waiting > 0) {
+        /* pick an id, and reinsert in the hash table with the new id */
+        if (t->id) g_hash_table_remove(ping_ids, &t->id);
+        t->id = ping_next_id;
+        if (++ping_next_id == 0) ++ping_next_id; /* skip 0 on wraparound */
+        g_hash_table_insert(ping_ids, &t->id, t);
+    }
+
     /*g_print("+PING: '%s' (id %u)\n", t->client->title, t->id);*/
     PROP_MSG_TO(t->client->window, t->client->window, wm_protocols,
                 prop_atoms.net_wm_ping, t->id, t->client->window, 0, 0,
@@ -117,11 +134,9 @@ static gboolean ping_timeout(gpointer data)
 {
     ObPingTarget *t = data;
 
-    if (t->waiting == 0) { /* got a reply already */
-        /* send another ping to make sure it's still alive */
-        ping_send(t);
-    }
+    ping_send(t);
 
+    /* if the client hasn't been responding then do something about it */
     if (t->waiting == PING_TIMEOUT_WARN)
         t->h(t->client, TRUE); /* notify that the client isn't responding */
 
@@ -132,23 +147,15 @@ static gboolean ping_timeout(gpointer data)
 
 static void ping_end(ObClient *client, gpointer data)
 {
-    GSList *it;
     ObPingTarget *t;
 
-    for (it = ping_targets; it != NULL; it = g_slist_next(it)) {
-        t = it->data;
-        if (t->client == client) {
-            ping_targets = g_slist_remove_link(ping_targets, it);
-            ob_main_loop_timeout_remove_data(ob_main_loop, ping_timeout, t,
-                                             FALSE);
-            g_free(t);
-            break;
-        }
-    }
+    t = g_hash_table_lookup(ping_targets, &client);
+    g_assert(t);
 
-    /* stop listening if we're not waiting for any more pings */
-    if (!ping_targets) {
-        active = FALSE;
-        client_remove_destroy_notify(ping_end);
-    }    
+    g_hash_table_remove(ping_targets, &t->client);
+    g_hash_table_remove(ping_ids, &t->id);
+
+    ob_main_loop_timeout_remove_data(ob_main_loop, ping_timeout, t, FALSE);
+
+    g_free(t);
 }
diff --git a/openbox/ping.h b/openbox/ping.h
index 9f5c157b..1333ea0f 100644
--- a/openbox/ping.h
+++ b/openbox/ping.h
@@ -33,6 +33,9 @@ struct _ObClient;
 */
 typedef void (*ObPingEventHandler) (struct _ObClient *c, gboolean dead);
 
+void ping_startup(gboolean reconfigure);
+void ping_shutdown(gboolean reconfigure);
+
 void ping_start(struct _ObClient *c, ObPingEventHandler h);
 void ping_stop(struct _ObClient *c);
 

From 7630f660350bc39d0535a5aeb1da69ba25baf26b Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Wed, 16 Jan 2008 18:53:15 -0500
Subject: [PATCH 69/79] only 1 hash table is needed in ping.c

---
 openbox/ping.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/openbox/ping.c b/openbox/ping.c
index 065cb60a..16f95adb 100644
--- a/openbox/ping.c
+++ b/openbox/ping.c
@@ -33,7 +33,6 @@ typedef struct _ObPingTarget
     gint waiting;
 } ObPingTarget;
 
-static GHashTable *ping_targets = NULL;
 static GHashTable *ping_ids     = NULL;
 static guint32     ping_next_id = 1;
 
@@ -44,12 +43,12 @@ static guint32     ping_next_id = 1;
 static void     ping_send(ObPingTarget *t);
 static void     ping_end(ObClient *client, gpointer data);
 static gboolean ping_timeout(gpointer data);
+static gboolean find_client(gpointer key, gpointer value, gpointer client);
 
 void ping_startup(gboolean reconfigure)
 {
     if (reconfigure) return;
 
-    ping_targets = g_hash_table_new(g_direct_hash, g_int_equal);
     ping_ids = g_hash_table_new(g_direct_hash, g_int_equal);
 
     /* listen for clients to disappear */
@@ -60,7 +59,6 @@ void ping_shutdown(gboolean reconfigure)
 {
     if (reconfigure) return;
 
-    g_hash_table_unref(ping_targets);
     g_hash_table_unref(ping_ids);
 
     client_remove_destroy_notify(ping_end);
@@ -70,17 +68,14 @@ void ping_start(struct _ObClient *client, ObPingEventHandler h)
 {
     ObPingTarget *t;
 
-    g_assert(client->ping == TRUE);
+    g_assert(g_hash_table_find(ping_ids, find_client, client) == NULL);
 
-    /* make sure we're not already pinging it */
-    g_assert(g_hash_table_lookup(ping_targets, &client) == NULL);
+    g_assert(client->ping == TRUE);
 
     t = g_new0(ObPingTarget, 1);
     t->client = client;
     t->h = h;
 
-    g_hash_table_insert(ping_targets, &t->client, t);
-
     ob_main_loop_timeout_add(ob_main_loop, PING_TIMEOUT, ping_timeout,
                              t, g_direct_equal, NULL);
     /* act like we just timed out immediately, to start the pinging process
@@ -110,6 +105,12 @@ void ping_got_pong(guint32 id)
         ob_debug("Got PONG with id %u but not waiting for one\n", id);
 }
 
+static gboolean find_client(gpointer key, gpointer value, gpointer client)
+{
+    ObPingTarget *t = value;
+    return t->client == client;
+}
+
 static void ping_send(ObPingTarget *t)
 {
     /* t->id is 0 when it hasn't been assigned an id ever yet.
@@ -149,10 +150,9 @@ static void ping_end(ObClient *client, gpointer data)
 {
     ObPingTarget *t;
 
-    t = g_hash_table_lookup(ping_targets, &client);
-    g_assert(t);
+    t = g_hash_table_find(ping_ids, find_client, client);
+    g_assert (t != NULL);
 
-    g_hash_table_remove(ping_targets, &t->client);
     g_hash_table_remove(ping_ids, &t->id);
 
     ob_main_loop_timeout_remove_data(ob_main_loop, ping_timeout, t, FALSE);

From cccc57fdb04b2e5602254f1eb623acc95f9a032e Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Wed, 16 Jan 2008 19:21:42 -0500
Subject: [PATCH 70/79] make the ping hash tables work correctly.  don't need
 to stop pinging, it will automatically.  and not all windows get pings, even
 tho we get notified that they are being destroyed

---
 openbox/client.c |  9 ++++-----
 openbox/ping.c   | 25 +++++++++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/openbox/client.c b/openbox/client.c
index 6a6ec2bd..63245a3c 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -609,7 +609,10 @@ void client_manage(Window window)
 
     /* watch for when the application stops responding.  only do this for
        normal windows, i.e. windows which have titlebars and close buttons 
-       and things like that */
+       and things like that.
+       we don't need to stop pinging on unmanage, because it will be handled
+       automatically by the destroy callback!
+    */
     if (self->ping && client_normal(self))
         ping_start(self, client_ping_event);
 
@@ -694,10 +697,6 @@ void client_unmanage(ObClient *self)
     /* remove the window from our save set */
     XChangeSaveSet(ob_display, self->window, SetModeDelete);
 
-    /* stop pinging the window */
-    if (self->ping && client_normal(self))
-        ping_stop(self);
-
     /* update the focus lists */
     focus_order_remove(self);
     if (client_focused(self)) {
diff --git a/openbox/ping.c b/openbox/ping.c
index 16f95adb..37b5d30c 100644
--- a/openbox/ping.c
+++ b/openbox/ping.c
@@ -49,7 +49,7 @@ void ping_startup(gboolean reconfigure)
 {
     if (reconfigure) return;
 
-    ping_ids = g_hash_table_new(g_direct_hash, g_int_equal);
+    ping_ids = g_hash_table_new(g_int_hash, g_int_equal);
 
     /* listen for clients to disappear */
     client_add_destroy_notify(ping_end, NULL);
@@ -60,6 +60,7 @@ void ping_shutdown(gboolean reconfigure)
     if (reconfigure) return;
 
     g_hash_table_unref(ping_ids);
+    ping_ids = NULL;
 
     client_remove_destroy_notify(ping_end);
 }
@@ -68,6 +69,7 @@ void ping_start(struct _ObClient *client, ObPingEventHandler h)
 {
     ObPingTarget *t;
 
+    /* make sure we're not already pinging the client */
     g_assert(g_hash_table_find(ping_ids, find_client, client) == NULL);
 
     g_assert(client->ping == TRUE);
@@ -79,8 +81,12 @@ void ping_start(struct _ObClient *client, ObPingEventHandler h)
     ob_main_loop_timeout_add(ob_main_loop, PING_TIMEOUT, ping_timeout,
                              t, g_direct_equal, NULL);
     /* act like we just timed out immediately, to start the pinging process
-       now instead of after the first delay */
+       now instead of after the first delay.  this makes sure the client
+       ends up in the ping_ids hash table now. */
     ping_timeout(t);
+
+    /* make sure we can remove the client later */
+    g_assert(g_hash_table_find(ping_ids, find_client, client) != NULL);
 }
 
 void ping_stop(struct _ObClient *c)
@@ -93,7 +99,7 @@ void ping_got_pong(guint32 id)
     ObPingTarget *t;
 
     if ((t = g_hash_table_lookup(ping_ids, &id))) {
-        /*g_print("-PONG: '%s' (id %u)\n", t->client->title, t->id);*/
+        /*ob_debug("-PONG: '%s' (id %u)\n", t->client->title, t->id);*/
         if (t->waiting > PING_TIMEOUT_WARN) {
             /* we had notified that they weren't responding, so now we
                need to notify that they are again */
@@ -125,7 +131,7 @@ static void ping_send(ObPingTarget *t)
         g_hash_table_insert(ping_ids, &t->id, t);
     }
 
-    /*g_print("+PING: '%s' (id %u)\n", t->client->title, t->id);*/
+    /*ob_debug("+PING: '%s' (id %u)\n", t->client->title, t->id);*/
     PROP_MSG_TO(t->client->window, t->client->window, wm_protocols,
                 prop_atoms.net_wm_ping, t->id, t->client->window, 0, 0,
                 NoEventMask);
@@ -150,12 +156,11 @@ static void ping_end(ObClient *client, gpointer data)
 {
     ObPingTarget *t;
 
-    t = g_hash_table_find(ping_ids, find_client, client);
-    g_assert (t != NULL);
+    if ((t = g_hash_table_find(ping_ids, find_client, client))) {
+        g_hash_table_remove(ping_ids, &t->id);
 
-    g_hash_table_remove(ping_ids, &t->id);
+        ob_main_loop_timeout_remove_data(ob_main_loop, ping_timeout, t, FALSE);
 
-    ob_main_loop_timeout_remove_data(ob_main_loop, ping_timeout, t, FALSE);
-
-    g_free(t);
+        g_free(t);
+    }
 }

From d3c1117fb4c0916c1d28b6bf91288a68c9712d53 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@comhem.se>
Date: Wed, 16 Jan 2008 15:58:24 +0100
Subject: [PATCH 71/79] Remove leftover config_four_corners from config.c.

---
 openbox/config.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openbox/config.c b/openbox/config.c
index c094732e..867dfb51 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -61,7 +61,6 @@ guint   config_screen_firstdesk;
 guint   config_desktop_popup_time;
 
 gboolean         config_resize_redraw;
-gboolean         config_resize_four_corners;
 gint             config_resize_popup_show;
 ObResizePopupPos config_resize_popup_pos;
 GravityPoint     config_resize_popup_fixed;
@@ -916,7 +915,6 @@ void config_startup(ObParseInst *i)
     parse_register(i, "desktops", parse_desktops, NULL);
 
     config_resize_redraw = TRUE;
-    config_resize_four_corners = FALSE;
     config_resize_popup_show = 1; /* nonpixel increments */
     config_resize_popup_pos = OB_RESIZE_POS_CENTER;
     GRAVITY_COORD_SET(config_resize_popup_fixed.x, 0, FALSE, FALSE);

From b78dd388204ebdee75d335e836c3445a0ccabc58 Mon Sep 17 00:00:00 2001
From: Lauri Hakko <aperculum@gmail.com>
Date: Thu, 17 Jan 2008 22:02:29 +0100
Subject: [PATCH 72/79] Fixes to finnish translation.

---
 po/fi.po | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index 8cbdc3bf..45bdf15b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,7 +2,7 @@
 # Copyright (C) 2007  Mikael Magnusson
 # This file is distributed under the same license as the openbox package.
 # Pauli Virtanen <pauli.virtanen@hut.fi>, 2005.
-# Lauri Hakko, 2007.
+# Lauri Hakko <aperculum@gmail.com>, 2007.
 # Elias Julkunen <elias.julkunen@gmail.com>, 2007.
 #
 msgid ""
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2007-11-12 19:12+0100\n"
-"PO-Revision-Date: 2008-01-12 03:29+0100\n"
-"Last-Translator: Elias Julkunen <elias.julkunen@gmail.com>\n"
+"PO-Revision-Date: 2008-01-17 22:01+0100\n"
+"Last-Translator: Lauri Hakko <aperculum@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -173,7 +173,7 @@ msgstr "X-palvelin ei tue kieliasetusta"
 
 #: openbox/openbox.c:188
 msgid "Cannot set locale modifiers for the X server."
-msgstr "Lokaalimuttujia ei voitu tehdä X-palvelimelle."
+msgstr "Lokaalimuuttujia ei voitu tehdä X-palvelimelle."
 
 #: openbox/openbox.c:251
 msgid "Unable to find a valid config file, using some simple defaults"
@@ -188,7 +188,7 @@ msgstr "Teeman lataaminen epäonnistui"
 #: openbox/openbox.c:402
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
-msgstr "Uudelleenkäynnistyi epäonnistui käynnistämään uutta ohjelmaa '%s': %s"
+msgstr "Uudelleenkäynnistys epäonnistui käynnistämään uutta ohjelmaa '%s': %s"
 
 #: openbox/openbox.c:472 openbox/openbox.c:474
 msgid "Copyright (c)"
@@ -308,7 +308,7 @@ msgstr "Hakemiston '%s' luonti epäonnistui: %s"
 #: openbox/session.c:451
 #, c-format
 msgid "Unable to save the session to '%s': %s"
-msgstr "Istuntoa ei voitu tallentaa hakemistoo '%s': %s"
+msgstr "Istuntoa ei voitu tallentaa hakemistoon '%s': %s"
 
 #: openbox/session.c:583
 #, c-format
@@ -328,7 +328,7 @@ msgstr ""
 #: openbox/translate.c:135
 #, c-format
 msgid "Invalid key code '%s' in key binding"
-msgstr ""
+msgstr "Virheellinen näppäinkoodi '%s' pikanäppäimissä"
 
 #: openbox/translate.c:142
 #, c-format

From dffa95184f3b2c05da47f1ed5c8998c5f5e5e122 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@comhem.se>
Date: Thu, 17 Jan 2008 22:20:53 +0100
Subject: [PATCH 73/79] Some .c files that had translatable strings were not in
 POTFILES.in.

Swedish translation is updated with all new strings.
---
 po/POTFILES.in    |   2 +
 po/ar.po          |  90 ++++++++++++++++++++++-----------------
 po/bn_IN.po       |  95 ++++++++++++++++++++++-------------------
 po/ca.po          |  93 +++++++++++++++++++++-------------------
 po/cs.po          |  93 +++++++++++++++++++++-------------------
 po/de.po          |  92 ++++++++++++++++++++++------------------
 po/en@boldquot.po |  95 +++++++++++++++++++++++------------------
 po/en@quot.po     |  95 +++++++++++++++++++++++------------------
 po/es.po          |  93 +++++++++++++++++++++-------------------
 po/et.po          |  93 +++++++++++++++++++++-------------------
 po/eu.po          |  89 ++++++++++++++++++++++-----------------
 po/fi.po          |  89 ++++++++++++++++++++++-----------------
 po/fr.po          |  93 ++++++++++++++++++++++------------------
 po/hu.po          |  89 ++++++++++++++++++++++-----------------
 po/it.po          |  90 ++++++++++++++++++++++-----------------
 po/ja.po          |  94 ++++++++++++++++++++++-------------------
 po/nl.po          |  93 +++++++++++++++++++++-------------------
 po/no.po          |  93 +++++++++++++++++++++-------------------
 po/openbox.pot    |  89 ++++++++++++++++++++++-----------------
 po/pl.po          |  90 ++++++++++++++++++++++-----------------
 po/pt.po          |  93 +++++++++++++++++++++-------------------
 po/pt_BR.po       |  93 +++++++++++++++++++++-------------------
 po/ru.po          |  90 ++++++++++++++++++++++-----------------
 po/sk.po          | 105 ++++++++++++++++++++++++++--------------------
 po/sv.po          |  96 +++++++++++++++++++++++-------------------
 po/ua.po          |  93 +++++++++++++++++++++-------------------
 po/vi.po          |  92 ++++++++++++++++++++++------------------
 po/zh_CN.po       |  93 +++++++++++++++++++++-------------------
 po/zh_TW.po       |  93 +++++++++++++++++++++-------------------
 29 files changed, 1451 insertions(+), 1147 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8146eda9..f7918cec 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,7 @@
 # List of source files containing translatable strings.
+openbox/actions.c
 openbox/actions/execute.c
+openbox/client.c
 openbox/client_list_combined_menu.c
 openbox/client_list_menu.c
 openbox/client_menu.c
diff --git a/po/ar.po b/po/ar.po
index c65acd86..c7af5d61 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-07-21 14:43+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -18,6 +18,11 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : "
 "3\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr ""
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -28,6 +33,14 @@ msgstr "فشلت في تحويل المسار '%s' من utf8"
 msgid "Failed to execute '%s': %s"
 msgstr "فشلت في تنفيذ '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "اذهب هناك..."
@@ -112,12 +125,12 @@ msgstr "ضع/أزل الحواف (_D)"
 msgid "_Close"
 msgstr "أغلق (_C)"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "زر غير صحيح '%s' محدد في ملف الإعدادات"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "يتعارض مع ارتباط المفاتيح في ملف الإعدادات"
 
@@ -155,49 +168,49 @@ msgstr "زر غير صحيح '%s' في ارتباط الفأرة"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "سياق غير صحيح '%s' في ارتباط الفأرة"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "لم أستطع تغيير المجلد المنزلي '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "تعذّر فتح العرض من متغير البيئة DISPLAY."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "تعذّر بدأ مكتبة obrender."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "خادم إكس لا يدعم المحليّة."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "لم أستطِع ضبط مُغيِّرات المحليّة لخادم إكس."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "لم أعثر على ملف إعدادات سليم، سأستخدم بعض الإفتراضيات البسيطة"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "لم أستطِع تحميل سِمة."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "فشلت إعادة التشغيل في تنفيذ مُنفّذ جديد '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "حقوق النسخ"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "الصيغة: openbox [options]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -205,23 +218,23 @@ msgstr ""
 "\n"
 "الخيارات:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              اعرض هذه المساعدة ثم اخرج\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           اعرض النسخة ثم اخرج\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           استبدل مدير النوافذ الذي يعمل حاليا\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        عطِّل الإتصال بمدير الجلسة\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -229,20 +242,19 @@ msgstr ""
 "\n"
 "تمرير رسائل لمرّة تعمل من أوبن‌بوكس:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       أعِد تحميل إعدادات أوبن‌بوكس\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           أعِد تشغيل أوبن‌بوكس\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -250,23 +262,23 @@ msgstr ""
 "\n"
 "خيارات التنقيح:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              شغّل في النمط المزامن\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             اعرض خرْج التنقيح\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       اعرض خرج التنقيح للتعامل مع البؤرة\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    شق العرض إلى شاشات xinerama زائفة\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -275,27 +287,27 @@ msgstr ""
 "\n"
 "من فضلك أبلغ عن العلل إلى %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "معامل سطر أوامر غير سليم '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "يعمل مدير نوافذ بالفعل على الشاشة %Id"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "تعذّر الحصول على انتقاء مدير النوافذ على الشاشة %Id"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "مدير النوافذ على الشاشة %Id لا وجود له"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "سطح المكتب %Ii"
@@ -320,27 +332,27 @@ msgstr "خطأ أثناء حفظ الجلسة إلى '%s': %s"
 msgid "Running %s\n"
 msgstr "تشغيل %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "مفتاح مُغيِّر '%s' غير سليم في ارتبط الفأرة/لوحة المفاتيح"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "رمز مفتاح '%s' غير سليم في ارتباط المفتاح"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "اسم مفتاح '%s' غير سليم في ارتباط المفتاح"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "المفتاح المطلوب '%s' لا وجود له في العرض"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "خطأ إكس: %s"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index d55d4681..ab834ba9 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\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"
@@ -17,6 +17,12 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr ""
+"অবৈধ কর্ম '%s'-র অনুরোধ জানানো হয়েছে। এই ধরনের কোনো কর্ম বর্তমানে উপস্থিত নেই।"
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -27,6 +33,14 @@ msgstr "'%s' পাথটি utf8 থেকে রূপান্তর কর
 msgid "Failed to execute '%s': %s"
 msgstr "'%s' সঞ্চালন করতে ব্যর্থ: %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "চিহ্নিত স্থানে চলুন..."
@@ -111,12 +125,12 @@ msgstr "বিন্যাস পরিবর্তন (_D)"
 msgid "_Close"
 msgstr "বন্ধ করুন (_C)"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "কনফিগ ফাইলে অবৈধ বাটন '%s' উল্লিখিত হয়েছে"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "কনফিগ ফাইলে কি-বাইন্ডিং সংক্রান্ত দ্বন্দ্ব"
 
@@ -154,49 +168,49 @@ msgstr "মাউস বাইন্ডিং সংক্রান্ত অব
 msgid "Invalid context '%s' in mouse binding"
 msgstr "মাউস বাইন্ডিং সংক্রান্ত অবৈধ কনটেক্সট '%s'"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "ব্যক্তিগত ডিরেক্টরি '%s'-তে পরিবর্তন করতে ব্যর্থ: %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "DISPLAY এনভাশরনমেন্ট ভেরিয়েবলের মান প্রয়োগ করে প্রদর্শন আরম্ভ করতে ব্যর্থ।"
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "obrender লাইব্রেরি আরম্ভ করতে ব্যর্থ।"
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "X সার্ভার দ্বারা লোকেইল সমর্থিতত হয় না।"
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "X সার্ভারের জন্য লোকেইল মডিফায়ার নির্ধারণ করতে ব্যর্থ।"
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "বৈধ কনফিগ ফাইল সনাক্ত করতে ব্যর্থ, কয়েকটি সাধারণ ডিফল্ট মান প্রয়োগ করা হবে।"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "থিম লোড করতে ব্যর্থ।"
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "পুনরাম্ভের পরে নতুন এক্সেকিউটেবল '%s' সঞ্চালন করতে ব্যর্থ: %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "স্বত্বাধিকার (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "ব্যবহারপ্রণালী: openbox [বিকল্প]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -204,25 +218,25 @@ msgstr ""
 "\n"
 "বিবিধ বিকল্প:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              সহায়তা বার্তা প্রদর্শন করে প্রস্থান\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           সংস্করণ প্রদর্শন করে প্রস্থান\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           বর্তমানে চলমান উইন্ডো পরিচালন ব্যবস্থা পরিবর্তন করা হবে\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 "  --sm-disable        সেশান পরিচালন ব্যবস্থার সাথে সংযোগ নিষ্ক্রিয় করা হবে\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -230,20 +244,19 @@ msgstr ""
 "\n"
 "চলমান Openbox ইনস্ট্যান্সে বার্তা প্রেরণ:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Openbox-র কনফিগারেশন পুনরায় লোড করে\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Openbox পুনরারম্ভ\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -251,24 +264,24 @@ msgstr ""
 "\n"
 "ডিবাগ করার বিভিন্ন বিকল্প:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              সিঙ্ক্রোনাস মোডে সঞ্চালিত হবে\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             ডিবাগ-এর ফলাফল প্রদর্শন করে\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       ফোকাস হ্যান্ডলিং সংক্রান্ত ডিবাগের ফলাফল প্রদর্শন করে\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    প্রদর্শন ক্ষেত্রটি নকল xinerama পর্দায় ভাগ করা হবে\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -277,27 +290,27 @@ msgstr ""
 "\n"
 "অনুগ্রহ করে %s-এ বাগ সংক্রান্ত সূচনা দায়ের করুন\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "অবৈধ কমান্ড-লাইন আর্গুমেন্ট '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "একটি উইন্ডো পরিচালন ব্যবস্থা বর্তমানে %d-এ চলছে"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "পর্দা %d-এ উইন্ডো পরিচালন ব্যবস্থার নির্বাচিত অংশ প্রাপ্ত করতে ব্যর্থ"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "পর্দা %d-র উপর চলমান উইন্ডো পরিচালন ব্যবস্থাটি বন্ধ করতে ব্যর্থ"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"
@@ -322,34 +335,30 @@ msgstr "'%s'-এ সেশান সংরক্ষণকালে সমস্
 msgid "Running %s\n"
 msgstr "%s সঞ্চালিত হচ্ছে\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "কি/মাউস বাইন্ডিং-র মধ্যে অবৈধ মডিফায়ার-কি '%s'"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "কি-বাইন্ডিং-র মধ্যে অবৈধ কি-কোড '%s'"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "কি-বাইন্ডিং-র মধ্যে অবৈধ কি-র নাম '%s'"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "অনুরোধ করা কি '%s', প্রদর্শন ক্ষেত্রে উপস্থিত নেই"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "X সংক্রান্ত ত্রুটি: %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr ""
-#~ "অবৈধ কর্ম '%s'-র অনুরোধ জানানো হয়েছে। এই ধরনের কোনো কর্ম বর্তমানে উপস্থিত নেই।"
-
 #~ msgid "Invalid use of action '%s'. Action will be ignored."
 #~ msgstr "'%s' কর্মের অবৈধ ব্যবহার। কর্ম উপেক্ষা করা হবে।"
diff --git a/po/ca.po b/po/ca.po
index afc6bbb2..4c556c77 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\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"
@@ -15,6 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "L'acció sollicitada '%s' no és vàlida. Aquesta acció no existeix."
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -25,6 +30,14 @@ msgstr "No s'ha pogut convertir el camí '%s' des de utf8"
 msgid "Failed to execute '%s': %s"
 msgstr "No s'ha pogut executar '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Vés aquí..."
@@ -109,12 +122,12 @@ msgstr "Sense/Amb _decoració"
 msgid "_Close"
 msgstr "_Tanca"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "El botó especificat al fitxer de configuració '%s' no és vàlid."
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Conflicte amb la tecla vinculada en el fitxer de configuració"
 
@@ -153,53 +166,53 @@ msgstr "El botó '%s' no és vàlid en la vinculació del ratolí"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "El context '%s' no és vàlid en la vinculació del ratolí"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "No s'ha pogut canviar al directori de l'usuari '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "No s'ha pogut obrir la pantalla des de la variable d'entorn DISPLAY"
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "S'ha produït un error en inicialitza la llibreria obrender."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "El servidor X no te suport per a idiomes"
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "No s'ha pogut assignar els modificadors del locale per al servidor X."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "No s'ha pogut trobat un fitxer de configuració vàlid, s'utilitzaran alguns "
 "valors predeterminats"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "No s'ha pogut carregar el tema."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr ""
 "S'ha produït un error en tornar a iniciar i executar el nou executable '%s': "
 "%s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Sintaxis: openbox [opcions]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -207,25 +220,25 @@ msgstr ""
 "\n"
 "Opcions:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Visualitza aquesta ajuda i surt\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Visualitza la versió i surt\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           Reemplaça el gestor de finestres que s'està executant "
 "actualment\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Inhabilita la connexió amb gestor de sessió\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -234,20 +247,19 @@ msgstr ""
 "S'està transferint missatges a la instància del Openbox que s'està "
 "executant:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Torna a carregar la configuració de Openbox\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Torna a iniciar Openbox\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -255,27 +267,27 @@ msgstr ""
 "\n"
 "Opcions de depuració:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Executa en mode sincronitzat\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Mostra la sortida de depuració\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Mostra la sortida de depuració per a la gestió del "
 "focus\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Divideix la visualització en pantalles xinerama "
 "falses\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -284,28 +296,28 @@ msgstr ""
 "\n"
 "Informeu dels errors a %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Opció '%s' no vàlida a la línia d'ordres\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Encara s'està executant un gestor de finestres a la pantalla %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 "No s'ha pogut adquirir la selecció del gestor de finestres en la pantalla %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "El gestor de finestres de la pantalla %d no està sortint"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "escriptori %i"
@@ -330,34 +342,31 @@ msgstr "S'ha produït un error mentre es desava la sessió a '%s': %s"
 msgid "Running %s\n"
 msgstr "Executant %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr ""
 "La tecla modificadora '%s' no és vàlida en la vinculació de tecles/ratolí"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "El codi de tecla '%s' no és vàlid en la vinculació de tecles"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "El nom de la tecla '%s' no és vàlid en la vinculació de tecles"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "La tecla seleccionada '%s' no existeix a la pantalla"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "Error d'X: %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ 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ó."
diff --git a/po/cs.po b/po/cs.po
index d5f6eed8..d6384bad 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-07-21 00:15+0200\n"
 "Last-Translator: tezlo <tezlo@gmx.net>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -15,6 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Požadována neplatná akce '%s'. Žádná taková akce neexistuje."
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -25,6 +30,14 @@ msgstr "Nepodařilo se převést cestu '%s' z utf8"
 msgid "Failed to execute '%s': %s"
 msgstr "Nepodařilo se spustit '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Jdi tam..."
@@ -109,12 +122,12 @@ msgstr "Oz_dobit/Odzdobit"
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Neplatné tlačítko '%s' v konfiguračním souboru"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt klávesových zkratek v konfiguračním souboru"
 
@@ -152,51 +165,51 @@ msgstr "Neplatné tlačítko '%s' v nastavení myši"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Neplatný kontext '%s' v nastavení myši"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Nepodařilo se přejít do domácího adresáře '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Nepodařilo se otevřít displej z proměnné prostředí DISPLAY."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Nepodařilo se inicializovat knihovnu obrender."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "X server nepodporuje lokalizaci."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Nelze nastavit modifikátory lokalizace pro X server."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Nepodařilo se najít platný konfigurační soubor, pokračuji s výchozím "
 "nastavením"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Nepodařilo se načíst motiv."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Při restartu se nepodařilo spustit nový program '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntaxe: openbox [přepínače]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -204,23 +217,23 @@ msgstr ""
 "\n"
 "Přepínače:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Zobrazit tuto nápovědu a skončit\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Zobrazit verzi a skončit\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Nahradit běžící window manager\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Nepřipojovat se k session manageru\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -228,20 +241,19 @@ msgstr ""
 "\n"
 "Zasílání zpráv běžící instanci Openbox:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Znovu načíst konfiguraci Openbox\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Restartovat Openbox\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -249,23 +261,23 @@ msgstr ""
 "\n"
 "Ladící přepínače:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Spustit v synchronním módu\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Zobrazit ladící výstup\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Zobrazit ladící výstup pro správu oken\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Rozdělit displej na falešné obrazovky xinerama\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -274,27 +286,27 @@ msgstr ""
 "\n"
 "Prosím hlašte chyby na %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Neplatný argument příkazové řádky '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Na obrazovce %d již nějaký window manager běží"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Nepodařilo se získat výseč pro window manager na obrazovce %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Window manager na obrazovce %d ne a ne skončit"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "plochu %i"
@@ -319,33 +331,30 @@ msgstr "Chyba během ukládání session do '%s': %s"
 msgid "Running %s\n"
 msgstr "Spouštím %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Neplatný modifikátor '%s' v nastavení klávesnice/myši"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Neplatný kód klávesy '%s' v nastevení"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Neplatné jméno klávesy '%s' v nastavení"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Požadovaná klávesa '%s' na displeji neexistuje"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "X Chyba: %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Požadována neplatná akce '%s'. Žádná taková akce neexistuje."
-
 #~ msgid "Invalid use of action '%s'. Action will be ignored."
 #~ msgstr "Neplatné užití akce '%s'. Akce bude ignorována."
diff --git a/po/de.po b/po/de.po
index 375e60ae..ea414467 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2008-01-13 00:44+0100\n"
 "Last-Translator: Peter Schwindt <schwindt@ba-loerrach.de>\n"
 "Language-Team:  <de@li.org>\n"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Unzul�ssige Aktion '%s' angefordert. Diese Aktion existiert nicht."
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -27,6 +32,14 @@ msgstr "Konnte Pfad '%s' nicht von utf8 konvertieren"
 msgid "Failed to execute '%s': %s"
 msgstr "Konnte '%s' nicht ausf�hren: %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Gehe zu..."
@@ -111,12 +124,12 @@ msgstr "Dekoration entfernen/_Dekorieren"
 msgid "_Close"
 msgstr "_Schlie�en"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Unzul�ssiger Knopf '%s' in der Konfigurationsdatei angegeben"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt mit Tastenkombination in der Konfigurationsdatei"
 
@@ -154,52 +167,52 @@ msgstr "Maus-Binding enth
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Maus-Binding enth�lt ung�ltigen Kontext '%s'"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Konnte nicht in das Heimatverzeichnis '%s' wechseln: %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Konnte das Display aus der Umgebungsvariable DISPLAY nicht �ffnen."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Konnte die obrender Bibliothek nicht initialisieren."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "Die gew�hlte Lokalisierung wird vom X-Server nicht unterst�tzt."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 "Die Lokalisierungsmodifizierer f�r den X-Server konnten nicht gesetzt werden."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Es wurde keine g�ltige Konfigurationsdatei gefunden, benutze einfache "
 "Standardwerte."
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Konnte kein Thema laden."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Neustart fehlgeschlagen, um die ausf�hrbare Datei '%s' zu starten: %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [Optionen]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -207,23 +220,23 @@ msgstr ""
 "\n"
 "Optionen:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Diese Hilfe anzeigen und beenden\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Version anzeigen und beenden\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Den aktuell laufenden Fenstermanager ersetzen\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Keine Verbindung zum Sitzungsmanager aufbauen\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -231,19 +244,19 @@ msgstr ""
 "\n"
 "Nachrichten an eine laufende Openbox-Instanz weiterleiten:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Openbox's Konfiguration neu laden\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Openbox neu starten\n"
 
-#: openbox/openbox.c:492
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr "  --exit              Beende Openbox\n"
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -251,25 +264,25 @@ msgstr ""
 "\n"
 "Debugging Optionen:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              im Synchronisierungsmodus starten\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Debugging-Informationen anzeigen\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Debugging-Informationen f�r's Fokus-Handling anzeigen\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Anzeige in k�nstliche Xinerama-Bildschirme aufteilen\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -278,27 +291,27 @@ msgstr ""
 "\n"
 "Bitte melden Sie Bugreports an: %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Ung�ltiges Kommandozeilen Argument '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Ein Fenstermanager l�uft bereits auf Bildschirm %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Konnte die Fenstermanagerauswahl auf Bildschirm %d nicht reservieren"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Der Fenstermanager auf Bildschirm %d beendet sich nicht"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"
@@ -323,33 +336,30 @@ msgstr "Fehler beim Speichern der Sitzung nach '%s': %s"
 msgid "Running %s\n"
 msgstr "Starte %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Ung�ltige Modifier-Taste '%s' in Tastenbelegung/Maus-Binding"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Ung�ltiger Keycode '%s' in Tastenkombination"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Ung�ltiger Tastenname '%s' in Tastenkombination"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Angeforderte Taste '%s' existiert nicht auf dem Display"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "X Fehler: %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Unzul�ssige Aktion '%s' angefordert. Diese Aktion existiert nicht."
-
 #~ msgid "Invalid use of action '%s'. Action will be ignored."
 #~ msgstr "Unzul�ssiger Einsatz der Aktion '%s'. Aktion wird ignoriert."
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index 1bf3d1ea..2f2f3960 100644
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -1,7 +1,7 @@
 # English translations for openbox package.
-# Copyright (C) 2007 Dana Jansens
+# Copyright (C) 2008 Dana Jansens
 # This file is distributed under the same license as the openbox package.
-# Automatically generated, 2007.
+# Automatically generated, 2008.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.999.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
-"PO-Revision-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
+"PO-Revision-Date: 2008-01-17 22:13+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -41,6 +41,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Invalid action ‘%s’ requested. No such action exists."
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -51,6 +56,14 @@ msgstr "Failed to convert the path ‘%s’ from utf8"
 msgid "Failed to execute '%s': %s"
 msgstr "Failed to execute '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr "Killing..."
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr "Not Responding"
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Go there..."
@@ -135,12 +148,12 @@ msgstr "Un/_Decorate"
 msgid "_Close"
 msgstr "_Close"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Invalid button ‘%s’ specified in config file"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Conflict with key binding in config file"
 
@@ -178,49 +191,49 @@ msgstr "Invalid button ‘%s’ in mouse binding"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Invalid context ‘%s’ in mouse binding"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Unable to change to home directory '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Failed to open the display from the DISPLAY environment variable."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Failed to initialize the obrender library."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "X server does not support locale."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Cannot set locale modifiers for the X server."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "Unable to find a valid config file, using some simple defaults"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Unable to load a theme."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Restart failed to execute new executable '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [options]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -228,23 +241,23 @@ msgstr ""
 "\n"
 "Options:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Display this help and exit\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Display the version and exit\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Replace the currently running window manager\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Disable connection to the session manager\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -252,19 +265,19 @@ msgstr ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Reload Openbox's configuration\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Restart Openbox\n"
 
-#: openbox/openbox.c:492
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr "  --exit              Exit Openbox\n"
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -272,23 +285,23 @@ msgstr ""
 "\n"
 "Debugging options:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Run in synchronous mode\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Display debugging output\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Display debugging output for focus handling\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Split the display into fake xinerama screens\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -297,27 +310,27 @@ msgstr ""
 "\n"
 "Please report bugs at %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Invalid command line argument ‘%s’\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "A window manager is already running on screen %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Could not acquire window manager selection on screen %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "The WM on screen %d is not exiting"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"
@@ -342,27 +355,27 @@ msgstr "Error while saving the session to '%s': %s"
 msgid "Running %s\n"
 msgstr "Running %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Invalid modifier key ‘%s’ in key/mouse binding"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Invalid key code ‘%s’ in key binding"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Invalid key name ‘%s’ in key binding"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Requested key ‘%s’ does not exist on the display"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "X Error: %s"
diff --git a/po/en@quot.po b/po/en@quot.po
index acc49c07..ea40adcf 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -1,7 +1,7 @@
 # English translations for openbox package.
-# Copyright (C) 2007 Dana Jansens
+# Copyright (C) 2008 Dana Jansens
 # This file is distributed under the same license as the openbox package.
-# Automatically generated, 2007.
+# Automatically generated, 2008.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -29,8 +29,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.999.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
-"PO-Revision-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
+"PO-Revision-Date: 2008-01-17 22:13+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -38,6 +38,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Invalid action ‘%s’ requested. No such action exists."
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -48,6 +53,14 @@ msgstr "Failed to convert the path ‘%s’ from utf8"
 msgid "Failed to execute '%s': %s"
 msgstr "Failed to execute '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr "Killing..."
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr "Not Responding"
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Go there..."
@@ -132,12 +145,12 @@ msgstr "Un/_Decorate"
 msgid "_Close"
 msgstr "_Close"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Invalid button ‘%s’ specified in config file"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Conflict with key binding in config file"
 
@@ -175,49 +188,49 @@ msgstr "Invalid button ‘%s’ in mouse binding"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Invalid context ‘%s’ in mouse binding"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Unable to change to home directory '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Failed to open the display from the DISPLAY environment variable."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Failed to initialize the obrender library."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "X server does not support locale."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Cannot set locale modifiers for the X server."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "Unable to find a valid config file, using some simple defaults"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Unable to load a theme."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Restart failed to execute new executable '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [options]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -225,23 +238,23 @@ msgstr ""
 "\n"
 "Options:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Display this help and exit\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Display the version and exit\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Replace the currently running window manager\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Disable connection to the session manager\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -249,19 +262,19 @@ msgstr ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Reload Openbox's configuration\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Restart Openbox\n"
 
-#: openbox/openbox.c:492
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr "  --exit              Exit Openbox\n"
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -269,23 +282,23 @@ msgstr ""
 "\n"
 "Debugging options:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Run in synchronous mode\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Display debugging output\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Display debugging output for focus handling\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Split the display into fake xinerama screens\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -294,27 +307,27 @@ msgstr ""
 "\n"
 "Please report bugs at %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Invalid command line argument ‘%s’\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "A window manager is already running on screen %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Could not acquire window manager selection on screen %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "The WM on screen %d is not exiting"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"
@@ -339,27 +352,27 @@ msgstr "Error while saving the session to '%s': %s"
 msgid "Running %s\n"
 msgstr "Running %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Invalid modifier key ‘%s’ in key/mouse binding"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Invalid key code ‘%s’ in key binding"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Invalid key name ‘%s’ in key binding"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Requested key ‘%s’ does not exist on the display"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "X Error: %s"
diff --git a/po/es.po b/po/es.po
index bd6817b0..ead56fed 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-07-21 21:26+0200\n"
 "Last-Translator: David Merino <rastiazul at yahoo . com>\n"
 "Language-Team: None\n"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "La acción '%s' solicitada es inválida. No existe tal acción."
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -27,6 +32,14 @@ msgstr "Falló al convertir el path '%s' desde utf8"
 msgid "Failed to execute '%s': %s"
 msgstr "Falló al ejecutar '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Ir ahí..."
@@ -111,12 +124,12 @@ msgstr "_Decorar"
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Botón invalido '%s' especificado en el archivo de configuración"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Conflicto con la combinación de teclas en el archivo de configuración"
 
@@ -154,51 +167,51 @@ msgstr "Botón inválido '%s' en mouse binding"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Contexto inválido '%s' en mouse binding"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "No es posible cambiar al directorio home '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Falló abrir la pantalla desde la variable de entorno DISPLAY"
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Falló la inicialización de la librería obrender"
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "El servidor X no soporta locale."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "No se puede establecer los modificadores locale para el servidor X."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "No es posible encontrar un archivo de configuración valido, usando algunos "
 "por defecto"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "No es posible cargar el tema."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Reiniciada falló en ejecutar nuevo ejecutable '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Sintaxis: openbox [opciones]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -206,26 +219,26 @@ msgstr ""
 "\n"
 "Opciones\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Muestra esta ayuda y sale\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Muestra la versión y sale\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace            Remplaza el gestor de ventanas que esta corriendo "
 "actualmente\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 "  --sm-disable        Deshabilita la conexión con el gestor de sesión\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -233,20 +246,19 @@ msgstr ""
 "\n"
 "Pasando mensajes a la instancia que esta corriendo de Openbox:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Recarga la configuración de Openbox\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Reinicia Openbox\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -254,25 +266,25 @@ msgstr ""
 "\n"
 "Opciones de depuración:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Correr en modo sincrónico\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Mostrar salida del depurador\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Mostrar salida del depurador para focus handling\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Separar la pantalla en pantallas de xinerama falsas\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -281,28 +293,28 @@ msgstr ""
 "\n"
 "Por favor reportar errores a %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Argumento de linea de comando inválido '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Un gestor de ventanas ya esta corriendo en la pantalla %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 "No se pudo obtener el gestor de ventanas para la selección de pantalla %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "El WM en la pantalla %d no esta saliendo"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "Escritorio %i"
@@ -327,33 +339,30 @@ msgstr "Error mientras se salvaba la sesión a '%s': '%s'"
 msgid "Running %s\n"
 msgstr "Ejecutando %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Modificador de tecla '%s' inválido en combinaciones de teclas o ratón"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Código de tecla '%s' inválido en combinaciones de teclas"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Nombre de tecla '%s' inválido en combinaciones de teclas"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Tecla solicitada '%s' no existe en la pantalla"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "Error en X: %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "La acción '%s' solicitada es inválida. No existe tal acción."
-
 #~ msgid "Invalid use of action '%s'. Action will be ignored."
 #~ msgstr "Uso inválido de la acción '%s'. La acción sera ignorada."
diff --git a/po/et.po b/po/et.po
index 983eead1..6cc82a43 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-07-20 16:54+0200\n"
 "Last-Translator: Andres Järv <andresjarv@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,6 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Taotleti kehtetut käsklust '%s'. Sellist käsklust pole olemas."
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -26,6 +31,14 @@ msgstr "Raja '%s' ümberkodeerimine UTF8-st ebaõnnestus"
 msgid "Failed to execute '%s': %s"
 msgstr "'%s' käivitamine ebaõnnestus: %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Mine sinna..."
@@ -110,12 +123,12 @@ msgstr "Äär_ed sisse/välja"
 msgid "_Close"
 msgstr "S_ulge"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Vigane nupp '%s' määratletud konfiguratsioonifailis"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt kiirklahviga konfiguratsioonifailis"
 
@@ -153,51 +166,51 @@ msgstr "Vigane nupp '%s' hiire kiirklahvides"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Vigane kontekst '%s' hiire kiirklahvides"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Ei suudetud siseneda kodukataloogi '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "DISPLAY keskkonnamuutujas oleva ekraani avamine ebaõnnestus."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Obrender-damisteegi käivitamine ebaõnnestus."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "X server ei toeta lokaati."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Ei suudetud sättida lokaadimuutujaid X serveri jaoks."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Ei suudetud leida kehtivat konfiguratsioonifaili, kasutatakse lihtsaid "
 "vaikimisi seadeid"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Ei suudetud laadida teemat."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Taaskäivitusel ebaõnnestus uue käivitusfaili '%s' käivitamine: %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Autoriõigused (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Süntaks: openbox [seaded]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -205,23 +218,23 @@ msgstr ""
 "\n"
 "Seaded:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Selle abi kuvamine ja väljumine\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Versiooni kuvamine ja väljumine\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Hetkel töötava aknahalduri asendamine\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Seansihalduriga ühenduse keelamine\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -229,20 +242,19 @@ msgstr ""
 "\n"
 "Jooksvale Openboxi seansile sõnumite edastamine:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Openboxi konfiguratsioon uuesti laadimine\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Openboxi taaskäivitamine\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -250,23 +262,23 @@ msgstr ""
 "\n"
 "Silumise seaded:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Sünkroonselt jooksutamine\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Silumisväljundi kuvamine\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Fookusekäsitluse siluriväljundi kuvamine\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Ekraani võlts-Xinerama ekraanideks jagamine\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -275,27 +287,27 @@ msgstr ""
 "\n"
 "Palun teata vigadest siia %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Vigane käsurea argument '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Ekraanil %d juba jookseb aknahaldur"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Ei suuda hankida aknahaldurite loetelu ekraanil %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Aknahaldur ekraanil %d ei sulgu"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "töölaud %i"
@@ -320,33 +332,30 @@ msgstr "Seansi '%s' salvestamisel ilmnes viga: %s"
 msgid "Running %s\n"
 msgstr "Jooksev %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Vigane muutujaklahv '%s' hiire/klaviatuuri kiirklahvides"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Vigane klahvikood '%s' kiirklahvil"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Vigane klahvinimi '%s' kiirklahvil"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Soovitud klahvi '%s' ei ole sellel ekraanil"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "X-i viga: %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Taotleti kehtetut käsklust '%s'. Sellist käsklust pole olemas."
-
 #~ msgid "Invalid use of action '%s'. Action will be ignored."
 #~ msgstr "Käskluse '%s' kasutus on kehtetu. Käsklust ignoreeritakse."
diff --git a/po/eu.po b/po/eu.po
index 2425f10e..2e115245 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2008-01-11 01:00+0100\n"
 "Last-Translator: Inko I. A. <inkoia@gmail.com>\n"
 "Language-Team: Inko I. A. <inkoia@gmail.com>\n"
@@ -15,6 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr ""
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -25,6 +30,14 @@ msgstr "Hutsegitea '%s' helbidea utf8-tik bihurtzean"
 msgid "Failed to execute '%s': %s"
 msgstr "Hutsegitea '%s' exekutatzean: %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Hona joan..."
@@ -109,12 +122,12 @@ msgstr "Des/_Dekoratu"
 msgid "_Close"
 msgstr "_Itxi"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Konfigurazio fitxategian zehaztutako '%s' botoia baliogabea"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Gatazka konfigurazio fitxategiko tekla elkarketarekin"
 
@@ -152,51 +165,51 @@ msgstr "Baliogabeko '%s' botoia sagu elkarketan"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Baliogabeko '%s' testuingurua sagu elkarketan"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Ezin da '%s' hasiera direktoriora aldatu: %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Hutsegitea pantaila irekitzean DISPLAY ingurune aldagaitik."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Hutsegitea obrender liburutegia hasieratzean."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "X zerbitzariak ez du locale euskarririk."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Ezin da locale modifikatzailerik ezarri X zerbitzariarentzat."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Ezin da baliozko konfigurazio fitxategirik aurkitu, hainbat aukera lehenetsi "
 "sinple erabiltzen"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Ezin da gai bat kargatu."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Berrabiarazteak hutsegitea '%s' exekutagarri berria exekutatzean: %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Sintaxia: openbox [aukerak]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -204,24 +217,24 @@ msgstr ""
 "\n"
 "Aukerak:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Mezu hau erakutsi eta irten\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Bertsioa bistarazi eta irten\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           Ordezkatu exekutatzen ari den leiho-kudeatzailea\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Ezgaitu saio kudeatzailearekiko konexioa\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -229,19 +242,19 @@ msgstr ""
 "\n"
 "Exekutatzen ari den Openbox instantzia bati mezuak pasatzen:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Birkargatu Openbox-en konfigurazioa\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Berrabiarazi Openbox\n"
 
-#: openbox/openbox.c:492
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr "  --exit              Itxi Openbox\n"
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -249,23 +262,23 @@ msgstr ""
 "\n"
 "Arazketa aukerak:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Modu sinkronoan exekutatu\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Arazketa irteera erakutsi\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Erakutsi arazketa irteera foku maneiurako\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Zatitu pantaila xinerama pantaila faltsuetan\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -274,30 +287,30 @@ msgstr ""
 "\n"
 "%s helbidean erroreen berri eman mesedez\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "'%s' komando lerro argumentu baliogabea\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr ""
 "Bistaratzeko %d pantailan aurretik leiho-kudeatzaile bat exekutatzen ari da"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 "Ezin izan da eskuratu leiho-kudeatzailearen hautapena bistaratzeko %d "
 "pantailan"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "%d bistaratze pantailako leiho-kudeatzailea ez da irteten"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "%i Idazmahaia"
@@ -322,27 +335,27 @@ msgstr "Errorea saioa '%s'-n gordetzean: %s"
 msgid "Running %s\n"
 msgstr "Egikaritzen %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr " tekla/sagu elkarketan '%s' modifikatzaile tekla baliogabea"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr " tekla elkarketan '%s' tekla kode baliogabea"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr " tekla elkarketan '%s' tekla izen baliogabea"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Eskatutako '%s' tekla ez da pantaila existitzen"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "X errorea: %s"
diff --git a/po/fi.po b/po/fi.po
index 45bdf15b..741b63bf 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2008-01-17 22:01+0100\n"
 "Last-Translator: Lauri Hakko <aperculum@gmail.com>\n"
 "Language-Team: None\n"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr ""
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -27,6 +32,14 @@ msgstr "Polun muuntaminen utf8:sta epäonnistui: '%s'"
 msgid "Failed to execute '%s': %s"
 msgstr "Ohjelman suorittaminen epäonnistui '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Näytä tämä..."
@@ -111,12 +124,12 @@ msgstr "(Epä)_reunusta"
 msgid "_Close"
 msgstr "_Sulje"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Virheellinen painike '%s' määritetty asetustiedostossa"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Päällekäisiä näppäinsidontoja asetustiedostossa"
 
@@ -154,51 +167,51 @@ msgstr "Virheellinen nappi '%s' hiirisidonnoissa"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Virheellinen asiayhteys '%s' hiirisidonnoissa"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Kotihakemistoon '%s' vaihtaminen epäonnistui: '%s'"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Näytön avaaminen DISPLAY-muuttujasta epäonnistui."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Obrender kirjaston käynnistäminen epäonnistui."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "X-palvelin ei tue kieliasetusta"
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Lokaalimuuttujia ei voitu tehdä X-palvelimelle."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Validia asetustiedostoa ei löytynyt, käytetään joitain yksinkertaisia "
 "oletusarvoja"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Teeman lataaminen epäonnistui"
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Uudelleenkäynnistys epäonnistui käynnistämään uutta ohjelmaa '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Tekijänoikeudet (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntaksi: openbox [valitsin]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -206,23 +219,23 @@ msgstr ""
 "\n"
 "Käyttö:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Näytä tämä ohje ja sulje\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Näytä versio ja sulje\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Korvaa käynnissä oleva ikkunakäsittelijä\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Estä yhteys istuntojen hallintaan\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -230,19 +243,19 @@ msgstr ""
 "\n"
 "Anna viestejä käynnissä olevalle Openboxille:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Lataa Openboxin asetustiedosto uudelleen\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Käynnistä Openbox uudelleen\n"
 
-#: openbox/openbox.c:492
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr "  --exit              Sulje Openbox\n"
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -250,23 +263,23 @@ msgstr ""
 "\n"
 "Virheenjäljitysasetukset:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Aja synkronisointi-tilassa\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Näytä vianjäljitystuloste\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -275,27 +288,27 @@ msgstr ""
 "\n"
 "Ilmoita virheistä: %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Virheellinen valitsin '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Ikkunakäsittelijä on jo käynnissä näytöllä %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "työtila %i"
@@ -320,27 +333,27 @@ msgstr "Virhe tallennettaessa istuntoa hakemistoon '%s': %s"
 msgid "Running %s\n"
 msgstr "Suoritetaan %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr ""
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Virheellinen näppäinkoodi '%s' pikanäppäimissä"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Virheellinen näppäin '%s' pikanäppäimissä"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr ""
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "X-virhe: %s"
diff --git a/po/fr.po b/po/fr.po
index 7ec69158..e9489777 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2008-01-08 12:25+0200\n"
 "Last-Translator: �ric Lassauge <lassauge@users.sf.net>\n"
 "Language-Team: fran�ais <fr@li.org>\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr ""
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -29,6 +34,14 @@ msgstr "
 msgid "Failed to execute '%s': %s"
 msgstr "�chec de l'ex�cution de ��%s���: %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Aller l�..."
@@ -113,12 +126,12 @@ msgstr "Ne pas/D
 msgid "_Close"
 msgstr "_Fermer"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Bouton ��%s�� indiqu� dans le fichier de configuration invalide"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Conflit entre les raccourcis clavier dans le fichier de configuration"
 
@@ -156,55 +169,55 @@ msgstr "Bouton 
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Contexte ��%s�� invalide dans le param�trage de la souris"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Impossible de changer vers le r�pertoire de l'utilisateur ��%s���: %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr ""
 "�chec de l'ouverture de l'affichage depuis la variable d'environnement "
 "DISPLAY."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "�chec de l'initialisation de la biblioth�que obrender."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "Le serveur X ne supporte pas la localisation."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 "Impossible d'appliquer les modifications de localisation pour le serveur X."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Impossible de trouver un fichier de configuration valide, utilisation de "
 "d�fauts simples"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Impossible de charger un th�me."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr ""
 "Le red�marrage n'a pas r�ussi � ex�cuter le nouvel ex�cutable ��%s���: %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntaxe�: openbox [options]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -212,26 +225,26 @@ msgstr ""
 "\n"
 "Options�:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Affiche cette aide et quitte\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Affiche la version et quitte\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           Remplace le gestionnaire de fen�tres actuellement en "
 "usage\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 "  --sm-disable        D�sactive la connexion au gestionnaire de sessions\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -239,20 +252,20 @@ msgstr ""
 "\n"
 "Passage de messages � l'instance d'Openbox en cours�:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Recharge la configuration d'Openbox\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Red�marre Openbox\n"
 
-#: openbox/openbox.c:492
+#: openbox/openbox.c:495
 #, fuzzy
 msgid "  --exit              Exit Openbox\n"
 msgstr "  --exit              Sortir d'Openbox\n"
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -260,26 +273,26 @@ msgstr ""
 "\n"
 "Options de d�boguage�:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Ex�cute en mode synchrone\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Affiche la sortie de d�boguage\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Affiche la sortie de d�boguage pour la gestion du "
 "focus\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    D�coupe l'affichage en �crans xinerama factices\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -288,30 +301,30 @@ msgstr ""
 "\n"
 "Veuillez soumettre les rapports de bogues � %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Argument de la ligne de commande invalide ��%s��\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Un gestionnaire de fen�tres est d�j� lanc� sur l'�cran %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 "Impossible d'acqu�rir la s�lection du gestionnaire de fen�tres pour l'�cran %"
 "d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 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 se terminer"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "bureau %i"
@@ -336,29 +349,29 @@ msgstr "Erreur lors de la sauvegarde de la session depuis 
 msgid "Running %s\n"
 msgstr "Ex�cution de %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr ""
-"Touche de modification ��%s�� invalide dans le param�trage du clavier / de "
-"la souris"
+"Touche de modification ��%s�� invalide dans le param�trage du clavier / de la "
+"souris"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Code de touche ��%s�� invalide dans le raccourci clavier"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Nom de touche ��%s�� invalide dans le raccourci clavier"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "La touche demand�e ��%s�� n'existe pas pour l'affichage"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "Erreur X�: %s"
diff --git a/po/hu.po b/po/hu.po
index c9c2dccf..eba32319 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-12-21 14:33+0100\n"
 "Last-Translator: Robert Kuszinger <hiding@freemail.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -16,6 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr ""
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -26,6 +31,14 @@ msgstr "Az útvonalat nem sikerült átalakítani utf8-ból: '%s'"
 msgid "Failed to execute '%s': %s"
 msgstr "Nem sikerült futtatni ezt a programot '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Menjünk oda..."
@@ -110,12 +123,12 @@ msgstr "_Dekoráció eltávilítása"
 msgid "_Close"
 msgstr "_Bezárás"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Érvénytelen gomb a konfigurációs fájlban '%s'"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Ütköző billentyű-műveletek a konfigurációs fájlban"
 
@@ -153,49 +166,49 @@ msgstr "Érvénytelen gomb '%s' az egér parancsoknál"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Érvénytelen környezet az egér parancsoknál: '%s'"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Nem lehet a saját mappába váltani '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Nem nyitható meg a DISPLAY változóban beállított képernyő"
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Nem sikerült használatba venni az obernder függvénykönyvtárat"
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "Az X kiszolgáló nem támogatja ezt a nemzetközi beállítást."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "A nemzetközi beálljtás módosítók nem állíthatók be az X szerveren."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "Nincs konfigurációs fájl, ezért egyszerű alapértelmezéseket használunk"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Nem tölthető be a téma."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Az újraindítás során ez az új program nem volt indítható '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Szerzői jogok (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Használat: openbox [options]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -203,23 +216,23 @@ msgstr ""
 "\n"
 "Opciók:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Súgó megjelenítése és kilépés\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Verzió kiírása majd kilépés\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Futó ablakkezelő cseréje\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Ne csatlakozzon a szekció-kezelőhöz\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -227,19 +240,19 @@ msgstr ""
 "\n"
 "Üzenet küldése a futó Openbox példánynak\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Konfiguráció úrjatöltése\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Openbox újraindítása\n"
 
-#: openbox/openbox.c:492
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr "  --exit              Kilépés az Openboxból\n"
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -247,25 +260,25 @@ msgstr ""
 "\n"
 "Debug (hibakereső) lehetőségek:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Futtatás szinkron módban\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Hibakeresési információk megjelenítése\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Fókuszkezelésre vonatkozó hibakeresési információk "
 "kiírása\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Képernyő felosztása két ál-xinerama képernyőre\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -274,27 +287,27 @@ msgstr ""
 "\n"
 "Légyszi jelentsd a hibát itt: %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Érvénytelen parancssori opció: '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Már fut egy ablakkezelő ezen a képernyőn %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Nem tudok ablakkezelőt váltani ezen a képernyőn %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Ezen a képernyőn: %d az ablakkezelő nem lép ki"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "%i. munkaasztal"
@@ -319,27 +332,27 @@ msgstr "Hiba a futási környezet mentése közben '%s': %s"
 msgid "Running %s\n"
 msgstr "Futtatás %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Érvénytelen módosító gomb '%s' egér vagy billentyűparancsnál"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Érvénytelen billentyűkód '%s' billentyűparancsnál"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Érvénytelen billentyűnév '%s' billentyűparancsnál"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "A kért gomb '%s' nem létezik a képernyőn"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "X rendszer hiba: %s"
diff --git a/po/it.po b/po/it.po
index 2a57e9d8..1fdebe4b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-07-20 15:18+0200\n"
 "Last-Translator: Davide Truffa <davide@catoblepa.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -16,6 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr ""
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -26,6 +31,14 @@ msgstr "Impossibile convertire il percorso utf8 '%s'"
 msgid "Failed to execute '%s': %s"
 msgstr "Impossibile eseguire il comando '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Vai a..."
@@ -110,12 +123,12 @@ msgstr "Si/No _Decorazioni"
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Il pulsante '%s' specificato nel file di configurazione non è valido"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr ""
 "Conflitto con la scorciatoia da tastiera specificata nel file di "
@@ -155,53 +168,53 @@ msgstr "Il pulsante '%s' specificato nelle associazioni mouse non è valido"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Il contesto '%s' specificato nelle associazioni mouse non è valido"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Impossibile accedere alla directory home '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Impossibile accedere al display specificato nella variabile DISPLAY."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Impossibile inizializzare la libreria obrender."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "Il server X non ha il supporto per la localizzazione."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 "Impossibile impostare la localizzazione dei tasti modificatori per il server "
 "X."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Impossibile trovare un file di configurazione valido, verranno utilizzate le "
 "impostazioni predefinite"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Impossibile caricare un tema."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Non è stato possibile riavviare il nuovo eseguibile '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr ""
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Sintassi: openbox [opzioni]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -209,23 +222,23 @@ msgstr ""
 "\n"
 "Opzioni:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Mostra questo messaggio di aiuto ed esce\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Mostra il numero di versione ed esce\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Sostituisce l'attuale window manager attivo\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Disabilita la connessione al session manager\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -233,20 +246,19 @@ msgstr ""
 "\n"
 "Inviare messaggi ad un'istanza di Openbox attiva:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Ricarica la configurazione di Openbox\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Riavvia Openbox\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -254,25 +266,25 @@ msgstr ""
 "\n"
 "Opzioni di debug:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Esegue in modalità sincrona\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Mostra le informazioni di debug\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Mostra le informazioni di debug sulla gestione del "
 "focus\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Divide lo schermo per simulare xinerama\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -281,27 +293,27 @@ msgstr ""
 "\n"
 "Segnalate eventuali bug a %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Argomento da linea di comando non valido '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Un window manager è già attivo sullo schermo %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Impossibile acquisire la selezione del window manager sullo schermo %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Il WM sullo schermo %d non è terminato"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "desktop %i"
@@ -326,33 +338,33 @@ msgstr "Errore durante il salvataggio della sessione in '%s': %s"
 msgid "Running %s\n"
 msgstr "Sto eseguendo %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr ""
 "Il nome del tasto '%s' specificato nelle associazioni di mouse/tastiera non "
 "è valido"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr ""
 "Il codice tastiera '%s' specificato nelle associazioni di mouse/tastiera non "
 "è valido"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr ""
 "Il nome del tasto '%s' specificato nelle associazioni di mouse/tastiera non "
 "è valido"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Il tasto richiesto '%s' non esiste sul display"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "Errore del server X: %s"
diff --git a/po/ja.po b/po/ja.po
index 01ae8714..57a341ed 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-06-07 14:49+0200\n"
 "Last-Translator: Ryoichiro Suzuki <ryoichiro.suzuki@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -17,6 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr ""
+"不正なアクション'%s'が要求されました。そのようなアクションは存在しません。"
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -27,6 +33,14 @@ msgstr "パス'%s'を utf8 から変換するのに失敗しました。"
 msgid "Failed to execute '%s': %s"
 msgstr "'%s'の実行に失敗しました: %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "移動する..."
@@ -112,12 +126,12 @@ msgstr "非/装飾(_D)"
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "不正なボタン'%s'が設定ファイルで指定されています。"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "設定ファイルにキー割り当ての衝突があります。"
 
@@ -155,138 +169,138 @@ msgstr "マウス割り当てに於いて不正なボタン '%s'"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "マウス割り当てに於いて不正なコンテクスト '%s'"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "ホームディレクトリ'%s'に移動できません: %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "環境変数 DISPLAY からディスプレイを開くのに失敗しました。"
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "obrender ライブラリの初期化に失敗しました。"
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "Xサーバはロケールをサポートしていません。"
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Xサーバの為のロケール修飾子を設定できません。"
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "正当な設定ファイルを見つけられません。単純な初期設定を使います。"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "テーマを読み込めません。"
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "再起動の際新しい実行ファイル'%s'の実行に失敗しました: %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr ""
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr ""
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr ""
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:492
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "不正なコマンドライン引数 '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "スクリーン%dでウィンドウマネージャが既に起動しています。"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "スクリーン%dでウィンドウマネージャの選択を取得できませんでした。"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "スクリーン%dのWMが終了しません。"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "デスクトップ%i"
@@ -311,34 +325,30 @@ msgstr "セッションを'%s'に保存中にエラーが起きました: %s"
 msgid "Running %s\n"
 msgstr "起動中 %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "キー/マウス割り当ての中の不正な修飾キー '%s'"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "キー割り当ての中の不正なキーコード '%s'"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "キー割り当ての中の不正なキー名称 '%s'"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "要求されたキー'%s'はそのディスプレイに存在しません。"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "Xエラー: %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr ""
-#~ "不正なアクション'%s'が要求されました。そのようなアクションは存在しません。"
-
 #~ msgid "Invalid use of action '%s'. Action will be ignored."
 #~ msgstr "アクション'%s'の不正な使用です。このアクションは無視されます。"
diff --git a/po/nl.po b/po/nl.po
index 45405883..b9e9c59b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-07-12 13:01+0200\n"
 "Last-Translator: Jochem Kossen <jkossen@xs4all.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -16,6 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Ongeldige actie '%s' gevraagd. Deze actie bestaat niet"
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -26,6 +31,14 @@ msgstr "Converteren van het pad '%s' vanuit utf8 mislukt"
 msgid "Failed to execute '%s': %s"
 msgstr "Uitvoeren van '%s' mislukt: %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Ga hierheen..."
@@ -110,12 +123,12 @@ msgstr "_Vensterrand weghalen/toevoegen"
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Ongeldige knop '%s' gespecificeerd in het configuratiebestand"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Conflict met toetsenbinding in het configuratiebestand"
 
@@ -153,51 +166,51 @@ msgstr "Ongeldige knop '%s' in muis binding"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Ongeldige context '%s' in muis binding"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Pad instellen mislukt naar de thuismap '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Scherm van de DISPLAY omgevingsvariabele te openen mislukt."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Initialiseren van de obrender bibliotheek mislukt."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "X server ondersteunt locale niet"
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Kan de locale bepaling van de X server niet instellen"
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Kon geen geldig configuratiebestand vinden, simpele standaardinstellingen "
 "worden gebruikt"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Thema laden mislukt."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Uitvoeren van nieuw programma '%s' tijdens herstart miskukt: %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [opties]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -205,23 +218,23 @@ msgstr ""
 "\n"
 "Opties:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Toon deze helptekst en sluit af\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Toon versie en sluit af\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Vervang de huidig draaiende window manager\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Verbinding met de sessiebeheerder uitschakelen\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -229,20 +242,19 @@ msgstr ""
 "\n"
 "Berichten worden naar een draaiende Openbox instantie gestuurd:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Openbox configuratie opnieuw laden\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Herstart Openbox\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -250,23 +262,23 @@ msgstr ""
 "\n"
 "Debugging opties:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Start in synchrone modus\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Debuguitvoer weergeven\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Debug uitvoer voor focusafhandeling weergeven\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Splits het scherm in nep xinerama schermen\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -275,27 +287,27 @@ msgstr ""
 "\n"
 "Gelieve bugs te melden bij %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Onbekende optie '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Er draait al een window manager op scherm %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Kon window manager selectie op scherm %d niet verkrijgen"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "De window manager op scherm %d sluit zichzelf niet af"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "bureaublad %i"
@@ -320,33 +332,30 @@ msgstr "Fout tijdens het opslaan van de sessie naar '%s': %s"
 msgid "Running %s\n"
 msgstr "Starten %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Ongeldige modificatietoets '%s' in toetsen-/muisbinding"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Ongeldige toetscode '%s' in toetsenbinding"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Ongeldige toetsnaam '%s' in toetsenbinding"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Aangevraagde toets '%s' bestaat niet op het scherm"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "X Fout: %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ 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."
diff --git a/po/no.po b/po/no.po
index ec72a932..3c9849e2 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\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"
@@ -15,6 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Ugyldig operasjon '%s' etterspurt. Operasjonen finnes ikke."
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -25,6 +30,14 @@ msgstr "Feil ved konvertering av '%s' fra utf8 "
 msgid "Failed to execute '%s': %s"
 msgstr "Kunne ikke kjøre '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Gå dit..."
@@ -109,12 +122,12 @@ msgstr "Fjern/Legg til _dekorasjon"
 msgid "_Close"
 msgstr "_Lukk"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Ugyldig tast '%s' spesifisert i konfigurasjonsfilen"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt med hurtigtastbinding i konfigurasjonsfilen"
 
@@ -152,49 +165,49 @@ msgstr "Ugyldig knapp '%s' i binding for mus"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Ugyldig innhold '%s' i binding for mus"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Kan ikke endre til hjemmekatalogen '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Kunne ikke åpne displayet fra DISPLAY-miljøvariabelen"
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Kunne ikke starte obrender-biblioteket."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "X-serveren støtter ikke lokalisering."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Kan ikke stille inn lokaliseringsmodifikatorene for X-serveren."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "Kunne ikke finne en gyldig konfigurasjonsfil, bruker standardverdier"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Kan ikke laste et tema."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Restart kunne ikke starte nytt program '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr ""
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [alternativer\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -202,23 +215,23 @@ msgstr ""
 "\n"
 "Alternativ:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Vise denne hjelpeteksten og avslutt\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Vis versjonsnummeret og avslutt\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Erstatt den kjørende vindusbehandleren\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Deaktiver tilkobling til sesjonsbehandleren\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -226,20 +239,19 @@ msgstr ""
 "\n"
 "Sender beskjeder til en kjørende Openbox-instans:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Oppdater Openbox' konfigurasjon\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Start Openbox på nytt\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -247,23 +259,23 @@ msgstr ""
 "\n"
 "Debug-alternativ:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Kjør i synkron-modus\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Vis debuggingsinformasjon\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Vis debuggingsinformasjon for fokus-håndtering\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  -debug-xinerama    Splitt displayet for falske xinerama-skjermer\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -272,27 +284,27 @@ msgstr ""
 "\n"
 "Vennligst rapporter bugs til %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Ugyldig kommandolinje-argument '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "En vindusbehandler kjører allerede på skjerm %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Kunne ikke hendte vindusbehandlerens markering på skjerm %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Vindusbehandleren på skjerm %d vil ikke avslutte"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "skrivebord %i"
@@ -317,33 +329,30 @@ msgstr "Feil ved lagring av sesjon til '%s': %s"
 msgid "Running %s\n"
 msgstr "Kjører %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Ugyldig modifikasjonsknapp '%s' i binding for tast/mus"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Ugyldig tastekode '%s' i hurtigtastbinding"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Ugyldig tastenavn '%s' i hurtigtastbinding"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Ønsket tast '%s' eksisterer ikke i displayet"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "Feil i X: %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Ugyldig operasjon '%s' etterspurt. Operasjonen finnes ikke."
-
 #~ msgid "Invalid use of action '%s'. Action will be ignored."
 #~ msgstr "Ugyldig bruk av aksjonen '%s'. Aksjonen vil bli ignorert."
diff --git a/po/openbox.pot b/po/openbox.pot
index 3031b4f8..25b7abb4 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-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\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"
@@ -16,6 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr ""
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -26,6 +31,14 @@ msgstr ""
 msgid "Failed to execute '%s': %s"
 msgstr ""
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr ""
@@ -110,12 +123,12 @@ msgstr ""
 msgid "_Close"
 msgstr ""
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr ""
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr ""
 
@@ -153,138 +166,138 @@ msgstr ""
 msgid "Invalid context '%s' in mouse binding"
 msgstr ""
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr ""
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr ""
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr ""
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr ""
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr ""
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr ""
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr ""
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr ""
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr ""
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:492
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr ""
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr ""
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr ""
@@ -309,27 +322,27 @@ msgstr ""
 msgid "Running %s\n"
 msgstr ""
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr ""
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr ""
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr ""
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr ""
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 7a1514b8..6dfc2a84 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-07-14 00:43+0200\n"
 "Last-Translator: Piotr Drąg <raven@pmail.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr ""
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -27,6 +32,14 @@ msgstr "Nie można przekonwertować ścieżki '%s' z UTF-8"
 msgid "Failed to execute '%s': %s"
 msgstr "Wykonanie '%s' nie powiodło się: %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Przejdź..."
@@ -111,12 +124,12 @@ msgstr "Wyświetl/ukryj _dekoracje"
 msgid "_Close"
 msgstr "Z_amknij"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Nieprawidłowy klawisz '%s' określony w pliku konfiguracyjnym"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt skrótów klawiszowych w pliku konfiguracyjnym"
 
@@ -154,53 +167,53 @@ msgstr "Nieprawidłowy klawisz '%s' w skrócie myszy"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Nieprawidłowy kontekst '%s' w skrócie myszy"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Nie można przejść do katalogu domowego '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Otwarcie ekranu ze zmiennej środowiskowej DISPLAY nie powiodło się."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Zainicjowanie biblioteki obrender nie powiodło się."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "Serwer X nie obsługuje ustawień lokalnych."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Nie można ustawić modyfikatorów lokalnych dla serwera X."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Nie można znaleźć prawidłowego pliku konfiguracyjnego, używanie "
 "domyślnychwartości"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Nie można wczytać motywu."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr ""
 "Wykonanie nowego pliku wykonywalnego '%s' podczas ponownego uruchomienianie "
 "powiodło się: %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Składnia: openbox [opcje]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -208,23 +221,23 @@ msgstr ""
 "\n"
 "Opcje:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Wyświetla tę pomoc i kończy\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Wyświetla wersję i kończy\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Zastępuje aktualnie działający menedżer okien\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Nie tworzy połączenia z menedżerem sesji\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -232,20 +245,19 @@ msgstr ""
 "\n"
 "Przekazywanie komunikatów do działającej instancji Openboksa:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Ponownie wczytuje pliki konfiguracyjne\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Ponownie uruchamia Openboksa\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -253,24 +265,24 @@ msgstr ""
 "\n"
 "Opcje debugowania:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Uruchamia w trybie synchronicznym\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Wyświetla informacje o debugowaniu\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Wyświetla wyjście debugowania obsługi aktywacji\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Dzieli ekran na sztuczne ekrany xineramy\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -279,27 +291,27 @@ msgstr ""
 "\n"
 "Proszę zgłaszać błędy (w języku angielskim) pod adresem %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Nieprawidłowy argument wiersza poleceń '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Menedżer okien jest już uruchomiony na ekranie %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Nie można uzyskać wyboru menedżera okien na ekranie %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Menedżer okien na ekranie %d nie kończy działania"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "pulpit %i"
@@ -324,28 +336,28 @@ msgstr "Wystąpił błąd podczas zapisywania sesji do '%s': %s"
 msgid "Running %s\n"
 msgstr "Uruchamianie %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr ""
 "Nieprawidłowy klawisz modyfikatora '%s' w skrócie klawiszowym lub myszy"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Nieprawidłowy kod '%s' w skrócie klawiszowym"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Nieprawidłowa nazwa '%s' w skrócie klawiszowym"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Żądany klawisz '%s' nie istnieje na ekranie"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "Błąd X: %s"
diff --git a/po/pt.po b/po/pt.po
index 445c3d2b..7005798d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-07-21 18:03+0200\n"
 "Last-Translator: Althaser <Althaser@gmail.com>\n"
 "Language-Team: None\n"
@@ -16,6 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Pedido de ac��o '%s' inv�lido. N�o existem quaisquer ac��es."
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -26,6 +31,14 @@ msgstr "Falha a converter o caminho '%s' do utf8"
 msgid "Failed to execute '%s': %s"
 msgstr "Falha a executar '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Ir para..."
@@ -110,12 +123,12 @@ msgstr "Des/_Decorar"
 msgid "_Close"
 msgstr "_Fechar"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Bot�o inv�lido '%s' especificado no ficheiro de configura��o"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Conflito com tecla de atalho no ficheiro de configura��o"
 
@@ -153,51 +166,51 @@ msgstr "Bot
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Contexto inv�lido '%s' no atalho do rato"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Incapaz de mudar para o direct�rio home '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Falha a abrir o ecr� pela vari�vel de ambiente DISPLAY."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Falha a inicializar a biblioteca obrender"
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "O servidor X n�o suporta o locale."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "N�o pode definir locales modificados para o servidor X."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Incapaz de encontrar um ficheiro de configura��o v�lido, usando algumas "
 "configura��es simples de omiss�o"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Incapaz de carregar o tema."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Falha a reiniciar a execu��o de um novo execut�vel '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Direitos de autor (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Sintaxe: openbox [op��es]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -205,23 +218,23 @@ msgstr ""
 "\n"
 "Op��es:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Mostra este help e sai\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Mostra a vers�o e sai\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Substitui o corrente gestor de janelas\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Desactiva a liga��o com o gestor de sess�es\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -229,20 +242,19 @@ msgstr ""
 "\n"
 "Passando mensagens para a solicita��o do Openbox em execu��o\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Recarrega a configura��o do Openbox\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Reinicia o Openbox\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -250,25 +262,25 @@ msgstr ""
 "\n"
 "Op��es de depura��o\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Executa em modo sincronizado\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Mostra o resultado da depura��o\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Mostra o resultado da depura��o para manipula��o em "
 "foco\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Divide o ecr� em falsos ecr�s xinerama\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -277,27 +289,27 @@ msgstr ""
 "\n"
 "Por favor reporte erros em %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Argumento inv�lido na linha de comandos '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "O gestor de janelas j� est� em execu��o no ecr� %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "N�o consegui adequirir o gestor de janelas selecionado no ecr� %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "O gestor de janelas no ecr� %d n�o est� fechando"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "�rea de trabalho %i"
@@ -322,33 +334,30 @@ msgstr "Erro enquanto guardava a sess
 msgid "Running %s\n"
 msgstr "Executando %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Chave modificadora '%s' inv�lida no atalho de tecla/rato"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "C�digo de chave '%s' inv�lido na tecla de atalho"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Nome de chave '%s' inv�lido na tecla de atalho"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Chave pedida '%s' n�o existe no ecr�"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "Erro no X: %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Pedido de ac��o '%s' inv�lido. N�o existem quaisquer ac��es."
-
 #~ msgid "Invalid use of action '%s'. Action will be ignored."
 #~ msgstr "Uso inv�lido da ac��o '%s'. A ac��o ser� ignorada."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 88f51968..9eadd967 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-07-20 16:43+0200\n"
 "Last-Translator: Og Maciel <ogmaciel@ubuntu.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
@@ -17,6 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Ação inválida '%s' requisitada. Ação não existe."
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -27,6 +32,14 @@ msgstr "Falha ao converter o caminho '%s' do utf8"
 msgid "Failed to execute '%s': %s"
 msgstr "Falha ao executar '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Ir lá..."
@@ -111,12 +124,12 @@ msgstr "(Não) _Decorar"
 msgid "_Close"
 msgstr "_Fechar"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Botão inválido '%s' especificado no arquivo de configuração"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Conflito com associação de chave no arquivo de configuração"
 
@@ -154,52 +167,52 @@ msgstr "Botão inválido '%s' na associação do mouse"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Contexto '%s' inválido na associação do mouse"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Não foi possível mudar para o diretório pessoal '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Falha ao abrir a tela da variavel de ambiente DISPLAY"
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Falha ao iniciar a biblioteca obrender."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "Servidor X não suporta localização."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 "Não foi possível configurar modificadores de localização para o servidor X."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Não foi possível encontrar um arquivo de configuração válido, usando alguns "
 "valores padrão simples."
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Não foi possível carregar um tema."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "O comando de reiniciar falhou ao executar novo executável '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Sintaxe: openbox [opções]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -207,24 +220,24 @@ msgstr ""
 "\n"
 "Opções:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Mostra esta ajuda e sai\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Mostra a versão e sai\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Substitui o gerenciador de janelas ativo\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 "  --sm-disable        Desabilita conexão com o gerenciador de sessões\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -232,20 +245,19 @@ msgstr ""
 "\n"
 "Passando mensagens para uma instância do Openbox em execução:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Recarrega a configuração do Openbox\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Reinicia o Openbox\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -253,26 +265,26 @@ msgstr ""
 "\n"
 "Opções de depuração:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Executa em modo sincronizado\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Mostra saida de depuração\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Mostra saída de depuração para manipulação de foco\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 "  --debug-xinerama    Divide a exibição de telas em telas de xinerama "
 "falsas\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -281,28 +293,28 @@ msgstr ""
 "\n"
 "Por favor reporte erros em %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Argumento de linha de comando inválido '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Um gerenciador de janelas já está em execução na tela %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 "Não foi possível adquirir a seleção do gerenciador de janelas na tela %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "O gerenciador de janelas na tela %d não está saindo"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "área de trabalho %i"
@@ -327,33 +339,30 @@ msgstr "Erro enquanto salvando a sessão em '%s': %s"
 msgid "Running %s\n"
 msgstr "Executando %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Chave modificadora '%s' inválida na associação de tecla/mouse"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Código chave '%s' inválido na associação de chave"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Nome de chave '%s' inválido na associação de chave"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Chave requerida '%s' não existe na tela"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "Erro no X: %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ 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."
diff --git a/po/ru.po b/po/ru.po
index 1eef8267..12c6b0c1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-08-17 22:36+0200\n"
 "Last-Translator: Nikita Bukhvostov <dragon.djanic@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -16,6 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr ""
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -26,6 +31,14 @@ msgstr "Не удалось сконвертировать путь '%s' из ut
 msgid "Failed to execute '%s': %s"
 msgstr "Не удалось запустить '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Перейти..."
@@ -110,12 +123,12 @@ msgstr "(От)декорировать(_D)"
 msgid "_Close"
 msgstr "Закрыть(_C)"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Некорректная клавиша '%s' упомянута в конфигурационном файле"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Конфликт привязок клавиш в конфигурационном файле"
 
@@ -153,51 +166,51 @@ msgstr "Некорректная кнопка '%s' в привязке мыши"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Некорректный контекст '%s' в привязке мыши"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Не могу перейти в домашнюю директорию '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Не могу открыть экран из переменной окружения DISPLAY."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Не могу инициализировать библиотеку obrender."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "X-сервер не поддерживает локали."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Не могу установить модификаторы локали X-сервера."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Не могу найти корректный конфигурационный файл, использую значения по-"
 "умолчанию"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Не могу загрузить тему."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "При перезапуске не удалось запустить исполняемый файл '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Синтаксис: openbox [параметры]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -205,23 +218,23 @@ msgstr ""
 "\n"
 "Параметры:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Показать эту справку и выйти\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Показать версию и выйти\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Заменить текущий менеджер окон\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Не соединяться с менеджером сессий\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -229,20 +242,19 @@ msgstr ""
 "\n"
 "Передаю сообщения запущенной инстанции Openbox:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Перезагрузить конфигурацию Openbox\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Перезапустить Openbox\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -250,25 +262,25 @@ msgstr ""
 "\n"
 "Отладочные параметры:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Запустить в синхронном режиме\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Отображать отладочную информацию\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Отображать отладочную информацию об управлении "
 "фокусом\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Разбить экран на фальшивые экраны xinerama\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -277,27 +289,27 @@ msgstr ""
 "\n"
 "Пожалуйста, сообщайте об ошибках на %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Некорректный командный параметр '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "На экране %d уже запущен менеджер окон"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Не могу получить выбор менеджера окон на экране %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Менеджер окон на экране %d не завершается"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "рабочий стол %i"
@@ -322,27 +334,27 @@ msgstr "Ошибка при сохранении сессии в '%s': %s"
 msgid "Running %s\n"
 msgstr "Запущен %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Некорректное название модификатора '%s' в привязке клавиши/мыши"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Некорректный код клавиши '%s' в привязке"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Некорректное название клавиши '%s' в привязке"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Запрошенная клавиша '%s' не существует на экране"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "Ошибка X-сервера: %s"
diff --git a/po/sk.po b/po/sk.po
index d4ba56f0..0cb08237 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox-3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-08-04 17:42-0400\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-12-7 13:43Central Europe Daylight Time\n"
 "Last-Translator: Jozef Riha <jose1711@gmail.com\n"
 "Language-Team: Slovak <sk@sk.org>\n"
@@ -15,6 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Vyžiadaná neplatná akcia '%s'. Takáto akcia neexistuje."
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -25,23 +30,31 @@ msgstr "Nepodarilo sa skonvertovať cestu '%s' z utf8"
 msgid "Failed to execute '%s': %s"
 msgstr "Nepodarilo sa spustiť '%s': %s"
 
-#: openbox/client_list_combined_menu.c:92 openbox/client_list_menu.c:93
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
+#: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Prejsť na..."
 
-#: openbox/client_list_combined_menu.c:98
+#: openbox/client_list_combined_menu.c:96
 msgid "Manage desktops"
 msgstr "Správa plôch"
 
-#: openbox/client_list_combined_menu.c:99 openbox/client_list_menu.c:156
+#: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
 msgid "_Add new desktop"
 msgstr "_Pridať novú plochu"
 
-#: openbox/client_list_combined_menu.c:100 openbox/client_list_menu.c:157
+#: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
 msgid "_Remove last desktop"
 msgstr "_Odstrániť poslednú plochu"
 
-#: openbox/client_list_combined_menu.c:152
+#: openbox/client_list_combined_menu.c:150
 msgid "Windows"
 msgstr "Okná"
 
@@ -109,12 +122,12 @@ msgstr "(Ne)_Dekorovať"
 msgid "_Close"
 msgstr "Z_avrieť"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Neplatné tlačidlo '%s' špecifikované v konfiguračnom súbore"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt priradenie klávesov v konfiguračnom súbore"
 
@@ -152,51 +165,51 @@ msgstr "Neplatné tlačidlo '%s' v priradení myši"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Neplatný kontext '%s' v priradení myši"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Nepodarilo sa prejsť do domovského adresára '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Nepodarilo sa otvoriť displej z premennej prostredia DISPLAY"
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Nepodarilo sa inicializovať knižnicu obrender."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "X server nepodporuje locale."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Nemôžem nastaviť locale pre X server."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Nepodarilo sa nájsť platný konfiguračný súbor, použijem jednoduché "
 "implicitné nastavenia"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Nepodarilo sa nahrať tému."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Reštart zlyhal pri spúšťaní novej binárky '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [volby]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -204,24 +217,24 @@ msgstr ""
 "\n"
 "Volby:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Zobrazi tuto napovedu a skonci\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Zobrazi cislo verzie a skonci\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           Nahradi momentalne beziace sedenie window manazera\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Vypne spojenie k manazerovi sedenia\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -229,15 +242,20 @@ msgstr ""
 "\n"
 "Predavanie sprav beziacej instancii Openboxu:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Opatovne nacita konfiguraciu Openboxu\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Restartuje Openbox\n"
 
-#: openbox/openbox.c:492
+#: openbox/openbox.c:495
+#, fuzzy
+msgid "  --exit              Exit Openbox\n"
+msgstr "  --restart           Restartuje Openbox\n"
+
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -245,24 +263,24 @@ msgstr ""
 "\n"
 "Volby ladenia:\n"
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Spustit v synchronnom mode\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Zobrazit ladiaci vystup\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Zobrazit ladiaci vystup pre manipulaciu s fokusom\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Rozdelit displej na neprave obrazovky xineramy\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -271,27 +289,27 @@ msgstr ""
 "\n"
 "Prosim hlaste chyby na %s\n"
 
-#: openbox/openbox.c:594
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Neplatny parameter prikazoveho riadku '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Okenny manazer uz bezi na obrazovke %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Nepodarilo sa získať výber okenného manažéra na obrazovke %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Okenný manažér na obrazovke %d sa neukončuje"
 
-#: openbox/screen.c:1080
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "plocha %i"
@@ -316,33 +334,30 @@ msgstr "Chyba pri ukladaní sedenia do '%s': %s"
 msgid "Running %s\n"
 msgstr "Spúšťam %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Neplatný kláves pre modifikátor '%s' v priradení klávesov/myši"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Neplatný kód klávesu '%s' v priradení klávesov"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Neplatný názov klávesu '%s' v priradení klávesov"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Požadovaný kláves '%s' na displeji neexistuje"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "Chyba X: %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ 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á."
diff --git a/po/sv.po b/po/sv.po
index 3518f258..6c971e91 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,16 +5,21 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.4.5\n"
+"Project-Id-Version: Openbox 3.4.6\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
-"PO-Revision-Date: 2007-05-22 00:29+0200\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
+"PO-Revision-Date: 2008-01-17 22:19+0100\n"
 "Last-Translator: Mikael Magnusson <mikachu@icculus.org>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Ogiltig action '%s' efterfr�gades, men den finns inte."
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -25,6 +30,14 @@ msgstr "Lyckades inte konvertera s
 msgid "Failed to execute '%s': %s"
 msgstr "Kunde inte exekvera '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr "D�dar..."
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr "Svarar Inte"
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "G� dit..."
@@ -109,12 +122,12 @@ msgstr "_Dekorationer"
 msgid "_Close"
 msgstr "St�n_g"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Ogiltig knapp '%s' angiven i konfigurationsfilen"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Konflikt med annan tangentbindning i konfigurationsfilen"
 
@@ -152,50 +165,50 @@ msgstr "Ogiltig knapp '%s' i musbindning"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Ogiltig kontext '%s' i musbindning"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Kunde inte g� till hemkatalogen '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Kunde inte �ppna en display fr�n milj�variabeln DISPLAY."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Kunde inte initialisera obrender-biblioteket."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "X-servern st�djer inte lokalisering."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Kan inte s�tta lokaliseringsmodifierare f�r X-servern."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Kunde inte hitta en giltig konfigurationsfil, anv�nder enkla standardv�rden"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Kunde inte ladda ett tema."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Restart misslyckades att starta nytt program '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Copyright (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [alternativ]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -203,23 +216,23 @@ msgstr ""
 "\n"
 "Alternativ:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Visa den h�r hj�lpen och avsluta\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Visa versionen och avsluta\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Ers�tt den befintliga f�nsterhanteraren\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Avaktivera anslutning till sessionshanteraren\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -227,19 +240,19 @@ msgstr ""
 "\n"
 "Skicka meddelanden till en exekverande instans av Openbox:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Ladda om Openbox konfiguration\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Starta om Openbox\n"
 
-#: openbox/openbox.c:492
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr "  --exit              Avsluta Openbox\n"
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -247,23 +260,23 @@ msgstr ""
 "\n"
 "Debug-alternativ:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              K�r i synkroniserat l�ge\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Visa debuginformation\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Visa debuginformation f�r fokushantering\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Dela sk�rmen i simulerade xinerama-sk�rmar\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -272,27 +285,27 @@ msgstr ""
 "\n"
 "Rapportera buggar till %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Ogiltigt kommandoradsargument '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "En f�nsterhanterare k�rs redan p� sk�rm %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Kunde inte erh�lla f�nsterhanterarmarkeringen p� sk�rm %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "F�nsterhanteraren p� sk�rm %d avslutar inte"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "skrivbord %i"
@@ -317,33 +330,30 @@ msgstr "Fel intr
 msgid "Running %s\n"
 msgstr "K�r %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Ogiltig modifikationstangent '%s' i tangent-/musbindning"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Ogiltig tangentkod '%s' i tantentbindning"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Ogiltigt tangentnamn '%s' i tangentbindning"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Efterfr�gad tangent '%s' finns inte p� displayen"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "X-fel: %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Ogiltig action '%s' efterfr�gades, men den finns inte."
-
 #~ msgid "Invalid use of action '%s'. Action will be ignored."
 #~ msgstr "Ogiltigt anv�ndande av action '%s', den kommer ignoreras."
diff --git a/po/ua.po b/po/ua.po
index 4770c333..225e487d 100644
--- a/po/ua.po
+++ b/po/ua.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-06-16 13:02+0200\n"
 "Last-Translator: Dmitriy Moroz <zux@dimaka.org.ua>\n"
 "Language-Team: Ukrainian <root@archlinux.org.ua>\n"
@@ -15,6 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Здійснено запит на некоректну дію '%s'. Нема такої дії."
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -25,6 +30,14 @@ msgstr "Не вдалося сконвертувати шлях '%s' з utf8"
 msgid "Failed to execute '%s': %s"
 msgstr "Невдалося виконати '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Перейти...."
@@ -109,12 +122,12 @@ msgstr "(Від)декорувати(_D)"
 msgid "_Close"
 msgstr "Закрити(_C)"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Некоректна клавіша '%s' вказана у файлі конфігурації"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Конфлікт прив'язки клавіш у файлі конфігурації"
 
@@ -152,52 +165,52 @@ msgstr "Некоректна клавіша '%s' в прив'язці клаві
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Некоректний контекст '%s' в прив'зці клавіш мишки"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Не вдалося перейти в домашню директорію '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Не вдалося відкрити дисплей зі змінної середовища DISPLAY"
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Не вдалося ініцаілізувати бібліотеку obrender"
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "X-сервер не підтримує локалі"
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Не можу встановити модифікатори локалі для X-сервера"
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 "Не вдалося знайти коректний файл конфігурації, використовую стандартні "
 "налаштування"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Не вдалося загрузити стиль"
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr ""
 "При перезавантаженні не вдалося виконати новий виконуваний файл '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Авторські права (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Синтакс: openbox [параметри]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -205,23 +218,23 @@ msgstr ""
 "\n"
 "Параметри:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Показати цю справку і вийти\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --vesrion           Показати версію і вийти\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Замінити поточний менеджер вікон\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Не з'єднуватися з сесійним менеджером\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -229,20 +242,19 @@ msgstr ""
 "\n"
 "Передаю повідомлення процесу Openbox що виконується\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Перезавантажити конфігурацію Openbox'у\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Перезапустити Openbox\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -250,24 +262,24 @@ msgstr ""
 "\n"
 "Налагоджувальні параметри\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Запустити в синхронному режимі\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Показувати інформацію налагоджування\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Показувати інформацію налагоджування для уравління\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Розбити екран на фальшиві екрани xinerama\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -276,27 +288,27 @@ msgstr ""
 "\n"
 "Будь-ласка, повідомляйте про помилки на %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Некоректний командний аргумент '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "На дисплеї %d вже запущений менеджер вікон"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Не можу отримати вибір менеджера вікон на дисплеї %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Менеджео вікон на дисплеї %d не завершується"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "стільниця %i"
@@ -321,33 +333,30 @@ msgstr "Помилка при збереженні сесії в '%s': %s"
 msgid "Running %s\n"
 msgstr "Виконується %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Некоректна назва модифікатору '%s' у прив'язці клавіш клавіатури/мишки"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Некоректний код клавіши '%s' у прив'зці клавіш"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Некоректна назва клавіши '%s' у прив'язці клавіш"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Клавіша '%s' на яку здійснено запит - не існує на дисплеї"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "Помилка X-серверу: %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Здійснено запит на некоректну дію '%s'. Нема такої дії."
-
 #~ msgid "Invalid use of action '%s'. Action will be ignored."
 #~ msgstr "Некоректне викристання дії '%s'. Дія буде проігнорована."
diff --git a/po/vi.po b/po/vi.po
index 0d08aa28..9e5ad4b7 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2008-01-09 21:33+0100\n"
 "Last-Translator: Quan Tran <qeed.quan@gmail.com>\n"
 "Language-Team: None\n"
@@ -15,6 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Hành động '%s' làm không được. Hành động đó không có."
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -25,6 +30,14 @@ msgstr "Không thể chuyển chỗ '%s' từ utf8"
 msgid "Failed to execute '%s': %s"
 msgstr "Làm không được '%s': %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "Đi đến chỗ đó"
@@ -109,12 +122,12 @@ msgstr "_Trang/Không Trang trí"
 msgid "_Close"
 msgstr "Đón_g"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "Sai nút '%s' ở trong hình thể"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "Xung đột với chữ trói ở trong hình thể"
 
@@ -152,49 +165,49 @@ msgstr "Vô hiệu nút '%s' ở trong máy chuột đặt"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "Vô hiệu văn cảnh '%s' ở trong chuột đặt"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Không thể đổi đến chỗ nhà '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "Không mở hình từ DISPLAY được."
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "Không mở được thư viện obrender."
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "Chương trình X không có locale cho tiếng nay."
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "Không thể dùng locale cho chương trình X."
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "Không thể tìm ra hình thể, sẽ dùng bắt đầu hình thể"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "Không thể đọc theme."
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Bắt đầu lại hỏng mở được executable mới '%s': %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "Bản quyền (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "Cách dùng: openbox [chọn lựa]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -202,24 +215,24 @@ msgstr ""
 "\n"
 "Chọn lựa:\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Trưng bày giúp đỡ này và đi ra\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Trưng bày số của chương trình và đi ra\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 "  --replace           Thay thế chương trình quản lý cửa sổ cho đến openbox\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Tắt liên lạc đến session quản lý\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -227,19 +240,19 @@ msgstr ""
 "\n"
 "Đưa thông báo cho chương trình Openbox:\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Bắt đầu lại Openbox's hình thể\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Bắt đầu lại Openbox\n"
 
-#: openbox/openbox.c:492
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr "  --exit              Đi ra Openbox\n"
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -247,24 +260,24 @@ msgstr ""
 "\n"
 "Debugging chọn lựa:\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Chạy trong cách thức synchronous\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Trưng bày debugging đoàn chữ\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 "  --debug-focus       Trưng bày debugging đoàn chữ cho điều khiển tập trung\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    Tách trưng bày vào giả xinerama màn\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -273,27 +286,27 @@ msgstr ""
 "\n"
 "Làm ơn báo cáo bugs ở chỗ %s\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "Mệnh lệnh viết sai '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "Chương trình quản lý cửa sổ khác đang chạy trên màn hình %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "Không thể lấy được chương trình quản lý cửa sổ ở trên màn hình %d"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "Chương trình quản lý cửa sổ trên màn hình %d không đi ra"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "chỗ làm việc %i"
@@ -318,33 +331,30 @@ msgstr "Bĩ trục chật lúc tiết kiệm thời kỳ cho '%s': %s"
 msgid "Running %s\n"
 msgstr "Đan Chạy %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "Vô hiệu Modifier key '%s' ở chỗ máy keyboard/chuột đặt"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "Vô hiệu key mã '%s' ở chỗ key đặt"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "Vô hiệu key tên '%s' ở chỗ key đặt"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "Yêu cầu key '%s' không có ở chỗ màn hình"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "X trục chật: %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "Hành động '%s' làm không được. Hành động đó không có."
-
 #~ msgid "Invalid use of action '%s'. Action will be ignored."
 #~ msgstr "Sự dùng hành động '%s' sai rồi. Không làm hành động đó."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index df225bc1..259e6bf0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-05-28 13:00+0800\n"
 "Last-Translator: Xiaoyu PENG <peng.xiaoyu@gmail.com>\n"
 "Language-Team: None\n"
@@ -15,6 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "请求的动作 '%s' 无效。该动作不存在。"
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -25,6 +30,14 @@ msgstr "从 utf8 转换路径 '%s' 时失败"
 msgid "Failed to execute '%s': %s"
 msgstr "执行 '%s' 时失败: %s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "跳转到..."
@@ -109,12 +122,12 @@ msgstr "去除装饰(_D)"
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "配置文件中指定的按钮 '%s' 无效"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "配置文件中的组合键冲突"
 
@@ -152,49 +165,49 @@ msgstr "鼠标绑定中的无效按键 '%s'"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "鼠标绑定中无效的上下文 '%s'"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "无法切换到主目录 '%s': %s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "在打开DISPLAY环境变量所指定的X显示时失败"
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "初始化obrender库时失败"
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "X服务器不支持该Locale"
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "无法设置X服务器的locale修饰项"
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "无法找到有效的配置文件，使用一些简单的默认值"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "无法读入主题"
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "重新启动以执行新的可执行文件 '%s' 时失败: %s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "版权 (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "用法: openbox [选项]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -202,23 +215,23 @@ msgstr ""
 "\n"
 "选项： \n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              显示帮助选项后退出\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           显示版本号后退出\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           替换当前运行的窗口管理器\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        禁止与会话管理器的连接\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -226,20 +239,19 @@ msgstr ""
 "\n"
 "传递信息给运行中的Openbox实例：\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       重新读入Openbox的配置\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           重新启动Openbox\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -247,23 +259,23 @@ msgstr ""
 "\n"
 "调试选项：\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              在同步模式中运行\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug            显示调试输出\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       显示焦点处理的调试输出\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    分割显示到伪造的 xinerama 屏幕中\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -272,27 +284,27 @@ msgstr ""
 "\n"
 "请向 %s 报告错误\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "无效的命令行参数 '%s'\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "已经有窗口管理器运行在屏幕 %d"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "在屏幕 %d 无法被选为窗口管理器"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "屏幕 %d 的窗口管理器没有退出"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "桌面 %i"
@@ -317,33 +329,30 @@ msgstr "在保存会话到 '%s' 时出错： %s"
 msgid "Running %s\n"
 msgstr "运行 %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "键盘/鼠标的绑定 '%s' 无效"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "按盘绑定中无效的键盘码 '%s'"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "按键绑定中无效的键名 '%s'"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "请求的按键 '%s' 在显示中不存在"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "X 错误： %s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "请求的动作 '%s' 无效。该动作不存在。"
-
 #~ msgid "Invalid use of action '%s'. Action will be ignored."
 #~ msgstr "使用的动作 '%s' 无效。动作将被忽略。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5a7c0498..8b3cb32d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-11-12 19:12+0100\n"
+"POT-Creation-Date: 2008-01-17 22:13+0100\n"
 "PO-Revision-Date: 2007-07-23 23:22+0200\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -16,6 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: openbox/actions.c:149
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "要求的動作「%s」無效。無此類動作存在。"
+
 #: openbox/actions/execute.c:88
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
@@ -26,6 +31,14 @@ msgstr "轉換路徑「%s」自 utf8 時失敗"
 msgid "Failed to execute '%s': %s"
 msgstr "執行「%s」時失敗：%s"
 
+#: openbox/client.c:1973 openbox/client.c:2005
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:1975 openbox/client.c:2007
+msgid "Not Responding"
+msgstr ""
+
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
 msgstr "到那裏去…"
@@ -110,12 +123,12 @@ msgstr "去除/裝飾(_D)"
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: openbox/config.c:740
+#: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
 msgstr "在配置檔中指定的按鈕「%s」無效"
 
-#: openbox/keyboard.c:156
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr "與配置檔中的按鍵組合衝突"
 
@@ -153,49 +166,49 @@ msgstr "與滑鼠組合的按鈕「%s」無效"
 msgid "Invalid context '%s' in mouse binding"
 msgstr "與滑鼠組合的上下文「%s」無效"
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:130
 #, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "無法變更到主目錄「%s」：%s"
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr "開啟依 DISPLAY 環境變數所指的顯示時失敗。"
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
 msgstr "初始化 obrender 函式庫時失敗。"
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:187
 msgid "X server does not support locale."
 msgstr "X 伺服器不支援語區。"
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr "無法設定用於 X 伺服器的語區修飾項。"
 
-#: openbox/openbox.c:251
+#: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "無法找到有效的配置檔案，而使用某些簡單的預設值"
 
-#: openbox/openbox.c:277
+#: openbox/openbox.c:278
 msgid "Unable to load a theme."
 msgstr "無法載入佈景主題。"
 
-#: openbox/openbox.c:402
+#: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "重新啟動以執行新的可執行檔「%s」時失敗：%s"
 
-#: openbox/openbox.c:472 openbox/openbox.c:474
+#: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
 msgstr "著作權 (c)"
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
 msgstr "語法：openbox [選項]\n"
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:487
 msgid ""
 "\n"
 "Options:\n"
@@ -203,23 +216,23 @@ msgstr ""
 "\n"
 "選項：\n"
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              顯示此說明然後離開\n"
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           顯示版本然後離開\n"
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           替換目前執行的視窗管理員\n"
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        停用與執行階段管理程式的連結\n"
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:492
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -227,20 +240,19 @@ msgstr ""
 "\n"
 "傳遞訊息到執行中的 Openbox 實體：\n"
 
-#: openbox/openbox.c:490
+#: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       重新載入 Openbox 配置\n"
 
-#: openbox/openbox.c:491
+#: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           重新啟動 Openbox\n"
 
-#: openbox/openbox.c:492
-#, fuzzy
+#: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:493
+#: openbox/openbox.c:496
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -248,23 +260,23 @@ msgstr ""
 "\n"
 "偵錯選項：\n"
 
-#: openbox/openbox.c:494
+#: openbox/openbox.c:497
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              在同步模式中運行\n"
 
-#: openbox/openbox.c:495
+#: openbox/openbox.c:498
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             顯示偵錯輸出\n"
 
-#: openbox/openbox.c:496
+#: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       顯示焦點處理的偵錯輸出\n"
 
-#: openbox/openbox.c:497
+#: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr "  --debug-xinerama    分割顯示以進入假造的 xinerama 螢幕\n"
 
-#: openbox/openbox.c:498
+#: openbox/openbox.c:501
 #, c-format
 msgid ""
 "\n"
@@ -273,27 +285,27 @@ msgstr ""
 "\n"
 "請向 %s 報告錯誤\n"
 
-#: openbox/openbox.c:599
+#: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
 msgstr "無效的命令列引數「%s」\n"
 
-#: openbox/screen.c:96 openbox/screen.c:184
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr "螢幕 %d 中已經有視窗管理員在運行"
 
-#: openbox/screen.c:118
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr "無法於螢幕 %d 獲選為視窗管理員"
 
-#: openbox/screen.c:139
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr "螢幕 %d 中的視窗管理員並未離開"
 
-#: openbox/screen.c:1087
+#: openbox/screen.c:1162
 #, c-format
 msgid "desktop %i"
 msgstr "桌面 %i"
@@ -318,33 +330,30 @@ msgstr "當儲存執行階段「%s」時發生錯誤：%s"
 msgid "Running %s\n"
 msgstr "正在運行 %s\n"
 
-#: openbox/translate.c:58
+#: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr "與鍵盤/滑鼠組合的輔助按鍵「%s」無效"
 
-#: openbox/translate.c:135
+#: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
 msgstr "與按鍵組合的鍵碼「%s」無效"
 
-#: openbox/translate.c:142
+#: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
 msgstr "與按鍵組合的鍵名「%s」無效"
 
-#: openbox/translate.c:148
+#: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
 msgstr "要求的按鍵「%s」不存在於畫面之中"
 
-#: openbox/xerror.c:39
+#: openbox/xerror.c:40
 #, c-format
 msgid "X Error: %s"
 msgstr "X 錯誤：%s"
 
-#~ msgid "Invalid action '%s' requested. No such action exists."
-#~ msgstr "要求的動作「%s」無效。無此類動作存在。"
-
 #~ msgid "Invalid use of action '%s'. Action will be ignored."
 #~ msgstr "使用的動作「%s」無效。動作將被忽略。"

From 47bc5f823f002f5722cd2041e9829d1e695a860c Mon Sep 17 00:00:00 2001
From: Finn Zirngibl <finn@s23.org>
Date: Thu, 17 Jan 2008 22:51:17 +0100
Subject: [PATCH 74/79] Update german translation.

---
 po/de.po | 65 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/po/de.po b/po/de.po
index ea414467..bd4ef113 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,23 +4,24 @@
 # Sebastian Vahl <svahl@web.de>, 2006.
 # Simon A. Wilper <simonaw@openoffice.org>, Apr 2007
 # Peter Schwindt <schwindt@ba-loerrach.de>
+# Finn Zirngibl <finn@s23.org>, 2008"
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.4.5\n"
+"Project-Id-Version: Openbox 3.4.6\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2008-01-17 22:13+0100\n"
-"PO-Revision-Date: 2008-01-13 00:44+0100\n"
-"Last-Translator: Peter Schwindt <schwindt@ba-loerrach.de>\n"
+"PO-Revision-Date: 2008-01-17 22:49+0100\n"
+"Last-Translator: Finn Zirngibl <finn@s23.org>\n"
 "Language-Team:  <de@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: openbox/actions.c:149
 #, c-format
 msgid "Invalid action '%s' requested. No such action exists."
-msgstr "Unzul�ssige Aktion '%s' angefordert. Diese Aktion existiert nicht."
+msgstr "Unzulässige Aktion '%s' angefordert. Diese Aktion existiert nicht."
 
 #: openbox/actions/execute.c:88
 #, c-format
@@ -30,19 +31,19 @@ msgstr "Konnte Pfad '%s' nicht von utf8 konvertieren"
 #: openbox/actions/execute.c:97 openbox/actions/execute.c:115
 #, c-format
 msgid "Failed to execute '%s': %s"
-msgstr "Konnte '%s' nicht ausf�hren: %s"
+msgstr "Konnte '%s' nicht ausführen: %s"
 
 #: openbox/client.c:1973 openbox/client.c:2005
 msgid "Killing..."
-msgstr ""
+msgstr "Wird beendet..."
 
 #: openbox/client.c:1975 openbox/client.c:2007
 msgid "Not Responding"
-msgstr ""
+msgstr "Reagiert nicht"
 
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
-msgstr "Gehe zu..."
+msgstr "Hierher wechseln..."
 
 #: openbox/client_list_combined_menu.c:96
 msgid "Manage desktops"
@@ -50,7 +51,7 @@ msgstr "Desktops verwalten"
 
 #: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
 msgid "_Add new desktop"
-msgstr "_Neuen Desktop hinzuf�gen"
+msgstr "_Neuen Desktop hinzufügen"
 
 #: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
 msgid "_Remove last desktop"
@@ -102,7 +103,7 @@ msgstr "Vers_chieben"
 
 #: openbox/client_menu.c:394
 msgid "Resi_ze"
-msgstr "_Gr��e �ndern"
+msgstr "_Größe ändern"
 
 #: openbox/client_menu.c:396
 msgid "Ico_nify"
@@ -122,12 +123,12 @@ msgstr "Dekoration entfernen/_Dekorieren"
 
 #: openbox/client_menu.c:418
 msgid "_Close"
-msgstr "_Schlie�en"
+msgstr "_Schließen"
 
 #: openbox/config.c:746
 #, c-format
 msgid "Invalid button '%s' specified in config file"
-msgstr "Unzul�ssiger Knopf '%s' in der Konfigurationsdatei angegeben"
+msgstr "Unzulässiger Knopf '%s' in der Konfigurationsdatei angegeben"
 
 #: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
@@ -136,22 +137,22 @@ msgstr "Konflikt mit Tastenkombination in der Konfigurationsdatei"
 #: openbox/menu.c:103 openbox/menu.c:111
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
-msgstr "Konnte keine g�ltige Men�-Datei '%s' finden"
+msgstr "Konnte keine gültige Menü-Datei '%s' finden"
 
 #: openbox/menu.c:171
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
-msgstr "Konnte Befehl '%s' f�r pipe-menu nicht ausf�hren: %s"
+msgstr "Konnte Befehl '%s' für pipe-menu nicht ausführen: %s"
 
 #: openbox/menu.c:185
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
-msgstr "Ung�ltige Ausgabe vom pipe-menu '%s'"
+msgstr "Ungültige Ausgabe vom pipe-menu '%s'"
 
 #: openbox/menu.c:198
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
-msgstr "Das Men� '%s' wurde bei dem Versuch darauf zuzugreifen nicht gefunden"
+msgstr "Das Menü '%s' wurde bei dem Versuch darauf zuzugreifen nicht gefunden"
 
 #: openbox/menu.c:368 openbox/menu.c:369
 msgid "More..."
@@ -160,12 +161,12 @@ msgstr "Mehr..."
 #: openbox/mouse.c:349
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
-msgstr "Maus-Binding enth�lt ung�ltigen Button '%s'"
+msgstr "Maus-Binding enthält ungültigen Button '%s'"
 
 #: openbox/mouse.c:355
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
-msgstr "Maus-Binding enth�lt ung�ltigen Kontext '%s'"
+msgstr "Maus-Binding enthält ungültigen Kontext '%s'"
 
 #: openbox/openbox.c:130
 #, c-format
@@ -174,7 +175,7 @@ msgstr "Konnte nicht in das Heimatverzeichnis '%s' wechseln: %s"
 
 #: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
-msgstr "Konnte das Display aus der Umgebungsvariable DISPLAY nicht �ffnen."
+msgstr "Konnte das Display aus der Umgebungsvariable DISPLAY nicht öffnen."
 
 #: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
@@ -182,17 +183,17 @@ msgstr "Konnte die obrender Bibliothek nicht initialisieren."
 
 #: openbox/openbox.c:187
 msgid "X server does not support locale."
-msgstr "Die gew�hlte Lokalisierung wird vom X-Server nicht unterst�tzt."
+msgstr "Die gewählte Lokalisierung wird vom X-Server nicht unterstützt."
 
 #: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
-"Die Lokalisierungsmodifizierer f�r den X-Server konnten nicht gesetzt werden."
+"Die Lokalisierungsmodifizierer für den X-Server konnten nicht gesetzt werden."
 
 #: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
-"Es wurde keine g�ltige Konfigurationsdatei gefunden, benutze einfache "
+"Es wurde keine gültige Konfigurationsdatei gefunden, benutze einfache "
 "Standardwerte."
 
 #: openbox/openbox.c:278
@@ -202,7 +203,7 @@ msgstr "Konnte kein Thema laden."
 #: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
-msgstr "Neustart fehlgeschlagen, um die ausf�hrbare Datei '%s' zu starten: %s"
+msgstr "Neustart fehlgeschlagen, um die ausführbare Datei '%s' zu starten: %s"
 
 #: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
@@ -275,12 +276,12 @@ msgstr "  --debug             Debugging-Informationen anzeigen\n"
 #: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
-"  --debug-focus       Debugging-Informationen f�r's Fokus-Handling anzeigen\n"
+"  --debug-focus       Debugging-Informationen für's Fokus-Handling anzeigen\n"
 
 #: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
-"  --debug-xinerama    Anzeige in k�nstliche Xinerama-Bildschirme aufteilen\n"
+"  --debug-xinerama    Anzeige in künstliche Xinerama-Bildschirme aufteilen\n"
 
 #: openbox/openbox.c:501
 #, c-format
@@ -294,12 +295,12 @@ msgstr ""
 #: openbox/openbox.c:604
 #, c-format
 msgid "Invalid command line argument '%s'\n"
-msgstr "Ung�ltiges Kommandozeilen Argument '%s'\n"
+msgstr "Ungültiges Kommandozeilen Argument '%s'\n"
 
 #: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
-msgstr "Ein Fenstermanager l�uft bereits auf Bildschirm %d"
+msgstr "Ein Fenstermanager läuft bereits auf Bildschirm %d"
 
 #: openbox/screen.c:124
 #, c-format
@@ -339,17 +340,17 @@ msgstr "Starte %s\n"
 #: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
-msgstr "Ung�ltige Modifier-Taste '%s' in Tastenbelegung/Maus-Binding"
+msgstr "Ungültige Modifier-Taste '%s' in Tastenbelegung/Maus-Binding"
 
 #: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code '%s' in key binding"
-msgstr "Ung�ltiger Keycode '%s' in Tastenkombination"
+msgstr "Ungültiger Keycode '%s' in Tastenkombination"
 
 #: openbox/translate.c:145
 #, c-format
 msgid "Invalid key name '%s' in key binding"
-msgstr "Ung�ltiger Tastenname '%s' in Tastenkombination"
+msgstr "Ungültiger Tastenname '%s' in Tastenkombination"
 
 #: openbox/translate.c:151
 #, c-format
@@ -362,4 +363,4 @@ msgid "X Error: %s"
 msgstr "X Fehler: %s"
 
 #~ msgid "Invalid use of action '%s'. Action will be ignored."
-#~ msgstr "Unzul�ssiger Einsatz der Aktion '%s'. Aktion wird ignoriert."
+#~ msgstr "Unzulässiger Einsatz der Aktion '%s'. Aktion wird ignoriert."

From bf6387e48f38718f7721b6257cb4d9e1e235d0d7 Mon Sep 17 00:00:00 2001
From: Cyrille Bagard <nocbos@gmail.com>
Date: Thu, 17 Jan 2008 22:55:01 +0100
Subject: [PATCH 75/79] Update french translation.

---
 po/fr.po | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index e9489777..fefa21ce 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the Openbox package.
 #
 # tioui <leonptitlouis@wanadoo.fr>, 2004.
-# Cyrille Bagard <nocbos@gmail.com>, 2007.
+# Cyrille Bagard <nocbos@gmail.com>, 2007-2008.
 # Jacques BON <jbon@cafcom.net>, 2007.
 # �ric Lassauge <lassauge@users.sf.net>, 2008
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.4.5\n"
+"Project-Id-Version: Openbox 3.4.6\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2008-01-17 22:13+0100\n"
-"PO-Revision-Date: 2008-01-08 12:25+0200\n"
-"Last-Translator: �ric Lassauge <lassauge@users.sf.net>\n"
+"PO-Revision-Date: 2008-01-17 22:53+0100\n"
+"Last-Translator: Cyrille Bagard <nocbos@gmail.com>\n"
 "Language-Team: fran�ais <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -22,7 +22,7 @@ msgstr ""
 #: openbox/actions.c:149
 #, c-format
 msgid "Invalid action '%s' requested. No such action exists."
-msgstr ""
+msgstr "Action demand�e invalide '%s'. Une telle action n'existe pas."
 
 #: openbox/actions/execute.c:88
 #, c-format
@@ -36,11 +36,11 @@ msgstr "
 
 #: openbox/client.c:1973 openbox/client.c:2005
 msgid "Killing..."
-msgstr ""
+msgstr "Tue..."
 
 #: openbox/client.c:1975 openbox/client.c:2007
 msgid "Not Responding"
-msgstr ""
+msgstr "Ne r�pond pas"
 
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
@@ -261,7 +261,6 @@ msgid "  --restart           Restart Openbox\n"
 msgstr "  --restart           Red�marre Openbox\n"
 
 #: openbox/openbox.c:495
-#, fuzzy
 msgid "  --exit              Exit Openbox\n"
 msgstr "  --exit              Sortir d'Openbox\n"
 

From 42db0715af7d9f660000972c5b180fda0bed094c Mon Sep 17 00:00:00 2001
From: Quan Tran <qeed.quan@gmail.com>
Date: Thu, 17 Jan 2008 23:10:36 +0100
Subject: [PATCH 76/79] Update vietnamese translation.

---
 po/vi.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/vi.po b/po/vi.po
index 9e5ad4b7..fa7b324f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.4.5\n"
+"Project-Id-Version: Openbox 3.4.6\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2008-01-17 22:13+0100\n"
-"PO-Revision-Date: 2008-01-09 21:33+0100\n"
+"PO-Revision-Date: 2008-01-17 23:08+0100\n"
 "Last-Translator: Quan Tran <qeed.quan@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -32,11 +32,11 @@ msgstr "Làm không được '%s': %s"
 
 #: openbox/client.c:1973 openbox/client.c:2005
 msgid "Killing..."
-msgstr ""
+msgstr "Đang giết..."
 
 #: openbox/client.c:1975 openbox/client.c:2007
 msgid "Not Responding"
-msgstr ""
+msgstr "Không phản ứng"
 
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."

From eb8f730add76264600863769d37ab54983fb0b8a Mon Sep 17 00:00:00 2001
From: Lauri Hakko <aperculum@gmail.com>
Date: Thu, 17 Jan 2008 23:14:22 +0100
Subject: [PATCH 77/79] Update finnish translation.

---
 po/fi.po | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index 741b63bf..335e8d8b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,16 +2,17 @@
 # Copyright (C) 2007  Mikael Magnusson
 # This file is distributed under the same license as the openbox package.
 # Pauli Virtanen <pauli.virtanen@hut.fi>, 2005.
-# Lauri Hakko <aperculum@gmail.com>, 2007.
+# Lauri Hakko <aperculum@gmail.com>, 2008.
 # Elias Julkunen <elias.julkunen@gmail.com>, 2007.
+# Jarkko Piiroinen <jarkkop@iki.fi>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.4.5\n"
+"Project-Id-Version: Openbox 3.4.6\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2008-01-17 22:13+0100\n"
-"PO-Revision-Date: 2008-01-17 22:01+0100\n"
-"Last-Translator: Lauri Hakko <aperculum@gmail.com>\n"
+"PO-Revision-Date: 2008-01-18 14:55+0100\n"
+"Last-Translator: Jarkko Piiroinen <jarkkop@iki.fi>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
 #: openbox/actions.c:149
 #, c-format
 msgid "Invalid action '%s' requested. No such action exists."
-msgstr ""
+msgstr "Virheellinen tapahtuma '%s' yritetty. Tapahtumaa ei ole."
 
 #: openbox/actions/execute.c:88
 #, c-format
@@ -34,11 +35,11 @@ msgstr "Ohjelman suorittaminen epäonnistui '%s': %s"
 
 #: openbox/client.c:1973 openbox/client.c:2005
 msgid "Killing..."
-msgstr ""
+msgstr "Suljetaan..."
 
 #: openbox/client.c:1975 openbox/client.c:2007
 msgid "Not Responding"
-msgstr ""
+msgstr "Ei vastaa"
 
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
@@ -141,7 +142,7 @@ msgstr "Toimivaa valikkotiedostoa ei löytynyt '%s'"
 #: openbox/menu.c:171
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
-msgstr "Putkivalikon komennon suorittaminen epäonnistui '%s': %s"
+msgstr "Putkivalikon suorittaminen epäonnistui '%s': %s"
 
 #: openbox/menu.c:185
 #, c-format
@@ -160,7 +161,7 @@ msgstr "Lisää..."
 #: openbox/mouse.c:349
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
-msgstr "Virheellinen nappi '%s' hiirisidonnoissa"
+msgstr "Virheellinen painike '%s' hiirisidonnoissa"
 
 #: openbox/mouse.c:355
 #, c-format
@@ -178,11 +179,11 @@ msgstr "Näytön avaaminen DISPLAY-muuttujasta epäonnistui."
 
 #: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
-msgstr "Obrender kirjaston käynnistäminen epäonnistui."
+msgstr "Obrender-kirjaston käynnistäminen epäonnistui."
 
 #: openbox/openbox.c:187
 msgid "X server does not support locale."
-msgstr "X-palvelin ei tue kieliasetusta"
+msgstr "X-palvelin ei tue kieliasetusta."
 
 #: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
@@ -191,17 +192,17 @@ msgstr "Lokaalimuuttujia ei voitu tehdä X-palvelimelle."
 #: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
-"Validia asetustiedostoa ei löytynyt, käytetään joitain yksinkertaisia "
+"Kelvollista asetustiedostoa ei löytynyt, käytetään yksinkertaisia "
 "oletusarvoja"
 
 #: openbox/openbox.c:278
 msgid "Unable to load a theme."
-msgstr "Teeman lataaminen epäonnistui"
+msgstr "Teeman lataaminen epäonnistui."
 
 #: openbox/openbox.c:405
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
-msgstr "Uudelleenkäynnistys epäonnistui käynnistämään uutta ohjelmaa '%s': %s"
+msgstr "Uudelleenkäynnistys ei onnistunut käynnistämään uutta ohjelmaa '%s': %s"
 
 #: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
@@ -229,7 +230,7 @@ msgstr "  --version           Näytä versio ja sulje\n"
 
 #: openbox/openbox.c:490
 msgid "  --replace           Replace the currently running window manager\n"
-msgstr "  --replace           Korvaa käynnissä oleva ikkunakäsittelijä\n"
+msgstr "  --replace           Korvaa käynnissä oleva ikkunointiohjelma\n"
 
 #: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
@@ -241,7 +242,7 @@ msgid ""
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 "\n"
-"Anna viestejä käynnissä olevalle Openboxille:\n"
+"Komentojen antaminen käynnissä olevalle Openboxille:\n"
 
 #: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
@@ -273,11 +274,11 @@ msgstr "  --debug             Näytä vianjäljitystuloste\n"
 
 #: openbox/openbox.c:499
 msgid "  --debug-focus       Display debugging output for focus handling\n"
-msgstr ""
+msgstr "  --debug-focus       Näytä vianjäljitystuloste ikkunavalitsimelle\n"
 
 #: openbox/openbox.c:500
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
-msgstr ""
+msgstr "  --debug-xinerama    Jaa näyttö kahteen vale xinerama ruutuun\n"
 
 #: openbox/openbox.c:501
 #, c-format
@@ -296,17 +297,17 @@ msgstr "Virheellinen valitsin '%s'\n"
 #: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
-msgstr "Ikkunakäsittelijä on jo käynnissä näytöllä %d"
+msgstr "Ikkunointiohjelma on jo käynnissä näytöllä %d"
 
 #: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
-msgstr ""
+msgstr "Ikkunointiohjelman valinta ruudulla %d ei onnistunut"
 
 #: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
-msgstr ""
+msgstr "Ikkunointiohjelma ruudulla %d ei sulkeudu"
 
 #: openbox/screen.c:1162
 #, c-format
@@ -336,7 +337,7 @@ msgstr "Suoritetaan %s\n"
 #: openbox/translate.c:59
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
-msgstr ""
+msgstr "Virheellinen valintanäppäin '%s' näppäin/hiirisidonnoissa"
 
 #: openbox/translate.c:138
 #, c-format
@@ -351,7 +352,7 @@ msgstr "Virheellinen näppäin '%s' pikanäppäimissä"
 #: openbox/translate.c:151
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
-msgstr ""
+msgstr "Näppäin '%s' ei ole esillä näytöllä"
 
 #: openbox/xerror.c:40
 #, c-format

From 9366b6dba5b72c4346bc509ac92b9f4035ec2339 Mon Sep 17 00:00:00 2001
From: Shaodong Di <gnuyhlfh@gmail.com>
Date: Fri, 18 Jan 2008 15:04:50 +0100
Subject: [PATCH 78/79] Update simplified chinese translation.

---
 po/zh_CN.po | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 259e6bf0..c4e98352 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,16 +1,17 @@
-# Simplified Chinese Messages for openbox.
+# 简体中文 / Simplified Chinese Messages for openbox.
 # Copyright (C) 2007 Mikael Magnusson
 # This file is distributed under the same license as the openbox package.
-# Xiaoyu PENG <peng.xiaoyu@gmail.com>, 2007.
 #
+# Xiaoyu PENG <peng.xiaoyu@gmail.com>, 2007.
+# Shaodong Di <gnuyhlfh@gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.4.2\n"
+"Project-Id-Version: Openbox 3.4.6\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2008-01-17 22:13+0100\n"
-"PO-Revision-Date: 2007-05-28 13:00+0800\n"
-"Last-Translator: Xiaoyu PENG <peng.xiaoyu@gmail.com>\n"
-"Language-Team: None\n"
+"PO-Revision-Date: 2008-01-18 15:02+0100\n"
+"Last-Translator: Shaodong Di <gnuyhlfh@gmail.com>\n"
+"Language-Team: 简体中文\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,11 +33,11 @@ msgstr "执行 '%s' 时失败: %s"
 
 #: openbox/client.c:1973 openbox/client.c:2005
 msgid "Killing..."
-msgstr ""
+msgstr "杀死中..."
 
 #: openbox/client.c:1975 openbox/client.c:2007
 msgid "Not Responding"
-msgstr ""
+msgstr "无响应"
 
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."
@@ -44,15 +45,15 @@ msgstr "跳转到..."
 
 #: openbox/client_list_combined_menu.c:96
 msgid "Manage desktops"
-msgstr ""
+msgstr "管理桌面"
 
 #: openbox/client_list_combined_menu.c:97 openbox/client_list_menu.c:156
 msgid "_Add new desktop"
-msgstr ""
+msgstr "添加新桌面(_A)"
 
 #: openbox/client_list_combined_menu.c:98 openbox/client_list_menu.c:157
 msgid "_Remove last desktop"
-msgstr ""
+msgstr "移除最后一个桌面(_R)"
 
 #: openbox/client_list_combined_menu.c:150
 msgid "Windows"
@@ -144,7 +145,7 @@ msgstr "执行管道菜单的命令 '%s' 时失败: %s"
 #: openbox/menu.c:185
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
-msgstr "无效的管道菜单输出 '%s'"
+msgstr "管道菜单 '%s' 的输出无效"
 
 #: openbox/menu.c:198
 #, c-format
@@ -172,19 +173,19 @@ msgstr "无法切换到主目录 '%s': %s"
 
 #: openbox/openbox.c:150
 msgid "Failed to open the display from the DISPLAY environment variable."
-msgstr "在打开DISPLAY环境变量所指定的X显示时失败"
+msgstr "在打开DISPLAY环境变量所指定的X显示时失败。"
 
 #: openbox/openbox.c:181
 msgid "Failed to initialize the obrender library."
-msgstr "初始化obrender库时失败"
+msgstr "初始化obrender库时失败。"
 
 #: openbox/openbox.c:187
 msgid "X server does not support locale."
-msgstr "X服务器不支持该Locale"
+msgstr "X服务器不支持locale。"
 
 #: openbox/openbox.c:189
 msgid "Cannot set locale modifiers for the X server."
-msgstr "无法设置X服务器的locale修饰项"
+msgstr "无法设置X服务器的locale修饰键。"
 
 #: openbox/openbox.c:252
 msgid "Unable to find a valid config file, using some simple defaults"
@@ -192,7 +193,7 @@ msgstr "无法找到有效的配置文件，使用一些简单的默认值"
 
 #: openbox/openbox.c:278
 msgid "Unable to load a theme."
-msgstr "无法读入主题"
+msgstr "无法读入主题。"
 
 #: openbox/openbox.c:405
 #, c-format
@@ -201,7 +202,7 @@ msgstr "重新启动以执行新的可执行文件 '%s' 时失败: %s"
 
 #: openbox/openbox.c:475 openbox/openbox.c:477
 msgid "Copyright (c)"
-msgstr "版权 (c)"
+msgstr "版权所有 (c)"
 
 #: openbox/openbox.c:486
 msgid "Syntax: openbox [options]\n"
@@ -217,7 +218,7 @@ msgstr ""
 
 #: openbox/openbox.c:488
 msgid "  --help              Display this help and exit\n"
-msgstr "  --help              显示帮助选项后退出\n"
+msgstr "  --help              显示该帮助信息后退出\n"
 
 #: openbox/openbox.c:489
 msgid "  --version           Display the version and exit\n"
@@ -229,7 +230,7 @@ msgstr "  --replace           替换当前运行的窗口管理器\n"
 
 #: openbox/openbox.c:491
 msgid "  --sm-disable        Disable connection to the session manager\n"
-msgstr "  --sm-disable        禁止与会话管理器的连接\n"
+msgstr "  --sm-disable        禁止连接到会话管理器\n"
 
 #: openbox/openbox.c:492
 msgid ""
@@ -237,19 +238,19 @@ msgid ""
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 "\n"
-"传递信息给运行中的Openbox实例：\n"
+"传递信息给运行中的 Openbox 实例：\n"
 
 #: openbox/openbox.c:493
 msgid "  --reconfigure       Reload Openbox's configuration\n"
-msgstr "  --reconfigure       重新读入Openbox的配置\n"
+msgstr "  --reconfigure       重新载入 Openbox 的配置\n"
 
 #: openbox/openbox.c:494
 msgid "  --restart           Restart Openbox\n"
-msgstr "  --restart           重新启动Openbox\n"
+msgstr "  --restart           重新启动 Openbox\n"
 
 #: openbox/openbox.c:495
 msgid "  --exit              Exit Openbox\n"
-msgstr ""
+msgstr "  --exit              退出 Openbox\n"
 
 #: openbox/openbox.c:496
 msgid ""

From 4b41ac8343efa21a959d81a4db8aea32e5960f10 Mon Sep 17 00:00:00 2001
From: Inko Illarramendi Arancibia <inkoia@gmail.com>
Date: Sat, 19 Jan 2008 14:36:42 +0100
Subject: [PATCH 79/79] Update Basque translation.

---
 po/eu.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/eu.po b/po/eu.po
index 2e115245..0d2b8961 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.4.5\n"
+"Project-Id-Version: Openbox 3.4.6\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2008-01-17 22:13+0100\n"
-"PO-Revision-Date: 2008-01-11 01:00+0100\n"
+"PO-Revision-Date: 2008-01-19 14:34+0100\n"
 "Last-Translator: Inko I. A. <inkoia@gmail.com>\n"
 "Language-Team: Inko I. A. <inkoia@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 #: openbox/actions.c:149
 #, c-format
 msgid "Invalid action '%s' requested. No such action exists."
-msgstr ""
+msgstr "Eskatutako '%s' ekintza baliogabea. Ez da ekintza hori existitzen."
 
 #: openbox/actions/execute.c:88
 #, c-format
@@ -32,11 +32,11 @@ msgstr "Hutsegitea '%s' exekutatzean: %s"
 
 #: openbox/client.c:1973 openbox/client.c:2005
 msgid "Killing..."
-msgstr ""
+msgstr "Akabatzen..."
 
 #: openbox/client.c:1975 openbox/client.c:2007
 msgid "Not Responding"
-msgstr ""
+msgstr "Erantzunik Ez"
 
 #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93
 msgid "Go there..."