From: Dana Jansens <danakj@orodu.net>
Date: Sun, 2 Mar 2008 23:11:45 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.7-pre2^0
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=3337bbcb9d776be204d7b2feee28a7e4308bf9ad;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4-working
---

3337bbcb9d776be204d7b2feee28a7e4308bf9ad
diff --cc po/en@boldquot.po
index 050a3dcb,676483be..62ed6bf8
--- 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-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"
diff --cc po/en@quot.po
index 2ee697b5,021ba66f..a98bdb27
--- 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-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"