Merge branch 'backport' into 3.4-working

diff --cc po/en@boldquot.po
index 62ed6bf88b15967d5b0eb2a72a108981a95ec79f,4aeb68e4ca87844e1f512aec96e6d8718abf28aa..dade8521ab7613a3b70f4e818efc29520725cb04
--- 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-03-02 17:58-0500\n"
- "PO-Revision-Date: 2008-03-02 17:58-0500\n"
+ "POT-Creation-Date: 2008-03-02 18:34-0500\n"
+ "PO-Revision-Date: 2008-03-02 18:34-0500\n"
  "Last-Translator: Automatically generated\n"
  "Language-Team: none\n"
  "MIME-Version: 1.0\n"

diff --cc po/en@quot.po
index a98bdb27b37077479244cfed17f3aa13932714f2,c85b614e3a5206bdef24a8054e92d63f8e504865..b702f8cb2b48e74caf536cbf6375f90a3970c9b2
--- 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-03-02 17:58-0500\n"
- "PO-Revision-Date: 2008-03-02 17:58-0500\n"
+ "POT-Creation-Date: 2008-03-02 18:34-0500\n"
+ "PO-Revision-Date: 2008-03-02 18:34-0500\n"
  "Last-Translator: Automatically generated\n"
  "Language-Team: none\n"
  "MIME-Version: 1.0\n"