From: Mikael Magnusson <mikachu@gmail.com>
Date: Sat, 15 Nov 2008 21:51:44 +0000 (+0100)
Subject: Merge branch 'backport' into 3.4
X-Git-Tag: release-3.4.8-rc2~7
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=f509eb486f897a24f84ccda5f9748300045b534f;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4
---

f509eb486f897a24f84ccda5f9748300045b534f
diff --cc po/en@boldquot.po
index 95cc675c,27d3ab16..b4ffa96f
--- a/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 acb8719c,4a8ed324..e76d119b
--- a/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"