Merge branch 'backport' into work

Conflicts:

	openbox/session.c

32 files changed, 331 insertions, 164 deletions

diff --git a/data/menu.xml b/data/menu.xml
index 51b1a96b..61fba664 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -350,6 +350,12 @@
       <startupnotify><enabled>yes</enabled></startupnotify>
     </action>
   </item>
+  <item label="Xfce Settings">
+    <action name="Execute">
+      <command>xfce-setting-show</command>
+      <startupnotify><enabled>yes</enabled></startupnotify>
+    </action>
+  </item>
   <item label="Manage Cups Printers">
     <action name="Execute">
       <command>xdg-open http://localhost:631/</command>
diff --git a/openbox/actions/session.c b/openbox/actions/session.c
index 775deab1..a70aee50 100644
--- a/openbox/actions/session.c
+++ b/openbox/actions/session.c
@@ -38,7 +38,7 @@ static gboolean prompt_cb(ObPrompt *p, gint result, gpointer data)
 #ifdef USE_SM
         session_request_logout(o->silent);
 #else
-        g_message(_("The SessionLogout actions is not available since Openbox was built without session management support"));
+        g_message(_("The SessionLogout action is not available since Openbox was built without session management support"));
 #endif
     }
     return TRUE; /* call cleanup func */
diff --git a/openbox/session.c b/openbox/session.c
index 3cf8fbe2..ca45adb9 100644
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -408,7 +408,22 @@ static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type,
     ObSMSaveData *savedata = NULL;
     gchar *vendor;
 
-    ob_debug_type(OB_DEBUG_SM, "Session save requested");
+#ifdef DEBUG
+    {
+        const gchar *sname =
+            (save_type == SmSaveLocal ? "SmSaveLocal" :
+             (save_type == SmSaveGlobal ? "SmSaveGlobal" :
+              (save_type == SmSaveBoth ? "SmSaveBoth" : "INVALID!!")));
+        ob_debug_type(OB_DEBUG_SM, "Session save requested, type %s\n", sname);
+    }
+#endif
+
+    if (save_type == SmSaveGlobal) {
+        /* we have no data to save.  we only store state to get back to where
+           we were, we don't keep open writable files or anything */
+        SmcSaveYourselfDone(conn, TRUE);
+        return;
+    }
 
     vendor = SmcVendor(sm_conn);
     ob_debug_type(OB_DEBUG_SM, "Session manager's vendor: %s", vendor);
