Merge branch 'backport' into 3.4-working

diff --combined po/en@boldquot.po
index 050a3dc,676483b..62ed6bf
--- 1/po/en@boldquot.po
--- 2/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@@ -30,10 -30,10 +30,10 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: openbox 3.999.0\n"
 +"Project-Id-Version: openbox 3.4.7-pre1\n"
  "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
- "POT-Creation-Date: 2008-02-28 23:00+0100\n"
- "PO-Revision-Date: 2008-02-28 23:00+0100\n"
+ "POT-Creation-Date: 2008-03-02 17:58-0500\n"
+ "PO-Revision-Date: 2008-03-02 17:58-0500\n"
  "Last-Translator: Automatically generated\n"
  "Language-Team: none\n"
  "MIME-Version: 1.0\n"
@@@ -46,49 -46,69 +46,69 @@@
  msgid "Invalid action \"%s\" requested. No such action exists."
  msgstr "Invalid action “\e[1m%s\e[0m” requested. No such action exists."
  
- #: openbox/actions/execute.c:124
+ #: openbox/actions/execute.c:128
  msgid "No"
  msgstr "No"
  
- #: openbox/actions/execute.c:125
+ #: openbox/actions/execute.c:129
  msgid "Yes"
  msgstr "Yes"
  
- #: openbox/actions/execute.c:137
+ #: openbox/actions/execute.c:133
+ msgid "Execute"
+ msgstr "Execute"
+ 
+ #: openbox/actions/execute.c:142
  #, c-format
  msgid "Failed to convert the path \"%s\" from utf8"
  msgstr "Failed to convert the path “\e[1m%s\e[0m” from utf8"
  
- #: openbox/actions/execute.c:146 openbox/actions/execute.c:165
- #, c-format
- msgid "Failed to execute \"%s\": %s"
- msgstr "Failed to execute “\e[1m%s\e[0m”: %s"
- 
- #: openbox/actions/exit.c:46 openbox/client.c:3444
+ #: openbox/actions/exit.c:52 openbox/actions/session.c:62
+ #: openbox/client.c:3460
  msgid "Cancel"
  msgstr "Cancel"
  
- #: openbox/actions/exit.c:47
+ #: openbox/actions/exit.c:53
  msgid "Exit"
  msgstr "Exit"
  
- #: openbox/actions/exit.c:50
+ #: openbox/actions/exit.c:56
  msgid "Are you sure you want to exit Openbox?"
  msgstr "Are you sure you want to exit Openbox?"
  
- #: openbox/client.c:1996
+ #: openbox/actions/exit.c:57
+ msgid "Exit Openbox"
+ msgstr "Exit Openbox"
+ 
+ #: openbox/actions/session.c:41
+ msgid ""
+ "The SessionLogout actions is not available since Openbox was built without "
+ "session management support"
+ msgstr ""
+ "The SessionLogout actions is not available since Openbox was built without "
+ "session management support"
+ 
+ #: openbox/actions/session.c:63 openbox/actions/session.c:68
+ msgid "Log out"
+ msgstr "Log out"
+ 
+ #: openbox/actions/session.c:67
+ msgid "Are you sure you want to log out?"
+ msgstr "Are you sure you want to log out?"
+ 
+ #: openbox/client.c:2004
  msgid "Unnamed Window"
  msgstr "Unnamed Window"
  
- #: openbox/client.c:2010 openbox/client.c:2042
+ #: openbox/client.c:2018 openbox/client.c:2050
  msgid "Killing..."
  msgstr "Killing..."
  
- #: openbox/client.c:2012 openbox/client.c:2044
+ #: openbox/client.c:2020 openbox/client.c:2052
  msgid "Not Responding"
  msgstr "Not Responding"
  
- #: openbox/client.c:3433
+ #: openbox/client.c:3449
  #, c-format
  msgid ""
  "The window \"%s\" does not seem to be responding.  Do you want to force it "
@@@ -97,11 -117,11 +117,11 @@@ msgstr "
  "The window “\e[1m%s\e[0m” does not seem to be responding.  Do you want to force "
  "it to exit by sending the %s signal?"
  
- #: openbox/client.c:3435
+ #: openbox/client.c:3451
  msgid "End Process"
  msgstr "End Process"
  
- #: openbox/client.c:3439
+ #: openbox/client.c:3455
  #, c-format
  msgid ""
  "The window \"%s\" does not seem to be responding.  Do you want to disconnect "
