[MERGE]

bzr revid: nch@tinyerp.com-20100211051256-ftb0n5kbz3ngv3o5
bzr revid: nch@tinyerp.com-20100211055245-z4wv7gmjd487eirn
bzr revid: nch@tinyerp.com-20100216044824-r2jb3ecpu3mk1fgr
bzr revid: nch@tinyerp.com-20100224044009-rtzm4lxn02c2sjra

diff --cc bin/addons/base/i18n/hr.po
index 1ffc23d,be55442..4be565e
--- 1/bin/addons/base/i18n/hr.po
--- 2/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@@ -7,14 -7,15 +7,15 @@@ 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-02 05:57+0000\n"
 -"PO-Revision-Date: 2010-02-24 13:16+0000\n"
++"PO-Revision-Date: 2010-02-22 05:40+0000\n"
  "Last-Translator: goranc <goranc@gmail.com>\n"
- "Language-Team: \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-02-03 04:46+0000\n"
 -"X-Launchpad-Export-Date: 2010-02-25 04:50+0000\n"
++"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
+ "Language: hr\n"
  
  #. module: base
  #: model:res.country,name:base.sh
@@@ -1435,6 -1458,7 +1458,7 @@@ msgstr "Madagaskar
  msgid ""
  "The Object name must start with x_ and not contain any special character !"
  msgstr ""
 -"Naziv objekta mora početi s x_ i ne smije sadržavati posebne znakove !"
++"aziv objekta mora početi s x_ i ne smije sadržavati posebne znakove !"
  
  #. module: base
  #: help:ir.rule.group,global:0

diff --cc bin/addons/base/i18n/ja.po
index cc4e892,d3c2018..9edb5c9
--- 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-07 05:11+0000\n"
 -"PO-Revision-Date: 2010-02-24 06:13+0000\n"
 -"Last-Translator: OpenERP Administrators <Unknown>\n"
++"PO-Revision-Date: 2010-02-22 05:38+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-08 04:44+0000\n"
 -"X-Launchpad-Export-Date: 2010-02-25 04:50+0000\n"
++"X-Launchpad-Export-Date: 2010-02-23 05:04+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: base

diff --cc bin/addons/base/i18n/zh_TW.po
index 197a647,bdc50bf..467fb6f
--- 1/bin/addons/base/i18n/zh_TW.po
--- 2/bin/addons/base/i18n/zh_TW.po
+++ b/bin/addons/base/i18n/zh_TW.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: 2009-11-24 12:56+0000\n"
- "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 -"PO-Revision-Date: 2010-02-24 06:09+0000\n"
 -"Last-Translator: OpenERP Administrators <Unknown>\n"
++"PO-Revision-Date: 2010-02-15 05:47+0000\n"
++"Last-Translator: Walter Cheuk <wwycheuk@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-01-14 04:48+0000\n"
 -"X-Launchpad-Export-Date: 2010-02-25 04:50+0000\n"
++"X-Launchpad-Export-Date: 2010-02-17 04:54+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: base