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

Proposed by Dharti Ratani(OpenERP) on 2013-05-09
Status: Rejected
Rejected by: Naresh(OpenERP) on 2013-06-11
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-592415-dhr
Merge into: lp:openobject-addons/7.0
Diff against target: 20 lines (+10/-0)
1 file modified
product/i18n/product.pot (+10/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-592415-dhr
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) 2013-05-09 Disapprove on 2013-06-11
Review via email: mp+163140@code.launchpad.net

Description of the change

Hello sir,

Added the translation for 'Pricelists are managed on the parent company' in contact form.

Thanks

To post a comment you must log in.
Naresh(OpenERP) (nch-openerp) wrote :

Hi Dharti,

Merge proposals should not include changes related to *.pot's. The missing term is added more frequently at the time of release of a version, and even after the release when there are lot of new terms added. The terms will be detected automatically when a complete re-export of translations is done.

As of now the recent merge at Revision ID 9210 : <email address hidden> was done to re-synchronize the missing terms which does include the terms that you have in the merge proposal.

Thanks,
Naresh Soni,
OpenERP Enterprise Services

review: Disapprove

Unmerged revisions

9108. By Dharti Ratani(OpenERP) on 2013-05-09

[IMP]Added translation for 'Pricelists are managed on the parent company' in customer form

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'product/i18n/product.pot'
2--- product/i18n/product.pot 2013-03-07 12:19:34 +0000
3+++ product/i18n/product.pot 2013-05-09 13:07:07 +0000
4@@ -313,6 +313,16 @@
5 msgstr ""
6
7 #. module: product
8+#: view:res.partner:0
9+msgid "Pricelists are managed on"
10+msgstr ""
11+
12+#. module: product
13+#: view:res.partner:0
14+msgid "the parent company"
15+msgstr ""
16+
17+#. module: product
18 #: field:product.template,product_manager:0
19 msgid "Product Manager"
20 msgstr ""