From 24d873fdbecf7444b861d59e8a7a4bcea1fc0f92 Mon Sep 17 00:00:00 2001 From: Julien Thewys Date: Tue, 6 Apr 2010 14:33:25 +0200 Subject: [PATCH] [MERGE] Fixed previous merges. bzr revid: jth@openerp.com-20100406123325-219p7klnjaen82h2 --- bin/addons/base/i18n/bg.po | 16 ---------------- bin/addons/base/i18n/hr.po | 32 -------------------------------- bin/addons/base/i18n/it.po | 9 --------- bin/addons/base/i18n/ja.po | 32 -------------------------------- bin/addons/base/i18n/sv.po | 32 -------------------------------- bin/addons/base/i18n/uk.po | 32 -------------------------------- bin/addons/base/i18n/zh_CN.po | 32 -------------------------------- 7 files changed, 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 \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 \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 \n" -======= "PO-Revision-Date: 2010-03-31 05:14+0000\n" "Last-Translator: OpenERP Administrators \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 \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) \n" "Language-Team: Japanese \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 \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) \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 \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