@@@ -110,7 -130,7 +130,7 @@@ msgstr "
  "The window “\e[1m%s\e[0m” does not seem to be responding.  Do you want to "
  "disconnect it from the X server?"
  
- #: openbox/client.c:3441
+ #: openbox/client.c:3457
  msgid "Disconnect"
  msgstr "Disconnect"
  
@@@ -262,28 -282,47 +282,47 @@@ msgstr "X server does not support local
  msgid "Cannot set locale modifiers for the X server."
  msgstr "Cannot set locale modifiers for the X server."
  
- #: openbox/openbox.c:264
+ #: openbox/openbox.c:266
  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:298
+ #: openbox/openbox.c:300
  msgid "Unable to load a theme."
  msgstr "Unable to load a theme."
  
- #: openbox/openbox.c:428
+ #: 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 ""
+ "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 “\e[1m%s\e[0m” line %d, with message: %s"
+ 
+ #: openbox/openbox.c:382
+ msgid "Openbox Syntax Error"
+ msgstr "Openbox Syntax Error"
+ 
+ #: openbox/openbox.c:382
+ msgid "Close"
+ msgstr "Close"
+ 
+ #: openbox/openbox.c:451
  #, c-format
  msgid "Restart failed to execute new executable \"%s\": %s"
  msgstr "Restart failed to execute new executable “\e[1m%s\e[0m”: %s"
  
- #: openbox/openbox.c:498 openbox/openbox.c:500
+ #: openbox/openbox.c:521 openbox/openbox.c:523
  msgid "Copyright (c)"
  msgstr "Copyright (c)"
  
- #: openbox/openbox.c:509
+ #: openbox/openbox.c:532
  msgid "Syntax: openbox [options]\n"
  msgstr "Syntax: openbox [options]\n"
  
- #: openbox/openbox.c:510
+ #: openbox/openbox.c:533
  msgid ""
  "\n"
  "Options:\n"
@@@ -291,30 -330,30 +330,30 @@@ msgstr "
  "\n"
  "Options:\n"
  
- #: openbox/openbox.c:511
+ #: openbox/openbox.c:534
  msgid "  --help              Display this help and exit\n"
  msgstr "  --help              Display this help and exit\n"
  
- #: openbox/openbox.c:512
+ #: openbox/openbox.c:535
  msgid "  --version           Display the version and exit\n"
  msgstr "  --version           Display the version and exit\n"
  
- #: openbox/openbox.c:513
+ #: openbox/openbox.c:536
  msgid "  --replace           Replace the currently running window manager\n"
  msgstr "  --replace           Replace the currently running window manager\n"
  
  #. 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:517
+ #: openbox/openbox.c:540
  msgid "  --config-file FILE  Specify the path to the config file to use\n"
  msgstr "  --config-file FILE  Specify the path to the config file to use\n"
  
- #: openbox/openbox.c:518
+ #: openbox/openbox.c:541
  msgid "  --sm-disable        Disable connection to the session manager\n"
  msgstr "  --sm-disable        Disable connection to the session manager\n"
  
- #: openbox/openbox.c:519
+ #: openbox/openbox.c:542
  msgid ""
  "\n"
  "Passing messages to a running Openbox instance:\n"
@@@ -322,19 -361,19 +361,19 @@@ msgstr "
  "\n"
  "Passing messages to a running Openbox instance:\n"
  
- #: openbox/openbox.c:520
+ #: openbox/openbox.c:543
  msgid "  --reconfigure       Reload Openbox's configuration\n"
  msgstr "  --reconfigure       Reload Openbox's configuration\n"
  
- #: openbox/openbox.c:521
+ #: openbox/openbox.c:544
  msgid "  --restart           Restart Openbox\n"
  msgstr "  --restart           Restart Openbox\n"
  
- #: openbox/openbox.c:522
+ #: openbox/openbox.c:545
  msgid "  --exit              Exit Openbox\n"
  msgstr "  --exit              Exit Openbox\n"
  
- #: openbox/openbox.c:523
+ #: openbox/openbox.c:546
  msgid ""
  "\n"
  "Debugging options:\n"
@@@ -342,23 -381,23 +381,23 @@@ msgstr "
  "\n"
  "Debugging options:\n"
  
- #: openbox/openbox.c:524
+ #: openbox/openbox.c:547
  msgid "  --sync              Run in synchronous mode\n"
  msgstr "  --sync              Run in synchronous mode\n"
  
- #: openbox/openbox.c:525
+ #: openbox/openbox.c:548
  msgid "  --debug             Display debugging output\n"
  msgstr "  --debug             Display debugging output\n"
  
