Merge lp:~openerp-dev/openobject-server/7.0-opw-592415-dhr into lp:openobject-server/7.0

Proposed by Dharti Ratani(OpenERP) on 2013-05-09
Status: Merged
Merge reported by: Olivier Dony (Odoo)
Merged at revision: not available
Proposed branch: lp:~openerp-dev/openobject-server/7.0-opw-592415-dhr
Merge into: lp:openobject-server/7.0
Diff against target: 15 lines (+5/-0)
1 file modified
openerp/addons/base/i18n/base.pot (+5/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/7.0-opw-592415-dhr
Reviewer Review Type Date Requested Status
Naresh(OpenERP) 2013-05-09 Pending
Review via email: mp+163139@code.launchpad.net

Description of the change

Hello sir,

Added translations for the 'edit company address' button in partner form.

Thanks
dhr

To post a comment you must log in.
Olivier Dony (Odoo) (odo-openerp) wrote :

This was already done during last PO template re-synchronization. In general you should never make a merge proposal that modifies a POT file or a PO file. POT files are exclusively updated in batch using a specific script, and PO files are exclusively updated by Launchpad.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/i18n/base.pot'
2--- openerp/addons/base/i18n/base.pot 2013-03-07 12:02:59 +0000
3+++ openerp/addons/base/i18n/base.pot 2013-05-09 13:05:30 +0000
4@@ -144,6 +144,11 @@
5 msgstr ""
6
7 #. module: base
8+#: view:res.partner:0
9+msgid "(edit company address)"
10+msgstr ""
11+
12+#. module: base
13 #: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
14 msgid "Belgium - Structured Communication"
15 msgstr ""