Stock and Logistic - Reports

Merge lp://staging/~camptocamp/stock-logistic-report/7.0-stock_picking_webkit-translate into lp://staging/stock-logistic-report

  1. 7.0-stock_picking_webkit-translate
  2. Merge into 7.0
Proposed by Guewen Baconnier @ Camptocamp
Status: Merged
Approved by: Yannick Vaucher @ Camptocamp
Approved revision: 7
Merged at revision: 8
Proposed branch: lp://staging/~camptocamp/stock-logistic-report/7.0-stock_picking_webkit-translate
Merge into: lp://staging/stock-logistic-report
Diff against target: 373 lines (+315/-7)
5 files modified
stock_picking_webkit/i18n/fr.po (+154/-0)
stock_picking_webkit/i18n/stock_picking_webkit.pot (+154/-0)
stock_picking_webkit/report.xml (+1/-1)
stock_picking_webkit/report/delivery.html.mako (+3/-3)
stock_picking_webkit/report/picking.html.mako (+3/-3)
To merge this branch: bzr merge lp://staging/~camptocamp/stock-logistic-report/7.0-stock_picking_webkit-translate
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza Needs Fixing
Yannick Vaucher @ Camptocamp code review, no tests Approve
Leonardo Pistone code review Approve
Review via email: mp+199955@code.staging.launchpad.net

Description of the change

French translation and pot for stock_picking_webkit

To post a comment you must log in.
Revision history for this message
Leonardo Pistone (lepistone) wrote :

LGTM, thanks

review: Approve (code review)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

LGTM, thanks

review: Approve (code review, no tests)
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

When I try to import template file, it says:

PO file: duplicate msgid ending on line 93

So the translation file is useless.

What do you want me to do: fix problem directly overwriting revision or make another MP?

Regards.

review: Needs Fixing
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

I don't get what the problem is.

I just tried to import the fr.po translation in OpenERP:

2014-03-12 14:36:00,310 30448 INFO openerp openerp.tools.translate: loading translation file for language fr_FR
2014-03-12 14:36:00,353 30448 INFO openerp openerp.tools.translate: translation file loaded succesfully

I tried to import the pot file in en_US and it worked too.

And I don't see any duplication of the line 93.

Where did you imported the file? In Launchpad?

Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Import was done in Launchpad:

https://translations.launchpad.net/stock-logistic-report/+imports

for the pot file.

Alexandre Fayolle has tried to approve them, but it's not working. I'm thinking that I can import via Rosetta corrected file, so I'm going to do it.

Regards.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches