merge trunk server

bzr revid: ysa@tinyerp.co.in-20100218120711-97tassv4yqrpwi7l

diff --cc bin/addons/base/i18n/bg.po
index bd834fa,ad0302d..565199d
--- 1/bin/addons/base/i18n/bg.po
--- 2/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.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-16 22:52+0000\n"
 -"PO-Revision-Date: 2010-02-18 05:29+0000\n"
++"PO-Revision-Date: 2010-02-17 16:21+0000\n"
  "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"
- "X-Launchpad-Export-Date: 2010-02-17 04:54+0000\n"
 -"X-Launchpad-Export-Date: 2010-02-19 04:36+0000\n"
++"X-Launchpad-Export-Date: 2010-02-18 04:46+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: base

diff --cc bin/addons/base/i18n/ja.po
index 3beecb1,6407f7a..c8dcd87
--- 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-02-16 06:09+0000\n"
 -"PO-Revision-Date: 2010-02-18 05:27+0000\n"
++"PO-Revision-Date: 2010-02-17 06:04+0000\n"
  "Last-Translator: Fabien (Open ERP) <fp@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-02-17 04:54+0000\n"
 -"X-Launchpad-Export-Date: 2010-02-19 04:36+0000\n"
++"X-Launchpad-Export-Date: 2010-02-18 04:46+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: base