Merge branch 'backport' into 3.4

diff --cc po/en@boldquot.po
index 95cc675cd340f0f5254df2b869fce2e645df17b2,27d3ab16a24c0e25d07b1e80f7d45f673a10bd35..b4ffa96f790e4c142e35797b1e8440f98f5ca3f0
--- 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-05-24 16:33+0200\n"
- "PO-Revision-Date: 2008-05-24 16:33+0200\n"
+ "POT-Creation-Date: 2008-11-15 22:28+0100\n"
+ "PO-Revision-Date: 2008-11-15 22:28+0100\n"
  "Last-Translator: Automatically generated\n"
  "Language-Team: none\n"
  "MIME-Version: 1.0\n"

diff --cc po/en@quot.po
index acb8719cbee6ea464dbb56ce9e6733e0bc806b53,4a8ed32428e654bd25eb424a002a3241d4793a24..e76d119b20e5de27696f383a33d9cf1fa2acc300
--- 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-05-24 16:33+0200\n"
- "PO-Revision-Date: 2008-05-24 16:33+0200\n"
+ "POT-Creation-Date: 2008-11-15 22:28+0100\n"
+ "PO-Revision-Date: 2008-11-15 22:28+0100\n"
  "Last-Translator: Automatically generated\n"
  "Language-Team: none\n"
  "MIME-Version: 1.0\n"