[MERGE] Fixed previous merges.

bzr revid: jth@openerp.com-20100406123325-219p7klnjaen82h2

7 files changed, 0 insertions, 185 deletions

diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index 7061cf9d069..297b2d31301 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -7,29 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-<<<<<<< TREE
-<<<<<<< TREE
-"PO-Revision-Date: 2010-03-30 04:19+0000\n"
-=======
-"PO-Revision-Date: 2010-03-31 08:05+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "PO-Revision-Date: 2010-04-01 04:11+0000\n"
->>>>>>> MERGE-SOURCE
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< 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-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 1f286953955..51a7f1d772a 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -7,45 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"PO-Revision-Date: 2010-03-30 04:36+0000\n"
-=======
-"PO-Revision-Date: 2010-03-31 06:01+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-01 04:15+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-03 04:32+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "PO-Revision-Date: 2010-04-05 04:33+0000\n"
->>>>>>> MERGE-SOURCE
 "Last-Translator: goranc <goranc@gmail.com>\n"
 "Language-Team: openerp-translators\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:52+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "X-Launchpad-Export-Date: 2010-04-06 04:00+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index 8a9a054c1dd..f98e352340b 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -7,22 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-<<<<<<< TREE
-"PO-Revision-Date: 2010-03-30 09:53+0000\n"
-"Last-Translator: Carlo Vettore <Unknown>\n"
-=======
 "PO-Revision-Date: 2010-03-31 05:14+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
->>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< 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-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index ad273b86073..f55114223a5 100644
--- 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
 "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-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 58aab09492b..04fc6b3d022 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,45 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"PO-Revision-Date: 2010-03-30 04:18+0000\n"
-=======
-"PO-Revision-Date: 2010-03-31 04:49+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-01 04:09+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-03 04:28+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "PO-Revision-Date: 2010-04-05 04:37+0000\n"
->>>>>>> MERGE-SOURCE
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: <>\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:52+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "X-Launchpad-Export-Date: 2010-04-06 04:01+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index a1612c6d22d..2557ca954df 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -7,45 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"PO-Revision-Date: 2010-03-30 04:37+0000\n"
-=======
-"PO-Revision-Date: 2010-03-31 05:27+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-01 04:14+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-03 04:31+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "PO-Revision-Date: 2010-04-05 04:31+0000\n"
->>>>>>> MERGE-SOURCE
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \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:52+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "X-Launchpad-Export-Date: 2010-04-06 04:01+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 9f124f629d9..3010205f573 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -7,45 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"PO-Revision-Date: 2010-03-30 04:19+0000\n"
-=======
-"PO-Revision-Date: 2010-03-31 05:03+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-01 04:12+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-03 04:30+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "PO-Revision-Date: 2010-04-05 04:30+0000\n"
->>>>>>> MERGE-SOURCE
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \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:52+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "X-Launchpad-Export-Date: 2010-04-06 04:01+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base