[MERGE]
authornch@tinyerp.com <>
Tue, 11 May 2010 12:37:33 +0000 (18:07 +0530)
committernch@tinyerp.com <>
Tue, 11 May 2010 12:37:33 +0000 (18:07 +0530)
commita63e66d6aab26a9cbbcd6eb8428774ad838e00fd
treef38f534a3c97112daf1bfaa7fe8e83c0423280a7
parenta9c0b3f78ea3f1b73c3b1b3922cc5d4470258e5f
parent2ceb51f030f7a3f72761929ef041bbfacba931c7
[MERGE]

bzr revid: nch@tinyerp.com-20100511123733-b3apvl3smadicbq3
bin/addons/base/i18n/hr.po
bin/addons/base/i18n/ja.po
bin/addons/base/i18n/sv.po
bin/addons/base/i18n/uk.po
bin/addons/base/i18n/zh_CN.po