- #: openbox/openbox.c:526
+ #: openbox/openbox.c:549
  msgid "  --debug-focus       Display debugging output for focus handling\n"
  msgstr "  --debug-focus       Display debugging output for focus handling\n"
  
- #: openbox/openbox.c:527
+ #: openbox/openbox.c:550
  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:528
+ #: openbox/openbox.c:551
  #, c-format
  msgid ""
  "\n"
@@@ -367,11 -406,11 +406,11 @@@ msgstr "
  "\n"
  "Please report bugs at %s\n"
  
- #: openbox/openbox.c:597
+ #: openbox/openbox.c:620
  msgid "--config-file requires an argument\n"
  msgstr "--config-file requires an argument\n"
  
- #: openbox/openbox.c:640
+ #: openbox/openbox.c:663
  #, c-format
  msgid "Invalid command line argument \"%s\"\n"
  msgstr "Invalid command line argument “\e[1m%s\e[0m”\n"
@@@ -409,21 -448,25 +448,25 @@@ msgstr "
  msgid "desktop %i"
  msgstr "desktop %i"
  
- #: openbox/session.c:103
+ #: openbox/session.c:104
  #, c-format
  msgid "Unable to make directory \"%s\": %s"
  msgstr "Unable to make directory “\e[1m%s\e[0m”: %s"
  
- #: openbox/session.c:451
+ #: openbox/session.c:452
  #, c-format
  msgid "Unable to save the session to \"%s\": %s"
  msgstr "Unable to save the session to “\e[1m%s\e[0m”: %s"
  
- #: openbox/session.c:583
+ #: openbox/session.c:584
  #, c-format
  msgid "Error while saving the session to \"%s\": %s"
  msgstr "Error while saving the session to “\e[1m%s\e[0m”: %s"
  
+ #: openbox/session.c:821
+ msgid "Not connected to a session manager"
+ msgstr "Not connected to a session manager"
+ 
  #: openbox/startupnotify.c:243
  #, c-format
  msgid "Running %s\n"
@@@ -454,6 -497,6 +497,6 @@@ msgstr "Requested key “\e[1m%s\e[0m” 
  msgid "X Error: %s"
  msgstr "X Error: %s"
  
- #: openbox/prompt.c:182
+ #: openbox/prompt.c:200
  msgid "OK"
  msgstr "OK"

diff --combined po/en@quot.po
index 2ee697b,021ba66..a98bdb2
--- 1/po/en@quot.po
--- 2/po/en@quot.po
+++ b/po/en@quot.po
@@@ -27,10 -27,10 +27,10 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: openbox 3.999.0\n"
 +"Project-Id-Version: openbox 3.4.7-pre1\n"
  "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
- "POT-Creation-Date: 2008-02-28 23:00+0100\n"
- "PO-Revision-Date: 2008-02-28 23:00+0100\n"
+ "POT-Creation-Date: 2008-03-02 17:58-0500\n"
+ "PO-Revision-Date: 2008-03-02 17:58-0500\n"
  "Last-Translator: Automatically generated\n"
  "Language-Team: none\n"
  "MIME-Version: 1.0\n"
@@@ -43,49 -43,69 +43,69 @@@
  msgid "Invalid action \"%s\" requested. No such action exists."
  msgstr "Invalid action “%s” requested. No such action exists."
  
- #: openbox/actions/execute.c:124
+ #: openbox/actions/execute.c:128
  msgid "No"
  msgstr "No"
  
- #: openbox/actions/execute.c:125
+ #: openbox/actions/execute.c:129
  msgid "Yes"
  msgstr "Yes"
  
- #: openbox/actions/execute.c:137
+ #: openbox/actions/execute.c:133
+ msgid "Execute"
+ msgstr "Execute"
+ 
+ #: openbox/actions/execute.c:142
  #, c-format
  msgid "Failed to convert the path \"%s\" from utf8"
  msgstr "Failed to convert the path “%s” from utf8"
  
- #: openbox/actions/execute.c:146 openbox/actions/execute.c:165
- #, c-format
- msgid "Failed to execute \"%s\": %s"
- msgstr "Failed to execute “%s”: %s"
- 
- #: openbox/actions/exit.c:46 openbox/client.c:3444
+ #: openbox/actions/exit.c:52 openbox/actions/session.c:62
+ #: openbox/client.c:3460
  msgid "Cancel"
  msgstr "Cancel"
  
