[MERGE] translations: source line numbers added in PO, ORM terms exported in base, XML comments ignored
[MERGE] translations: source line numbers added in PO, ORM terms exported in base, XML comments ignored

akretion/openerp-server,akretion/openerp-server,akretion/openerp-server