Merged

bzr revid: hda@tinyerp.com-20100323061154-mzl5ud65kktg141v

diff --cc bin/addons/base/i18n/hr.po
index 96d5ca0,9796ae7..840fc02
--- 1/bin/addons/base/i18n/hr.po
--- 2/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@@ -7,13 -7,13 +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"
- "PO-Revision-Date: 2010-03-17 05:13+0000\n"
 -"PO-Revision-Date: 2010-03-28 04:33+0000\n"
++"PO-Revision-Date: 2010-03-21 05:21+0000\n"
  "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"
- "X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
 -"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
++"X-Launchpad-Export-Date: 2010-03-22 04:46+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  "Language: hr\n"
  

diff --cc bin/addons/base/i18n/ja.po
index 22fb11f,75f564d..875deb5
--- 1/bin/addons/base/i18n/ja.po
--- 2/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@@ -8,13 -8,13 +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"
- "PO-Revision-Date: 2010-03-17 05:14+0000\n"
 -"PO-Revision-Date: 2010-03-28 04:35+0000\n"
++"PO-Revision-Date: 2010-03-21 05:26+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"
- "X-Launchpad-Export-Date: 2010-03-18 04:33+0000\n"
 -"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
++"X-Launchpad-Export-Date: 2010-03-22 04:46+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: base

diff --cc bin/addons/base/i18n/pl.po
index 8fbd252,63fd073..9dd00b7
--- 1/bin/addons/base/i18n/pl.po
--- 2/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@@ -7,13 -7,13 +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"
- "PO-Revision-Date: 2010-02-21 06:01+0000\n"
- "Last-Translator: OpenERP Administrators <Unknown>\n"
 -"PO-Revision-Date: 2010-03-22 05:21+0000\n"
++"PO-Revision-Date: 2010-03-21 13:51+0000\n"
+ "Last-Translator: Bartosz Kaszubowski <gosimek@gmail.com>\n"
  "Language-Team: \n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
- "X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 -"X-Launchpad-Export-Date: 2010-03-24 04:52+0000\n"
++"X-Launchpad-Export-Date: 2010-03-22 04:46+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: base

diff --cc bin/addons/base/i18n/sv.po
index ffafa36,0b55076..4d05725
--- 1/bin/addons/base/i18n/sv.po
--- 2/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@@ -7,13 -7,13 +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"
- "PO-Revision-Date: 2010-03-17 05:09+0000\n"
 -"PO-Revision-Date: 2010-03-28 04:27+0000\n"
++"PO-Revision-Date: 2010-03-21 05:18+0000\n"
  "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"
- "X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
 -"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
++"X-Launchpad-Export-Date: 2010-03-22 04:46+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: base

diff --cc bin/addons/base/i18n/uk.po
index 55cbba0,6b492ef..b185d5b
--- 1/bin/addons/base/i18n/uk.po
--- 2/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@@ -7,13 -7,13 +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"
- "PO-Revision-Date: 2010-03-17 05:13+0000\n"
 -"PO-Revision-Date: 2010-03-28 04:33+0000\n"
++"PO-Revision-Date: 2010-03-21 05:24+0000\n"
  "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"
- "X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
 -"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
++"X-Launchpad-Export-Date: 2010-03-22 04:46+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: base

diff --cc bin/addons/base/i18n/zh_CN.po
index 147fb54,17a9877..599004a
--- 1/bin/addons/base/i18n/zh_CN.po
--- 2/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@@ -7,13 -7,13 +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"
- "PO-Revision-Date: 2010-03-17 05:11+0000\n"
 -"PO-Revision-Date: 2010-03-28 04:32+0000\n"
++"PO-Revision-Date: 2010-03-21 05:21+0000\n"
  "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"
- "X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
 -"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n"
++"X-Launchpad-Export-Date: 2010-03-22 04:46+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: base

diff --cc bin/osv/orm.py
Simple merge