- #: openbox/actions/exit.c:47
+ #: openbox/actions/exit.c:53
  msgid "Exit"
  msgstr "Exit"
  
- #: openbox/actions/exit.c:50
+ #: openbox/actions/exit.c:56
  msgid "Are you sure you want to exit Openbox?"
  msgstr "Are you sure you want to exit Openbox?"
  
- #: openbox/client.c:1996
+ #: openbox/actions/exit.c:57
+ msgid "Exit Openbox"
+ msgstr "Exit Openbox"
+ 
+ #: openbox/actions/session.c:41
+ msgid ""
+ "The SessionLogout actions is not available since Openbox was built without "
+ "session management support"
+ msgstr ""
+ "The SessionLogout actions is not available since Openbox was built without "
+ "session management support"
+ 
+ #: openbox/actions/session.c:63 openbox/actions/session.c:68
+ msgid "Log out"
+ msgstr "Log out"
+ 
+ #: openbox/actions/session.c:67
+ msgid "Are you sure you want to log out?"
+ msgstr "Are you sure you want to log out?"
+ 
+ #: openbox/client.c:2004
  msgid "Unnamed Window"
  msgstr "Unnamed Window"
  
- #: openbox/client.c:2010 openbox/client.c:2042
+ #: openbox/client.c:2018 openbox/client.c:2050
  msgid "Killing..."
  msgstr "Killing..."
  
- #: openbox/client.c:2012 openbox/client.c:2044
+ #: openbox/client.c:2020 openbox/client.c:2052
  msgid "Not Responding"
  msgstr "Not Responding"
  
- #: openbox/client.c:3433
+ #: openbox/client.c:3449
  #, c-format
  msgid ""
  "The window \"%s\" does not seem to be responding.  Do you want to force it "
@@@ -94,11 -114,11 +114,11 @@@ msgstr "
  "The window “%s” does not seem to be responding.  Do you want to force it to "
  "exit by sending the %s signal?"
  
- #: openbox/client.c:3435
+ #: openbox/client.c:3451
  msgid "End Process"
  msgstr "End Process"
  
- #: openbox/client.c:3439
+ #: openbox/client.c:3455
  #, c-format
  msgid ""
  "The window \"%s\" does not seem to be responding.  Do you want to disconnect "
@@@ -107,7 -127,7 +127,7 @@@ msgstr "
  "The window “%s” does not seem to be responding.  Do you want to disconnect "
  "it from the X server?"
  
- #: openbox/client.c:3441
+ #: openbox/client.c:3457
  msgid "Disconnect"
  msgstr "Disconnect"
  
@@@ -259,28 -279,47 +279,47 @@@ msgstr "X server does not support local
  msgid "Cannot set locale modifiers for the X server."
  msgstr "Cannot set locale modifiers for the X server."
  
- #: openbox/openbox.c:264
+ #: openbox/openbox.c:266
  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:298
+ #: openbox/openbox.c:300
  msgid "Unable to load a theme."
  msgstr "Unable to load a theme."
  
- #: openbox/openbox.c:428
+ #: 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 ""
+ "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"
+ 
+ #: openbox/openbox.c:382
+ msgid "Openbox Syntax Error"
+ msgstr "Openbox Syntax Error"
+ 
+ #: openbox/openbox.c:382
+ msgid "Close"
+ msgstr "Close"
+ 
+ #: openbox/openbox.c:451
  #, c-format
  msgid "Restart failed to execute new executable \"%s\": %s"
  msgstr "Restart failed to execute new executable “%s”: %s"
  
- #: openbox/openbox.c:498 openbox/openbox.c:500
+ #: openbox/openbox.c:521 openbox/openbox.c:523
  msgid "Copyright (c)"
  msgstr "Copyright (c)"
  
- #: openbox/openbox.c:509
+ #: openbox/openbox.c:532
  msgid "Syntax: openbox [options]\n"
  msgstr "Syntax: openbox [options]\n"
  
- #: openbox/openbox.c:510
+ #: openbox/openbox.c:533
  msgid ""
  "\n"
  "Options:\n"
@@@ -288,30 -327,30 +327,30 @@@ msgstr "
  "\n"
  "Options:\n"
  
- #: openbox/openbox.c:511
+ #: openbox/openbox.c:534
  msgid "  --help              Display this help and exit\n"
  msgstr "  --help              Display this help and exit\n"
  
- #: openbox/openbox.c:512
+ #: openbox/openbox.c:535
  msgid "  --version           Display the version and exit\n"
  msgstr "  --version           Display the version and exit\n"
  
