Merge lp:~openerp-dev/openobject-addons/7.0-opw-594352-fka into lp:openobject-addons/7.0

Proposed by Foram Katharotiya (OpenERP)
Status: Rejected
Rejected by: Naresh(OpenERP)
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-594352-fka
Merge into: lp:openobject-addons/7.0
Diff against target: 15 lines (+5/-0)
1 file modified
sale_stock/i18n/sale_stock.pot (+5/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-594352-fka
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Disapprove
Review via email: mp+173399@code.launchpad.net

Description of the change

Hello,

I have added the delivery time translation of 'Day' in the orderline form view.

Thanks,
FKA

To post a comment you must log in.
9276. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hi Foram Katharotiya,

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.

Thanks,
Naresh Soni,
OpenERP Enterprise Services

review: Disapprove

Unmerged revisions

9276. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

9275. By Foram Katharotiya (OpenERP)

[MERGE] with 7.0

9274. By Foram Katharotiya (OpenERP)

[IMP] translate days string in orderline form view

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'sale_stock/i18n/sale_stock.pot'
--- sale_stock/i18n/sale_stock.pot 2013-06-07 19:43:09 +0000
+++ sale_stock/i18n/sale_stock.pot 2013-07-08 05:02:24 +0000
@@ -271,6 +271,11 @@
271msgstr ""271msgstr ""
272272
273#. module: sale_stock273#. module: sale_stock
274#: view:sale.order.line:0
275msgid "days"
276msgstr ""
277
278#. module: sale_stock
274#: field:sale.order.line,product_packaging:0279#: field:sale.order.line,product_packaging:0
275msgid "Packaging"280msgid "Packaging"
276msgstr ""281msgstr ""