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

[Dharti Ratani(OpenERP)]

Hello sir,

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

Thanks

[Naresh(OpenERP) (nch-openerp)]

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

=== modified file 'product/i18n/product.pot'
--- product/i18n/product.pot	2013-03-07 12:19:34 +0000
+++ product/i18n/product.pot	2013-05-09 13:07:07 +0000
@@ -313,6 +313,16 @@
 msgstr ""
 
 #. module: product
+#: view:res.partner:0
+msgid "Pricelists are managed on"
+msgstr ""
+
+#. module: product
+#: view:res.partner:0
+msgid "the parent company"
+msgstr ""
+
+#. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
 msgstr ""