[MERGE] Fixed previous merges.
authorJulien Thewys <jth@openerp.com>
Tue, 6 Apr 2010 12:33:25 +0000 (14:33 +0200)
committerJulien Thewys <jth@openerp.com>
Tue, 6 Apr 2010 12:33:25 +0000 (14:33 +0200)
commit24d873fdbecf7444b861d59e8a7a4bcea1fc0f92
tree6826dc82266c7df055de32c336bba7e00edd1069
parent92740a41b75699781e01c3e28b03c04b914f8f0e
[MERGE] Fixed previous merges.

bzr revid: jth@openerp.com-20100406123325-219p7klnjaen82h2
bin/addons/base/i18n/bg.po
bin/addons/base/i18n/hr.po
bin/addons/base/i18n/it.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