@@ -818,7 +833,7 @@ void session_request_logout(gboolean silent)
 {
     if (sm_conn) {
         SmcRequestSaveYourself(sm_conn,
-                               SmSaveBoth,
+                               SmSaveGlobal,
                                TRUE, /* logout */
                                (silent ?
                                 SmInteractStyleNone : SmInteractStyleAny),
diff --git a/po/ar.po b/po/ar.po
index 96aeee7f..bb855aab 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: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+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"
@@ -59,7 +59,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 36752984..82513c20 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: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+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"
@@ -59,7 +59,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index be12392c..8ee46cc5 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: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+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"
@@ -56,7 +56,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index f80ba3ef..df041857 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.6\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
 "PO-Revision-Date: 2008-02-09 09:33+0100\n"
 "Last-Translator: tezlo <tezlo@gmx.net>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -56,7 +56,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 2a89ce18..0e1cfb68 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\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"
@@ -59,7 +59,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index 4aeb68e4..c384063c 100644
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -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: 2008-03-02 18:34-0500\n"
-"PO-Revision-Date: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
+"PO-Revision-Date: 2008-03-03 02:10+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -82,10 +82,10 @@ msgstr "Exit Openbox"
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 
 #: openbox/actions/session.c:63 openbox/actions/session.c:68
diff --git a/po/en@quot.po b/po/en@quot.po
index c85b614e..0241f832 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -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: 2008-03-02 18:34-0500\n"
-"PO-Revision-Date: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
+"PO-Revision-Date: 2008-03-03 02:10+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -79,10 +79,10 @@ msgstr "Exit Openbox"
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 
 #: openbox/actions/session.c:63 openbox/actions/session.c:68
diff --git a/po/es.po b/po/es.po
index 93bda6c0..1dbf2e9c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.6.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
 "PO-Revision-Date: 2008-02-19 00:15+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: español <es@li.org>\n"
@@ -60,7 +60,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/et.po b/po/et.po
index 1ae2b198..d476ef43 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: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+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"
@@ -57,7 +57,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/eu.po b/po/eu.po
index 08df3b40..ec6732d3 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: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+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"
@@ -56,7 +56,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 6923fedb..5b31208d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.6.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
 "PO-Revision-Date: 2008-02-20 20:58+0200\n"
 "Last-Translator: Elias Julkunen <elias.julkunen@gmail.com>\n"
 "Language-Team: None\n"
@@ -59,7 +59,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 24519eeb..ae80d7a1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.4.5\n"
+"Project-Id-Version: Openbox 3.4.7\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-03-02 18:34-0500\n"
-"PO-Revision-Date: 2008-01-17 22:53+0100\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
+"PO-Revision-Date: 2008-03-02 02:06+0100\n"
 "Last-Translator: Cyrille Bagard <nocbos@gmail.com>\n"
 "Language-Team: fran�ais <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgstr "Action demand�e invalide \"%s\". Une telle action n'existe pas."
 
 #: openbox/actions/execute.c:128
 msgid "No"
-msgstr ""
+msgstr "Non"
 
 #: openbox/actions/execute.c:129
 msgid "Yes"
-msgstr ""
+msgstr "Oui"
 
 #: openbox/actions/execute.c:133
 msgid "Execute"
-msgstr ""
+msgstr "Ex�cuter"
 
 #: openbox/actions/execute.c:142
 #, c-format
@@ -44,37 +44,39 @@ msgstr "�chec de la conversion du chemin ��%s�� depuis l'UTF-8"
 #: openbox/actions/exit.c:52 openbox/actions/session.c:62
 #: openbox/client.c:3460
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #: openbox/actions/exit.c:53
 msgid "Exit"
-msgstr ""
+msgstr "Quitter"
 
 #: openbox/actions/exit.c:56
 msgid "Are you sure you want to exit Openbox?"
-msgstr ""
+msgstr "Etes vous certain de vouloir quitter Openbox ?"
 
 #: openbox/actions/exit.c:57
 msgid "Exit Openbox"
-msgstr ""
+msgstr "Quitter Openbox"
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
+"L'action SessionLogout n'est pas disponible comme Openbox a �t� construit "
+"sans support de gestion de session"
 
 #: openbox/actions/session.c:63 openbox/actions/session.c:68
 msgid "Log Out"
-msgstr ""
+msgstr "D�connexion"
 
 #: openbox/actions/session.c:67
 msgid "Are you sure you want to log out?"
-msgstr ""
+msgstr "Etes vous certain de vouloir vous d�connecter ?"
 
 #: openbox/client.c:2004
 msgid "Unnamed Window"
-msgstr ""
+msgstr "Fen�tre sans nom"
 
 #: openbox/client.c:2018 openbox/client.c:2050
 msgid "Killing..."
@@ -90,10 +92,12 @@ msgid ""
 "The window \"%s\" does not seem to be responding.  Do you want to force it "
 "to exit by sending the %s signal?"
 msgstr ""
+"La fen�tre \"%s\" semble ne pas r�pondre. Voulez vous la forcer � se "
+"terminer en envoyant un signal %s ?"
 
 #: openbox/client.c:3451
 msgid "End Process"
-msgstr ""
+msgstr "Fin de processus"
 
 #: openbox/client.c:3455
 #, c-format
@@ -101,10 +105,12 @@ msgid ""
 "The window \"%s\" does not seem to be responding.  Do you want to disconnect "
 "it from the X server?"
 msgstr ""
+"La fen�tre \"%s\" semble ne pas r�pondre. Voulez vous la d�connecter du "
+"serveur X ?"
 
 #: openbox/client.c:3457
 msgid "Disconnect"
-msgstr ""
+msgstr "D�connexion"
 
 #: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91
 msgid "Go there..."
@@ -274,10 +280,14 @@ msgid ""
 "configuration files.  See stdout for more information.  The last error seen "
 "was in file \"%s\" line %d, with message: %s"
 msgstr ""
+"Une ou plusieurs erreurs de syntaxe XML ont �t� trouv�es lors de l'analyse "
+"des fichiers de configuration d'Openbox.  Voir stdout pour plus "
+"d'information.  La derni�re erreur vue �tait dans le fichier \"%s\", ligne %"
+"d, avec le message : %s"
 
 #: openbox/openbox.c:382
 msgid "Openbox Syntax Error"
-msgstr ""
+msgstr "Erreur de syntaxe Openbox"
 
 #: openbox/openbox.c:382
 msgid "Close"
@@ -325,6 +335,8 @@ msgstr ""
 #: openbox/openbox.c:540
 msgid "  --config-file FILE  Specify the path to the config file to use\n"
 msgstr ""
+"  --config-file FILE  Sp�cifie le chemin du fichier de configuration � "
+"utiliser\n"
 
 #: openbox/openbox.c:541
 msgid "  --sm-disable        Disable connection to the session manager\n"
@@ -389,7 +401,7 @@ msgstr ""
 
 #: openbox/openbox.c:620
 msgid "--config-file requires an argument\n"
-msgstr ""
+msgstr "--config-file requiert un argument\n"
 
 #: openbox/openbox.c:663
 #, c-format
@@ -424,6 +436,8 @@ msgid ""
 "Openbox is configured for %d desktops, but the current session has %d.  "
 "Overriding the Openbox configuration."
 msgstr ""
+"Openbox est configur� pour %d bureaux, mais la session en a %d.  Ceci "
+"supplante la configuration d'Openbox."
 
 #: openbox/screen.c:1180
 #, c-format
@@ -447,7 +461,7 @@ msgstr "Erreur lors de la sauvegarde de la session depuis ��%s���: %s"
 
 #: openbox/session.c:821
 msgid "Not connected to a session manager"
-msgstr ""
+msgstr "Non connect� � un gestionnaire de session"
 
 #: openbox/startupnotify.c:243
 #, c-format
@@ -483,7 +497,7 @@ msgstr "Erreur X�: %s"
 
 #: openbox/prompt.c:200
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #~ msgid "Failed to execute \"%s\": %s"
 #~ msgstr "�chec de l'ex�cution de ��%s���: %s"
diff --git a/po/hr.po b/po/hr.po
index 82f6a80f..3c943efd 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.3\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-23 16:20+0200\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
 "PO-Revision-Date: 2006-09-05 16:45+0100\n"
 "Last-Translator: Daniel Radetic <drade@boobah.info>\n"
 "Language-Team: None\n"
@@ -15,314 +15,447 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: openbox/action.c:954
+#: openbox/actions.c:150
 #, c-format
 msgid "Invalid action \"%s\" requested. No such action exists."
 msgstr ""
 
-#: openbox/action.c:957
+#: openbox/actions/execute.c:128
+msgid "No"
+msgstr ""
+
+#: openbox/actions/execute.c:129
+msgid "Yes"
+msgstr ""
+
+#: openbox/actions/execute.c:133
+msgid "Execute"
+msgstr ""
+
+#: openbox/actions/execute.c:142
 #, c-format
-msgid "Invalid use of action \"%s\". Action will be ignored."
+msgid "Failed to convert the path \"%s\" from utf8"
 msgstr ""
 
-#: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257
+#: openbox/actions/exit.c:52 openbox/actions/session.c:62
+#: openbox/client.c:3460
+msgid "Cancel"
+msgstr ""
+
+#: openbox/actions/exit.c:53
+msgid "Exit"
+msgstr ""
+
+#: openbox/actions/exit.c:56
+msgid "Are you sure you want to exit Openbox?"
+msgstr ""
+
+#: openbox/actions/exit.c:57
+msgid "Exit Openbox"
+msgstr ""
+
+#: openbox/actions/session.c:41
+msgid ""
+"The SessionLogout action is not available since Openbox was built without "
+"session management support"
+msgstr ""
+
+#: openbox/actions/session.c:63 openbox/actions/session.c:68
+msgid "Log Out"
+msgstr ""
+
+#: openbox/actions/session.c:67
+msgid "Are you sure you want to log out?"
+msgstr ""
+
+#: openbox/client.c:2004
+msgid "Unnamed Window"
+msgstr ""
+
+#: openbox/client.c:2018 openbox/client.c:2050
+msgid "Killing..."
+msgstr ""
+
+#: openbox/client.c:2020 openbox/client.c:2052
+msgid "Not Responding"
+msgstr ""
+
+#: openbox/client.c:3449
 #, c-format
-msgid "Failed to execute \"%s\": %s"
+msgid ""
+"The window \"%s\" does not seem to be responding.  Do you want to force it "
+"to exit by sending the %s signal?"
+msgstr ""
+
+#: openbox/client.c:3451
+msgid "End Process"
 msgstr ""
 
-#: openbox/action.c:1265
+#: openbox/client.c:3455
 #, c-format
-msgid "Failed to convert the path \"%s\" from utf8"
+msgid ""
+"The window \"%s\" does not seem to be responding.  Do you want to disconnect "
+"it from the X server?"
 msgstr ""
 
-#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:104
+#: openbox/client.c:3457
+msgid "Disconnect"
+msgstr ""
+
+#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91
 msgid "Go there..."
 msgstr "Odi na..."
 
-#: openbox/client_list_combined_menu.c:148
+#: openbox/client_list_combined_menu.c:94
+#, fuzzy
+msgid "Manage desktops"
+msgstr "Sve radne površine"
+
+#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155
+#, fuzzy
+msgid "_Add new desktop"
+msgstr "_Pošalji na radnu površinu"
+
+#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156
+#, fuzzy
+msgid "_Remove last desktop"
+msgstr "_Pošalji na radnu površinu"
+
+#: openbox/client_list_combined_menu.c:149
 msgid "Windows"
 msgstr ""
 
-#: openbox/client_list_menu.c:196
+#: openbox/client_list_menu.c:203
 msgid "Desktops"
 msgstr "Radne površine"
 
-#: openbox/client_menu.c:246
+#: openbox/client_menu.c:258
 msgid "All desktops"
 msgstr "Sve radne površine"
 
-#: openbox/client_menu.c:351
+#: openbox/client_menu.c:370
 msgid "_Layer"
 msgstr ""
 
-#: openbox/client_menu.c:356
+#: openbox/client_menu.c:375
 msgid "Always on _top"
 msgstr "Uvijek na _vrhu"
 
-#: openbox/client_menu.c:357
+#: openbox/client_menu.c:376
 msgid "_Normal"
 msgstr "_Normalno"
 
-#: openbox/client_menu.c:358
+#: openbox/client_menu.c:377
 msgid "Always on _bottom"
 msgstr "Uvijek na _dnu"
 
-#: openbox/client_menu.c:361
+#: openbox/client_menu.c:379
 msgid "_Send to desktop"
 msgstr "_Pošalji na radnu površinu"
 
-#: openbox/client_menu.c:365
+#: openbox/client_menu.c:383
 msgid "Client menu"
 msgstr "Meni klijenta"
 
-#: openbox/client_menu.c:371
+#: openbox/client_menu.c:393
 msgid "R_estore"
 msgstr "Ponovno uspostav_i"
 
-#: openbox/client_menu.c:379
+#: openbox/client_menu.c:397
 msgid "_Move"
 msgstr "Po_makni"
 
-#: openbox/client_menu.c:381
+#: openbox/client_menu.c:399
 msgid "Resi_ze"
 msgstr "Prom_jeni veličinu"
 
-#: openbox/client_menu.c:383
+#: openbox/client_menu.c:401
 msgid "Ico_nify"
 msgstr "Iko_nificiraj"
 
-#: openbox/client_menu.c:391
+#: openbox/client_menu.c:405
 msgid "Ma_ximize"
 msgstr "M_aksimiziraj"
 
-#: openbox/client_menu.c:399
+#: openbox/client_menu.c:409
 msgid "_Roll up/down"
 msgstr ""
 
-#: openbox/client_menu.c:401
+#: openbox/client_menu.c:411
 msgid "Un/_Decorate"
 msgstr ""
 
-#: openbox/client_menu.c:411
+#: openbox/client_menu.c:415
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: openbox/config.c:701
+#: openbox/config.c:781
 #, c-format
 msgid "Invalid button \"%s\" specified in config file"
 msgstr ""
 
-#: openbox/keyboard.c:162
+#: openbox/keyboard.c:157
 msgid "Conflict with key binding in config file"
 msgstr ""
 
-#: openbox/menu.c:98 openbox/menu.c:106
+#: openbox/menu.c:103 openbox/menu.c:111
 #, c-format
 msgid "Unable to find a valid menu file \"%s\""
 msgstr ""
 
-#: openbox/menu.c:149
+#: openbox/menu.c:171
 #, c-format
 msgid "Failed to execute command for pipe-menu \"%s\": %s"
 msgstr ""
 
-#: openbox/menu.c:166
+#: openbox/menu.c:185
 #, c-format
 msgid "Invalid output from pipe-menu \"%s\""
 msgstr ""
 
-#: openbox/menu.c:179
+#: openbox/menu.c:198
 #, c-format
 msgid "Attempted to access menu \"%s\" but it does not exist"
 msgstr ""
 
-#: openbox/menu.c:331 openbox/menu.c:332
+#: openbox/menu.c:368 openbox/menu.c:369
 msgid "More..."
 msgstr ""
 
-#: openbox/mouse.c:338
+#: openbox/mouse.c:373
 #, c-format
 msgid "Invalid button \"%s\" in mouse binding"
 msgstr ""
 
-#: openbox/mouse.c:344
+#: openbox/mouse.c:379
 #, c-format
 msgid "Invalid context \"%s\" in mouse binding"
 msgstr ""
 
-#: openbox/openbox.c:129
+#: openbox/openbox.c:134
 #, c-format
 msgid "Unable to change to home directory \"%s\": %s"
 msgstr ""
 
-#: openbox/openbox.c:149
+#: openbox/openbox.c:154
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr ""
 
-#: openbox/openbox.c:180
+#: openbox/openbox.c:185
 msgid "Failed to initialize the obrender library."
 msgstr ""
 
-#: openbox/openbox.c:186
+#: openbox/openbox.c:196
 msgid "X server does not support locale."
 msgstr ""
 
-#: openbox/openbox.c:188
+#: openbox/openbox.c:198
 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 
-#: openbox/openbox.c:249
+#: openbox/openbox.c:266
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 
-#: openbox/openbox.c:275
+#: openbox/openbox.c:300
 msgid "Unable to load a theme."
 msgstr ""
 
-#: openbox/openbox.c:394
+#: openbox/openbox.c:380
+#, c-format
+msgid ""
+"One or more XML syntax errors were found while parsing the Openbox "
+"configuration files.  See stdout for more information.  The last error seen "
+"was in file \"%s\" line %d, with message: %s"
+msgstr ""
+
+#: openbox/openbox.c:382
+msgid "Openbox Syntax Error"
+msgstr ""
+
+#: openbox/openbox.c:382
+#, fuzzy
+msgid "Close"
+msgstr "_Zatvori"
+
+#: openbox/openbox.c:451
 #, c-format
 msgid "Restart failed to execute new executable \"%s\": %s"
 msgstr ""
 
-#: openbox/openbox.c:464 openbox/openbox.c:466
+#: openbox/openbox.c:521 openbox/openbox.c:523
 msgid "Copyright (c)"
 msgstr ""
 
-#: openbox/openbox.c:475
+#: openbox/openbox.c:532
 msgid "Syntax: openbox [options]\n"
 msgstr ""
 
-#: openbox/openbox.c:476
+#: openbox/openbox.c:533
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 
-#: openbox/openbox.c:477
+#: openbox/openbox.c:534
 msgid "  --help              Display this help and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:478
+#: openbox/openbox.c:535
 msgid "  --version           Display the version and exit\n"
 msgstr ""
 
-#: openbox/openbox.c:479
+#: openbox/openbox.c:536
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
 
-#: openbox/openbox.c:480
+#. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..."
+#. aligned still, if you have to, make a new line with \n and 22 spaces. It's
+#. fine to leave it as FILE though.
+#: openbox/openbox.c:540
+msgid "  --config-file FILE  Specify the path to the config file to use\n"
+msgstr ""
+
+#: openbox/openbox.c:541
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
 
-#: openbox/openbox.c:481
+#: openbox/openbox.c:542
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 
-#: openbox/openbox.c:482
+#: openbox/openbox.c:543
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr ""
 
-#: openbox/openbox.c:483
+#: openbox/openbox.c:544
 msgid "  --restart           Restart Openbox\n"
 msgstr ""
 
-#: openbox/openbox.c:484
+#: openbox/openbox.c:545
+msgid "  --exit              Exit Openbox\n"
+msgstr ""
+
+#: openbox/openbox.c:546
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 
-#: openbox/openbox.c:485
+#: openbox/openbox.c:547
 msgid "  --sync              Run in synchronous mode\n"
 msgstr ""
 
-#: openbox/openbox.c:486
+#: openbox/openbox.c:548
 msgid "  --debug             Display debugging output\n"
 msgstr ""
 
-#: openbox/openbox.c:487
+#: openbox/openbox.c:549
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
 
-#: openbox/openbox.c:488
+#: openbox/openbox.c:550
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 
-#: openbox/openbox.c:489
+#: openbox/openbox.c:551
 #, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 
-#: openbox/openbox.c:586
+#: openbox/openbox.c:620
+msgid "--config-file requires an argument\n"
+msgstr ""
+
+#: openbox/openbox.c:663
 #, c-format
 msgid "Invalid command line argument \"%s\"\n"
 msgstr ""
 
-#: openbox/screen.c:88 openbox/screen.c:189
+#: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
 msgstr ""
 
-#: openbox/screen.c:125
+#: openbox/screen.c:124
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
 
-#: openbox/screen.c:146
+#: openbox/screen.c:145
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr ""
 
-#: openbox/screen.c:939
+#. TRANSLATORS: If you need to specify a different order of the
+#. arguments, you can use %1$d for the first one and %2$d for the
+#. second one. For example,
+#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..."
+#: openbox/screen.c:412
+#, c-format
+msgid ""
+"Openbox is configured for %d desktops, but the current session has %d.  "
+"Overriding the Openbox configuration."
+msgstr ""
+
+#: openbox/screen.c:1180
 #, c-format
 msgid "desktop %i"
 msgstr ""
 
-#: openbox/session.c:103
+#: openbox/session.c:104
 #, c-format
 msgid "Unable to make directory \"%s\": %s"
 msgstr "Nemogu napraviti direktorij \"%s\": %s"
 
-#: openbox/session.c:451
+#: openbox/session.c:452
 #, c-format
 msgid "Unable to save the session to \"%s\": %s"
 msgstr ""
 
-#: openbox/session.c:583
+#: openbox/session.c:584
 #, c-format
 msgid "Error while saving the session to \"%s\": %s"
 msgstr ""
 
-#: openbox/startupnotify.c:237
+#: openbox/session.c:821
+msgid "Not connected to a session manager"
+msgstr ""
+
+#: openbox/startupnotify.c:243
 #, c-format
 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 ""
+
+#: openbox/prompt.c:200
+msgid "OK"
+msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 8d91d1c3..390cc7fb 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: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+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"
@@ -57,7 +57,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 06614658..efc108e1 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: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+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"
@@ -57,7 +57,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index b7b32c3d..876d117c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.4.7\n"
+"Project-Id-Version: Openbox 3.4.6.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
 "PO-Revision-Date: 2008-03-02 17:18+0100\n"
 "Last-Translator: Ryoichiro Suzuki <ryoichiro.suzuki@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -59,7 +59,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 03c3887a..3e1c22f7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.6.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
 "PO-Revision-Date: 2007-07-12 13:01+0200\n"
 "Last-Translator: Marvin Vek\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -58,7 +58,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/no.po b/po/no.po
index a9c5b3f2..e8efaa28 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.6\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
 "PO-Revision-Date: 2008-01-29 13:37+0100\n"
 "Last-Translator: Michael Kjelbergvik Thung <postlogic@gmail.com>\n"
 "Language-Team: None\n"
@@ -56,7 +56,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/openbox.pot b/po/openbox.pot
index 52b280f8..d4e00604 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: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+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"
@@ -57,7 +57,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 8336d2df..fb2d2671 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: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+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"
@@ -58,7 +58,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/pt.po b/po/pt.po
index f0d7708f..17401279 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
 "PO-Revision-Date: 2008-03-02 19:11+0100\n"
 "Last-Translator: Althaser <Althaser@gmail.com>\n"
 "Language-Team: None\n"
@@ -57,7 +57,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f22a2858..47d4a435 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.4.7\n"
+"Project-Id-Version: Openbox 3.4.6.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
 "PO-Revision-Date: 2008-02-28 17:26-0500\n"
 "Last-Translator: Og Maciel <ogmaciel@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
@@ -58,7 +58,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 3a2b1a54..47187f3c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
 "PO-Revision-Date: 2008-01-22 07:56+0100\n"
 "Last-Translator: Nikita Bukhvostov <dragon.djanic@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -57,7 +57,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/sk.po b/po/sk.po
index 3b520f45..37f4578e 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: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+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"
@@ -56,7 +56,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 6affd1d7..6b0d6d3f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.7\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-03-02 18:34-0500\n"
-"PO-Revision-Date: 2008-03-03 00:07+0100\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
+"PO-Revision-Date: 2008-03-03 00:43+0100\n"
 "Last-Translator: Mikael Magnusson <mikachu@icculus.org>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -56,14 +56,13 @@ msgstr "Avsluta Openbox"
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 "Kommandot SessionLogout �r inte tillg�ngligt eftersom Openbox kompilerades "
 "utan st�d f�r sessionshantering"
 
 #: openbox/actions/session.c:63 openbox/actions/session.c:68
-#, fuzzy
 msgid "Log Out"
 msgstr "Logga ut"
 
@@ -73,7 +72,7 @@ msgstr "�r du s�ker p� att du vill logga ut?"
 
 #: openbox/client.c:2004
 msgid "Unnamed Window"
-msgstr "Namnl�st F�nster"
+msgstr "Namnl�st f�nster"
 
 #: openbox/client.c:2018 openbox/client.c:2050
 msgid "Killing..."
@@ -81,7 +80,7 @@ msgstr "D�dar..."
 
 #: openbox/client.c:2020 openbox/client.c:2052
 msgid "Not Responding"
-msgstr "Svarar Inte"
+msgstr "Svarar inte"
 
 #: openbox/client.c:3449
 #, c-format
@@ -94,7 +93,7 @@ msgstr ""
 
 #: openbox/client.c:3451
 msgid "End Process"
-msgstr "Avsluta Process"
+msgstr "Avsluta process"
 
 #: openbox/client.c:3455
 #, c-format
@@ -107,7 +106,7 @@ msgstr ""
 
 #: openbox/client.c:3457
 msgid "Disconnect"
-msgstr "St�ng Anslutning"
+msgstr "St�ng anslutning"
 
 #: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91
 msgid "Go there..."
@@ -279,7 +278,7 @@ msgstr ""
 
 #: openbox/openbox.c:382
 msgid "Openbox Syntax Error"
-msgstr "Openbox Syntaxfel"
+msgstr "Openbox syntaxfel"
 
 #: openbox/openbox.c:382
 msgid "Close"
@@ -438,7 +437,7 @@ msgstr "Kunde inte spara sessionen till \"%s\": %s"
 #: openbox/session.c:584
 #, c-format
 msgid "Error while saving the session to \"%s\": %s"
-msgstr "Fel intr�ffade n�r sessionen skulle sparas till \"%s\": %s"
+msgstr "Ett fel intr�ffade n�r sessionen skulle sparas till \"%s\": %s"
 
 #: openbox/session.c:821
 msgid "Not connected to a session manager"
diff --git a/po/ua.po b/po/ua.po
index aeef9202..a781e04e 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: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+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"
@@ -56,7 +56,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index 29e22341..357b7766 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: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+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"
@@ -56,7 +56,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 52ebbfae..2eb11815 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
 "PO-Revision-Date: 2008-01-18 15:02+0100\n"
 "Last-Translator: Shaodong Di <gnuyhlfh@gmail.com>\n"
 "Language-Team: 简体中文\n"
@@ -57,7 +57,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f102c08d..a0c1d089 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.6.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-03-02 18:34-0500\n"
+"POT-Creation-Date: 2008-03-03 02:10+0100\n"
 "PO-Revision-Date: 2008-02-17 23:29+0800\n"
 "Last-Translator: 洪任諭 <pcman.tw@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -58,7 +58,7 @@ msgstr ""
 
 #: openbox/actions/session.c:41
 msgid ""
-"The SessionLogout actions is not available since Openbox was built without "
+"The SessionLogout action is not available since Openbox was built without "
 "session management support"
 msgstr ""