[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: atp@tinyerp.co.in-20100506052023-zbrn4vgylneq3ibv

diff --cc addons/account/i18n/pl.po
index 2305e11,95a498d..48b88ee
--- 1/addons/account/i18n/pl.po
--- 2/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@@ -13,7 -13,7 +13,7 @@@ msgstr "
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
- "X-Launchpad-Export-Date: 2010-05-03 04:03+0000\n"
 -"X-Launchpad-Export-Date: 2010-05-06 04:04+0000\n"
++"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: account

diff --cc addons/account/i18n/zh_CN.po
index f904e3f,020de45..12e1bb3
--- 1/addons/account/i18n/zh_CN.po
--- 2/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@@ -7,13 -7,13 +7,13 @@@ msgstr "
  "Project-Id-Version: OpenERP Server 5.0.6\n"
  "Report-Msgid-Bugs-To: support@openerp.com\n"
  "POT-Creation-Date: 2009-08-28 16:01+0000\n"
- "PO-Revision-Date: 2010-03-29 00:34+0000\n"
- "Last-Translator: digitalsatori <Unknown>\n"
 -"PO-Revision-Date: 2010-05-06 01:44+0000\n"
 -"Last-Translator: digitalsatori <Unknown>\n"
++"PO-Revision-Date: 2010-05-03 05:57+0000\n"
++"Last-Translator: KenSai <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-04-17 04:08+0000\n"
 -"X-Launchpad-Export-Date: 2010-05-06 04:04+0000\n"
++"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: account