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

Proposed by Guewen Baconnier @ Camptocamp
Status: Merged
Approved by: Yannick Vaucher @ Camptocamp
Approved revision: 7
Merged at revision: 8
Proposed branch: lp:~camptocamp/stock-logistic-report/7.0-stock_picking_webkit-translate
Merge into: lp: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:~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.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
1=== added directory 'stock_picking_webkit/i18n'
2=== added file 'stock_picking_webkit/i18n/fr.po'
3--- stock_picking_webkit/i18n/fr.po 1970-01-01 00:00:00 +0000
4+++ stock_picking_webkit/i18n/fr.po 2013-12-23 14:30:38 +0000
5@@ -0,0 +1,154 @@
6+# Translation of OpenERP Server.
7+# This file contains the translation of the following modules:
8+# * stock_picking_webkit
9+#
10+msgid ""
11+msgstr ""
12+"Project-Id-Version: OpenERP Server 7.0\n"
13+"Report-Msgid-Bugs-To: \n"
14+"POT-Creation-Date: 2013-12-23 14:12+0000\n"
15+"PO-Revision-Date: 2013-12-23 14:12+0000\n"
16+"Last-Translator: <>\n"
17+"Language-Team: \n"
18+"MIME-Version: 1.0\n"
19+"Content-Type: text/plain; charset=UTF-8\n"
20+"Content-Transfer-Encoding: \n"
21+"Plural-Forms: \n"
22+
23+#. module: stock_picking_webkit
24+#: report:addons/stock_picking_webkit/report/delivery.html.mako:24
25+#: report:addons/stock_picking_webkit/report/picking.html.mako:25
26+msgid "Origin"
27+msgstr "Origine"
28+
29+#. module: stock_picking_webkit
30+#: model:ir.actions.report.xml,name:stock_picking_webkit.webkit_aggregated_delivery
31+msgid "Aggregated deliveries"
32+msgstr "Livraisons groupées"
33+
34+#. module: stock_picking_webkit
35+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:50
36+msgid "Delivery Order"
37+msgstr "Bon de livraison"
38+
39+#. module: stock_picking_webkit
40+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:59
41+msgid "Incoterm"
42+msgstr "Incoterm"
43+
44+#. module: stock_picking_webkit
45+#: report:addons/stock_picking_webkit/report/delivery.html.mako:22
46+#: report:addons/stock_picking_webkit/report/delivery.html.mako:42
47+#: report:addons/stock_picking_webkit/report/picking.html.mako:23
48+msgid "Product"
49+msgstr "Produit"
50+
51+#. module: stock_picking_webkit
52+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:74
53+msgid "Description"
54+msgstr "Description"
55+
56+#. module: stock_picking_webkit
57+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:58
58+msgid "Delivery Method"
59+msgstr "Méthode de livraison"
60+
61+#. module: stock_picking_webkit
62+#: report:addons/stock_picking_webkit/report/delivery.html.mako:14
63+#: report:addons/stock_picking_webkit/report/picking.html.mako:14
64+msgid "Company"
65+msgstr "Société"
66+
67+#. module: stock_picking_webkit
68+#: report:addons/stock_picking_webkit/report/delivery.html.mako:23
69+#: report:addons/stock_picking_webkit/report/delivery.html.mako:43
70+#: report:addons/stock_picking_webkit/report/picking.html.mako:24
71+msgid "Qty"
72+msgstr "Qté"
73+
74+#. module: stock_picking_webkit
75+#: report:addons/stock_picking_webkit/report/delivery.html.mako:21
76+#: report:addons/stock_picking_webkit/report/delivery.html.mako:41
77+#: report:addons/stock_picking_webkit/report/picking.html.mako:21
78+msgid "Product Code"
79+msgstr "Référence"
80+
81+#. module: stock_picking_webkit
82+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:75
83+msgid "Serial Number"
84+msgstr "N° de série"
85+
86+#. module: stock_picking_webkit
87+#: report:addons/stock_picking_webkit/report/delivery.html.mako:11
88+#: report:addons/stock_picking_webkit/report/picking.html.mako:11
89+msgid "Visa"
90+msgstr "Visa"
91+
92+#. module: stock_picking_webkit
93+#: report:addons/stock_picking_webkit/report/delivery.html.mako:10
94+#: report:addons/stock_picking_webkit/report/picking.html.mako:10
95+msgid "Date"
96+msgstr "Date"
97+
98+#. module: stock_picking_webkit
99+#: report:addons/stock_picking_webkit/report/picking.html.mako:22
100+msgid "Delivery Order"
101+msgstr "Bon de livraison"
102+
103+#. module: stock_picking_webkit
104+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:56
105+msgid "Scheduled Date"
106+msgstr "Date de livraison"
107+
108+#. module: stock_picking_webkit
109+#: view:stock.picking.out:0
110+msgid "440"
111+msgstr ""
112+
113+#. module: stock_picking_webkit
114+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:37
115+msgid "Invoice address:"
116+msgstr "Adresse de facturation :"
117+
118+#. module: stock_picking_webkit
119+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:54
120+msgid "Contact"
121+msgstr "Contact"
122+
123+#. module: stock_picking_webkit
124+#: report:addons/stock_picking_webkit/report/delivery.html.mako:39
125+msgid "Products Summary"
126+msgstr "Résumé des produits"
127+
128+#. module: stock_picking_webkit
129+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:76
130+msgid "Quantity"
131+msgstr "Quantité"
132+
133+#. module: stock_picking_webkit
134+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:55
135+msgid "Origin"
136+msgstr "Origine"
137+
138+#. module: stock_picking_webkit
139+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:57
140+msgid "Weight"
141+msgstr "Poids"
142+
143+#. module: stock_picking_webkit
144+#: report:addons/stock_picking_webkit/report/delivery.html.mako:11
145+#: report:addons/stock_picking_webkit/report/picking.html.mako:11
146+msgid "Done by"
147+msgstr "Préparé par"
148+
149+#. module: stock_picking_webkit
150+#: report:addons/stock_picking_webkit/report/delivery.html.mako:25
151+#: report:addons/stock_picking_webkit/report/picking.html.mako:26
152+msgid "Carrier"
153+msgstr "Transporteur"
154+
155+#. module: stock_picking_webkit
156+#: model:ir.actions.report.xml,name:stock_picking_webkit.webkit_aggregated_picking
157+msgid "Aggregated pickings"
158+msgstr "Bons de livraison groupés"
159+
160
161=== added file 'stock_picking_webkit/i18n/stock_picking_webkit.pot'
162--- stock_picking_webkit/i18n/stock_picking_webkit.pot 1970-01-01 00:00:00 +0000
163+++ stock_picking_webkit/i18n/stock_picking_webkit.pot 2013-12-23 14:30:38 +0000
164@@ -0,0 +1,154 @@
165+# Translation of OpenERP Server.
166+# This file contains the translation of the following modules:
167+# * stock_picking_webkit
168+#
169+msgid ""
170+msgstr ""
171+"Project-Id-Version: OpenERP Server 7.0\n"
172+"Report-Msgid-Bugs-To: \n"
173+"POT-Creation-Date: 2013-12-23 14:12+0000\n"
174+"PO-Revision-Date: 2013-12-23 14:12+0000\n"
175+"Last-Translator: <>\n"
176+"Language-Team: \n"
177+"MIME-Version: 1.0\n"
178+"Content-Type: text/plain; charset=UTF-8\n"
179+"Content-Transfer-Encoding: \n"
180+"Plural-Forms: \n"
181+
182+#. module: stock_picking_webkit
183+#: report:addons/stock_picking_webkit/report/delivery.html.mako:24
184+#: report:addons/stock_picking_webkit/report/picking.html.mako:25
185+msgid "Origin"
186+msgstr ""
187+
188+#. module: stock_picking_webkit
189+#: model:ir.actions.report.xml,name:stock_picking_webkit.webkit_aggregated_delivery
190+msgid "Aggregated deliveries"
191+msgstr ""
192+
193+#. module: stock_picking_webkit
194+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:50
195+msgid "Delivery Order"
196+msgstr ""
197+
198+#. module: stock_picking_webkit
199+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:59
200+msgid "Incoterm"
201+msgstr ""
202+
203+#. module: stock_picking_webkit
204+#: report:addons/stock_picking_webkit/report/delivery.html.mako:22
205+#: report:addons/stock_picking_webkit/report/delivery.html.mako:42
206+#: report:addons/stock_picking_webkit/report/picking.html.mako:23
207+msgid "Product"
208+msgstr ""
209+
210+#. module: stock_picking_webkit
211+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:74
212+msgid "Description"
213+msgstr ""
214+
215+#. module: stock_picking_webkit
216+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:58
217+msgid "Delivery Method"
218+msgstr ""
219+
220+#. module: stock_picking_webkit
221+#: report:addons/stock_picking_webkit/report/delivery.html.mako:14
222+#: report:addons/stock_picking_webkit/report/picking.html.mako:14
223+msgid "Company"
224+msgstr ""
225+
226+#. module: stock_picking_webkit
227+#: report:addons/stock_picking_webkit/report/delivery.html.mako:23
228+#: report:addons/stock_picking_webkit/report/delivery.html.mako:43
229+#: report:addons/stock_picking_webkit/report/picking.html.mako:24
230+msgid "Qty"
231+msgstr ""
232+
233+#. module: stock_picking_webkit
234+#: report:addons/stock_picking_webkit/report/delivery.html.mako:21
235+#: report:addons/stock_picking_webkit/report/delivery.html.mako:41
236+#: report:addons/stock_picking_webkit/report/picking.html.mako:21
237+msgid "Product Code"
238+msgstr ""
239+
240+#. module: stock_picking_webkit
241+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:75
242+msgid "Serial Number"
243+msgstr ""
244+
245+#. module: stock_picking_webkit
246+#: report:addons/stock_picking_webkit/report/delivery.html.mako:11
247+#: report:addons/stock_picking_webkit/report/picking.html.mako:11
248+msgid "Visa"
249+msgstr ""
250+
251+#. module: stock_picking_webkit
252+#: report:addons/stock_picking_webkit/report/delivery.html.mako:10
253+#: report:addons/stock_picking_webkit/report/picking.html.mako:10
254+msgid "Date"
255+msgstr ""
256+
257+#. module: stock_picking_webkit
258+#: report:addons/stock_picking_webkit/report/picking.html.mako:22
259+msgid "Delivery Order"
260+msgstr ""
261+
262+#. module: stock_picking_webkit
263+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:56
264+msgid "Scheduled Date"
265+msgstr ""
266+
267+#. module: stock_picking_webkit
268+#: view:stock.picking.out:0
269+msgid "440"
270+msgstr ""
271+
272+#. module: stock_picking_webkit
273+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:37
274+msgid "Invoice address:"
275+msgstr ""
276+
277+#. module: stock_picking_webkit
278+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:54
279+msgid "Contact"
280+msgstr ""
281+
282+#. module: stock_picking_webkit
283+#: report:addons/stock_picking_webkit/report/delivery.html.mako:39
284+msgid "Products Summary"
285+msgstr ""
286+
287+#. module: stock_picking_webkit
288+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:76
289+msgid "Quantity"
290+msgstr ""
291+
292+#. module: stock_picking_webkit
293+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:55
294+msgid "Origin"
295+msgstr ""
296+
297+#. module: stock_picking_webkit
298+#: report:addons/stock_picking_webkit/report/delivery_slip.mako:57
299+msgid "Weight"
300+msgstr ""
301+
302+#. module: stock_picking_webkit
303+#: report:addons/stock_picking_webkit/report/delivery.html.mako:11
304+#: report:addons/stock_picking_webkit/report/picking.html.mako:11
305+msgid "Done by"
306+msgstr ""
307+
308+#. module: stock_picking_webkit
309+#: report:addons/stock_picking_webkit/report/delivery.html.mako:25
310+#: report:addons/stock_picking_webkit/report/picking.html.mako:26
311+msgid "Carrier"
312+msgstr ""
313+
314+#. module: stock_picking_webkit
315+#: model:ir.actions.report.xml,name:stock_picking_webkit.webkit_aggregated_picking
316+msgid "Aggregated pickings"
317+msgstr ""
318+
319
320=== modified file 'stock_picking_webkit/report.xml'
321--- stock_picking_webkit/report.xml 2013-09-11 13:14:24 +0000
322+++ stock_picking_webkit/report.xml 2013-12-23 14:30:38 +0000
323@@ -25,7 +25,7 @@
324 auto="False"
325 model="stock.picking.out"
326 file="stock_picking_webkit/report/delivery_slip.mako"
327- string="Delivery Slip"
328+ string="Delivery Order"
329 report_type="webkit"
330 header="True"
331 webkit_header="base_headers_webkit.base_reports_portrait_header" />
332
333=== modified file 'stock_picking_webkit/report/delivery.html.mako'
334--- stock_picking_webkit/report/delivery.html.mako 2013-11-21 15:26:42 +0000
335+++ stock_picking_webkit/report/delivery.html.mako 2013-12-23 14:30:38 +0000
336@@ -20,8 +20,8 @@
337 <tr align="left">
338 <th>${_('Product Code')}</th>
339 <th>${_('Product')}</th>
340- <th>${_('QTY')}</th>
341- <th>${_('origin')}</th>
342+ <th>${_('Qty')}</th>
343+ <th>${_('Origin')}</th>
344 <th>${_('Carrier')}</th>
345 </tr>
346 %for move in aggr.moves_by_sale_order():
347@@ -36,7 +36,7 @@
348 </table>
349 <br/>
350 <table style="border:solid 1px" width="100%">
351- <caption><b><u>${_('Products summary')}</u></b></caption>
352+ <caption><b><u>${_('Products Summary')}</u></b></caption>
353 <tr align="left">
354 <th>${_('Product Code')}</th>
355 <th>${_('Product')}</th>
356
357=== modified file 'stock_picking_webkit/report/picking.html.mako'
358--- stock_picking_webkit/report/picking.html.mako 2013-11-21 15:26:42 +0000
359+++ stock_picking_webkit/report/picking.html.mako 2013-12-23 14:30:38 +0000
360@@ -19,10 +19,10 @@
361 <caption><b><u>${aggr.src_stock.name} => ${aggr.dest_stock.name}</u></b></caption>
362 <tr align="left">
363 <th>${_('Product Code')}</th>
364- <th>${_('Picking')}</th>
365+ <th>${_('Delivery Order')}</th>
366 <th>${_('Product')}</th>
367- <th>${_('QTY')}</th>
368- <th>${_('origin')}</th>
369+ <th>${_('Qty')}</th>
370+ <th>${_('Origin')}</th>
371 <th>${_('Carrier')}</th>
372 </tr>
373 %for move in aggr.moves_by_product():

Subscribers

People subscribed via source and target branches