Launchpad automatic translations update.

[odoo/odoo.git] / bin / addons / base / i18n / ja.po

diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index ad273b8..0f9dbb5 100644 (file)
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,45 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"PO-Revision-Date: 2010-03-30 04:24+0000\n"
-=======
-"PO-Revision-Date: 2010-03-31 05:47+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-01 04:13+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-03 04:34+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-05 04:34+0000\n"
->>>>>>> MERGE-SOURCE
+"PO-Revision-Date: 2010-06-06 04:11+0000\n"
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
-=======
-"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"X-Launchpad-Export-Date: 2010-04-04 03:51+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"X-Launchpad-Export-Date: 2010-04-06 04:00+0000\n"
->>>>>>> MERGE-SOURCE
+"X-Launchpad-Export-Date: 2010-06-07 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base