- #: openbox/openbox.c:513
+ #: openbox/openbox.c:536
  msgid "  --replace           Replace the currently running window manager\n"
  msgstr "  --replace           Replace the currently running window manager\n"
  
  #. 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:517
+ #: openbox/openbox.c:540
  msgid "  --config-file FILE  Specify the path to the config file to use\n"
  msgstr "  --config-file FILE  Specify the path to the config file to use\n"
  
- #: openbox/openbox.c:518
+ #: openbox/openbox.c:541
  msgid "  --sm-disable        Disable connection to the session manager\n"
  msgstr "  --sm-disable        Disable connection to the session manager\n"
  
- #: openbox/openbox.c:519
+ #: openbox/openbox.c:542
  msgid ""
  "\n"
  "Passing messages to a running Openbox instance:\n"
@@@ -319,19 -358,19 +358,19 @@@ msgstr "
  "\n"
  "Passing messages to a running Openbox instance:\n"
  
- #: openbox/openbox.c:520
+ #: openbox/openbox.c:543
  msgid "  --reconfigure       Reload Openbox's configuration\n"
  msgstr "  --reconfigure       Reload Openbox's configuration\n"
  
- #: openbox/openbox.c:521
+ #: openbox/openbox.c:544
  msgid "  --restart           Restart Openbox\n"
  msgstr "  --restart           Restart Openbox\n"
  
- #: openbox/openbox.c:522
+ #: openbox/openbox.c:545
  msgid "  --exit              Exit Openbox\n"
  msgstr "  --exit              Exit Openbox\n"
  
- #: openbox/openbox.c:523
+ #: openbox/openbox.c:546
  msgid ""
  "\n"
  "Debugging options:\n"
@@@ -339,23 -378,23 +378,23 @@@ msgstr "
  "\n"
  "Debugging options:\n"
  
- #: openbox/openbox.c:524
+ #: openbox/openbox.c:547
  msgid "  --sync              Run in synchronous mode\n"
  msgstr "  --sync              Run in synchronous mode\n"
  
- #: openbox/openbox.c:525
+ #: openbox/openbox.c:548
  msgid "  --debug             Display debugging output\n"
  msgstr "  --debug             Display debugging output\n"
  
- #: openbox/openbox.c:526
+ #: openbox/openbox.c:549
  msgid "  --debug-focus       Display debugging output for focus handling\n"
  msgstr "  --debug-focus       Display debugging output for focus handling\n"
  
- #: openbox/openbox.c:527
+ #: openbox/openbox.c:550
  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:528
+ #: openbox/openbox.c:551
  #, c-format
  msgid ""
  "\n"
@@@ -364,11 -403,11 +403,11 @@@ msgstr "
  "\n"
  "Please report bugs at %s\n"
  
- #: openbox/openbox.c:597
+ #: openbox/openbox.c:620
  msgid "--config-file requires an argument\n"
  msgstr "--config-file requires an argument\n"
  
- #: openbox/openbox.c:640
+ #: openbox/openbox.c:663
  #, c-format
  msgid "Invalid command line argument \"%s\"\n"
  msgstr "Invalid command line argument “%s”\n"
@@@ -406,21 -445,25 +445,25 @@@ msgstr "
  msgid "desktop %i"
  msgstr "desktop %i"
  
- #: openbox/session.c:103
+ #: openbox/session.c:104
  #, c-format
  msgid "Unable to make directory \"%s\": %s"
  msgstr "Unable to make directory “%s”: %s"
  
- #: openbox/session.c:451
+ #: openbox/session.c:452
  #, c-format
  msgid "Unable to save the session to \"%s\": %s"
  msgstr "Unable to save the session to “%s”: %s"
  
- #: openbox/session.c:583
+ #: openbox/session.c:584
  #, c-format
  msgid "Error while saving the session to \"%s\": %s"
  msgstr "Error while saving the session to “%s”: %s"
  
+ #: openbox/session.c:821
+ msgid "Not connected to a session manager"
+ msgstr "Not connected to a session manager"
+ 
  #: openbox/startupnotify.c:243
  #, c-format
  msgid "Running %s\n"
@@@ -451,6 -494,6 +494,6 @@@ msgstr "Requested key “%s” does no
  msgid "X Error: %s"
  msgstr "X Error: %s"
  
- #: openbox/prompt.c:182
+ #: openbox/prompt.c:200
  msgid "OK"
  msgstr "OK"