Merge lp:~camptocamp/sale-reports/translation_v7_sale_order_webkit into lp:~sale-core-editors/sale-reports/7.0

Proposed by Vincent Renaville@camptocamp
Status: Merged
Approved by: Yannick Vaucher @ Camptocamp
Approved revision: 23
Merged at revision: 23
Proposed branch: lp:~camptocamp/sale-reports/translation_v7_sale_order_webkit
Merge into: lp:~sale-core-editors/sale-reports/7.0
Diff against target: 1152 lines (+609/-352)
4 files modified
sale_order_webkit/i18n/de.po (+157/-132)
sale_order_webkit/i18n/en.po (+152/-47)
sale_order_webkit/i18n/fr.po (+146/-121)
sale_order_webkit/i18n/sale_order_webkit.pot (+154/-52)
To merge this branch: bzr merge lp:~camptocamp/sale-reports/translation_v7_sale_order_webkit
Reviewer Review Type Date Requested Status
Yannick Vaucher @ Camptocamp spelling fr Approve
Sandy Carter (http://www.savoirfairelinux.com) code review, no test Approve
Pedro Manuel Baeza Approve
Review via email: mp+196906@code.launchpad.net

Description of the change

Hello,

It seems that translation was for 6.1 and not updated since that, so field like Invoice Webkit, so I have update translation for DE,FR,EN

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Thanks for the translations!

review: Approve
Revision history for this message
Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter) wrote :

Looking at the french translation, it all looks good except for UoM, should it be UdM?
UoM = Unit of Measure
UdM = Unité de mesure

review: Needs Information
23. By Vincent Renaville@camptocamp

[FIX] change Uom to Udm for french translation

Revision history for this message
Vincent Renaville@camptocamp (vrenaville-c2c) wrote :

Hello,

Thanks for the review !

Sorry I miss Udm, i fix it at rev 23

Vincent

Revision history for this message
Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter) wrote :

LGTM

review: Approve (code review, no test)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) :
review: Approve (spelling fr)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sale_order_webkit/i18n/de.po'
2--- sale_order_webkit/i18n/de.po 2013-02-06 09:26:22 +0000
3+++ sale_order_webkit/i18n/de.po 2013-12-17 16:14:05 +0000
4@@ -1,122 +1,161 @@
5 # Translation of OpenERP Server.
6 # This file contains the translation of the following modules:
7-# * sale_order_webkit
8+# * sale_order_webkit
9 #
10 msgid ""
11 msgstr ""
12-"Project-Id-Version: OpenERP Server 6.0.3\n"
13+"Project-Id-Version: OpenERP Server 7.0\n"
14 "Report-Msgid-Bugs-To: \n"
15-"POT-Creation-Date: 2013-02-04 10:57+0000\n"
16-"PO-Revision-Date: 2011-12-12 11:13+0000\n"
17+"POT-Creation-Date: 2013-11-27 12:56+0000\n"
18+"PO-Revision-Date: 2013-11-27 12:56+0000\n"
19 "Last-Translator: <>\n"
20 "Language-Team: \n"
21-"Language: \n"
22 "MIME-Version: 1.0\n"
23 "Content-Type: text/plain; charset=UTF-8\n"
24 "Content-Transfer-Encoding: \n"
25 "Plural-Forms: \n"
26
27-
28-#. module: sale_order_webkit
29-#: report:addons/sale_order_webkit/report/sale_order.mako:78
30-msgid "Your Reference"
31-msgstr "Ihre Referenz"
32-
33-#. module: sale_order_webkit
34-#: report:addons/sale_order_webkit/report/sale_order.mako:35
35-msgid "Fax"
36-msgstr "Fax"
37-
38-#. module: sale_order_webkit
39-#: report:addons/sale_order_webkit/report/sale_order.mako:32
40-msgid "Tel"
41-msgstr "Tél"
42-
43-#. module: sale_order_webkit
44-#: report:addons/sale_order_webkit/report/sale_order.mako:94
45+#. module: sale_order_webkit
46+#: field:sale.condition_text,name:0
47+msgid "Condition summary"
48+msgstr "Zustand Zusammenfassung"
49+
50+#. module: sale_order_webkit
51+#: view:sale.condition_text:0
52+msgid "sale condition text"
53+msgstr "Verkauf Bedingungstext"
54+
55+#. module: sale_order_webkit
56+#: report:addons/sale_order_webkit/report/sale_order.mako:168
57+msgid "Unit Price"
58+msgstr "Einheitspreis"
59+
60+#. module: sale_order_webkit
61+#: view:sale.order:0
62+msgid "Your bottom conditions here"
63+msgstr "Your bottom conditions here"
64+
65+#. module: sale_order_webkit
66+#: report:addons/sale_order_webkit/report/sale_order.mako:139
67+msgid "Order N°"
68+msgstr "Ihre Bodenbedingungen hier"
69+
70+#. module: sale_order_webkit
71+#: report:addons/sale_order_webkit/report/sale_order.mako:170
72+msgid "Disc.(%)"
73+msgstr "Rabatt.(%)"
74+
75+#. module: sale_order_webkit
76+#: view:sale.order:0
77+msgid "Conditions"
78+msgstr "Bedingungen"
79+
80+#. module: sale_order_webkit
81+#: report:addons/sale_order_webkit/report/sale_order.mako:202
82+msgid "Taxes:"
83+msgstr "Steuern:"
84+
85+#. module: sale_order_webkit
86+#: model:ir.model,name:sale_order_webkit.model_sale_condition_text
87+msgid "sale conditions"
88+msgstr "Verkaufsbedingungen"
89+
90+#. module: sale_order_webkit
91+#: report:addons/sale_order_webkit/report/sale_order.mako:167
92+msgid "UoM"
93+msgstr "ME"
94+
95+#. module: sale_order_webkit
96+#: selection:sale.condition_text,type:0
97+msgid "Top condition"
98+msgstr "Top Zustand"
99+
100+#. module: sale_order_webkit
101+#: report:addons/sale_order_webkit/report/sale_order.mako:165
102 msgid "Description"
103 msgstr "Beschreibung"
104
105 #. module: sale_order_webkit
106-#: report:addons/sale_order_webkit/report/sale_order.mako:79
107-msgid "Quotation Date"
108-msgstr "Offertdatum"
109+#: field:sale.order,note1:0
110+#: field:sale.order,text_condition1:0
111+msgid "Header"
112+msgstr "Header"
113
114 #. module: sale_order_webkit
115-#: report:addons/sale_order_webkit/report/sale_order.mako:99
116+#: report:addons/sale_order_webkit/report/sale_order.mako:171
117 msgid "Price"
118-msgstr "Preis"
119-
120-#. module: sale_order_webkit
121-#: report:addons/sale_order_webkit/report/sale_order.mako:79
122+msgstr "Kopfzeile"
123+
124+#. module: sale_order_webkit
125+#: report:addons/sale_order_webkit/report/sale_order.mako:169
126+msgid "VAT"
127+msgstr "Mehrwertsteuer"
128+
129+#. module: sale_order_webkit
130+#: field:sale.condition_text,type:0
131+msgid "type"
132+msgstr "Typ"
133+
134+#. module: sale_order_webkit
135+#: field:sale.condition_text,text:0
136+msgid "Condition"
137+msgstr "Condition"
138+
139+#. module: sale_order_webkit
140+#: report:addons/sale_order_webkit/report/sale_order.mako:207
141+msgid "Total:"
142+msgstr "Zustand:"
143+
144+#. module: sale_order_webkit
145+#: field:sale.order,note2:0
146+#: field:sale.order,text_condition2:0
147+msgid "Footer"
148+msgstr "Zustand"
149+
150+#. module: sale_order_webkit
151+#: report:addons/sale_order_webkit/report/sale_order.mako:105
152+msgid "Shipping address:"
153+msgstr "Lieferadresse:"
154+
155+#. module: sale_order_webkit
156+#: report:addons/sale_order_webkit/report/sale_order.mako:143
157 msgid "Date Ordered"
158-msgstr "Bestelldatum"
159-
160-#. module: sale_order_webkit
161-#: report:addons/sale_order_webkit/report/sale_order.mako:81
162-msgid "Payment Term"
163-msgstr "Zahlungskonditionen"
164-
165-#. module: sale_order_webkit
166-#: report:addons/sale_order_webkit/report/sale_order.mako:38
167-msgid "E-mail"
168-msgstr "E-mail"
169-
170-#. module: sale_order_webkit
171-#: report:addons/sale_order_webkit/report/sale_order.mako:74
172-msgid "Quotation N°"
173-msgstr "Offerte N°"
174-
175-#. module: sale_order_webkit
176-#: report:addons/sale_order_webkit/report/sale_order.mako:97
177-msgid "Unit Price"
178-msgstr "Stückpreis"
179-
180-#. module: sale_order_webkit
181-#: report:addons/sale_order_webkit/report/sale_order.mako:74
182-msgid "Order N°"
183-msgstr "Bestell-Nr."
184-
185-#. module: sale_order_webkit
186-#: report:addons/sale_order_webkit/report/sale_order.mako:98
187-msgid "Disc.(%)"
188-msgstr "Rab.(%)"
189-
190-#. module: sale_order_webkit
191-#: report:addons/sale_order_webkit/report/sale_order.mako:80
192-msgid "Salesman"
193-msgstr "Verkäufer"
194-
195-#. module: sale_order_webkit
196-#: report:addons/sale_order_webkit/report/sale_order.mako:41
197-#: report:addons/sale_order_webkit/report/sale_order.mako:95
198-msgid "VAT"
199-msgstr "MvSt."
200-
201-#. module: sale_order_webkit
202-#: report:addons/sale_order_webkit/report/sale_order.mako:96
203+msgstr "Datum bestellt"
204+
205+#. module: sale_order_webkit
206+#: report:addons/sale_order_webkit/report/sale_order.mako:122
207+msgid "Invoice address:"
208+msgstr "Rechnungsadresse:"
209+
210+#. module: sale_order_webkit
211+#: report:addons/sale_order_webkit/report/sale_order.mako:144
212+msgid "Your Reference"
213+msgstr "Ihre Referenz"
214+
215+#. module: sale_order_webkit
216+#: field:sale.order.line,formatted_note:0
217+msgid "Formatted Note"
218+msgstr "Formatierte Hinweis"
219+
220+#. module: sale_order_webkit
221+#: report:addons/sale_order_webkit/report/sale_order.mako:166
222 msgid "Quantity"
223 msgstr "Menge"
224
225 #. module: sale_order_webkit
226-#: field:sale.condition_text,name:0
227-msgid "Condition summary"
228-msgstr "Rapport Bemerkung"
229-
230-#. module: sale_order_webkit
231-#: selection:sale.condition_text,type:0
232-msgid "Top condition"
233-msgstr "Kopfzeile Seite Bemerkung"
234+#: view:sale.order:0
235+msgid "Your top conditions here"
236+msgstr "Your top conditions here"
237
238 #. module: sale_order_webkit
239 #: view:sale.condition_text:0
240 msgid "Sale condition text"
241-msgstr "Rapport Bemerkung"
242+msgstr "Sale condition text"
243
244 #. module: sale_order_webkit
245-#: field:sale.order,note2:0 field:sale.order,text_condition2:0
246-msgid "Footer"
247-msgstr "Fusszeilen-Bemerkung"
248+#: report:addons/sale_order_webkit/report/sale_order.mako:143
249+msgid "Quotation Date"
250+msgstr "Verkauf Bedingungstext"
251
252 #. module: sale_order_webkit
253 #: model:ir.actions.act_window,name:sale_order_webkit.action_sale_condition_form_webkit
254@@ -125,51 +164,37 @@
255 msgstr "sale.condition_text"
256
257 #. module: sale_order_webkit
258-#: selection:sale.condition_text,type:0
259-msgid "Bottom condition"
260-msgstr "Fusszeilen-Bemerkung"
261-
262-#. module: sale_order_webkit
263-#: field:sale.order,note1:0 field:sale.order,text_condition1:0
264-msgid "Header"
265-msgstr "Kopfzeile"
266-
267-#. module: sale_order_webkit
268-#: model:ir.model,name:sale_order_webkit.model_sale_condition_text
269-msgid "sale conditions"
270-msgstr "Verfauf Bemerkung"
271-
272-#. module: sale_order_webkit
273-#: field:sale.condition_text,text:0
274-msgid "Condition"
275-msgstr "Konditionen"
276-
277-#. module: sale_order_webkit
278-#: field:sale.condition_text,type:0
279-msgid "type"
280-msgstr "type"
281-
282-#. module: sale_order_webkit
283-#: view:sale.condition_text:0
284-msgid "sale condition text"
285-msgstr "Verkauf Bemerkung"
286+#: report:addons/sale_order_webkit/report/sale_order.mako:146
287+msgid "Payment Term"
288+msgstr "Zahlungs-Ausdruck"
289+
290+#. module: sale_order_webkit
291+#: report:addons/sale_order_webkit/report/sale_order.mako:197
292+msgid "Net Total:"
293+msgstr "Nettosumme:"
294+
295+#. module: sale_order_webkit
296+#: report:addons/sale_order_webkit/report/sale_order.mako:139
297+msgid "Quotation N°"
298+msgstr "Zitat Nr."
299+
300+#. module: sale_order_webkit
301+#: model:ir.model,name:sale_order_webkit.model_sale_order_line
302+msgid "Sales Order Line"
303+msgstr "Kundenaufträge Linien"
304
305 #. module: sale_order_webkit
306 #: model:ir.model,name:sale_order_webkit.model_sale_order
307 msgid "Sales Order"
308-msgstr "Bestellung"
309-
310-#. module: sale_order_webkit
311-#: view:sale.order:0
312-msgid "Conditions"
313-msgstr "Konditionen"
314-
315-#. module: sale_order_webkit
316-#: model:ir.model,name:sale_order_webkit.model_sale_order_line
317-msgid "Sales Order Line"
318-msgstr "Bestellung"
319-
320-#. module: sale_order_webkit
321-#: field:sale.order.line,formatted_note:0
322-msgid "Formatted Note"
323-msgstr "Notizen"
324+msgstr "Kundenauftrags"
325+
326+#. module: sale_order_webkit
327+#: report:addons/sale_order_webkit/report/sale_order.mako:145
328+msgid "Salesman"
329+msgstr "Verkäufer"
330+
331+#. module: sale_order_webkit
332+#: selection:sale.condition_text,type:0
333+msgid "Bottom condition"
334+msgstr "Bodenzustand"
335+
336
337=== modified file 'sale_order_webkit/i18n/en.po'
338--- sale_order_webkit/i18n/en.po 2013-02-04 12:33:28 +0000
339+++ sale_order_webkit/i18n/en.po 2013-12-17 16:14:05 +0000
340@@ -6,8 +6,8 @@
341 msgstr ""
342 "Project-Id-Version: OpenERP Server 7.0\n"
343 "Report-Msgid-Bugs-To: \n"
344-"POT-Creation-Date: 2013-02-04 10:57+0000\n"
345-"PO-Revision-Date: 2013-02-04 10:57+0000\n"
346+"POT-Creation-Date: 2013-11-27 12:56+0000\n"
347+"PO-Revision-Date: 2013-11-27 12:56+0000\n"
348 "Last-Translator: <>\n"
349 "Language-Team: \n"
350 "MIME-Version: 1.0\n"
351@@ -21,14 +21,90 @@
352 msgstr "Condition summary"
353
354 #. module: sale_order_webkit
355+#: view:sale.condition_text:0
356+msgid "sale condition text"
357+msgstr "sale condition text"
358+
359+#. module: sale_order_webkit
360+#: report:addons/sale_order_webkit/report/sale_order.mako:168
361+msgid "Unit Price"
362+msgstr "Unit Price"
363+
364+#. module: sale_order_webkit
365+#: view:sale.order:0
366+msgid "Your bottom conditions here"
367+msgstr "Your bottom conditions here"
368+
369+#. module: sale_order_webkit
370+#: report:addons/sale_order_webkit/report/sale_order.mako:139
371+msgid "Order N°"
372+msgstr "Order N°"
373+
374+#. module: sale_order_webkit
375+#: report:addons/sale_order_webkit/report/sale_order.mako:170
376+msgid "Disc.(%)"
377+msgstr "Disc.(%)"
378+
379+#. module: sale_order_webkit
380+#: view:sale.order:0
381+msgid "Conditions"
382+msgstr "Conditions"
383+
384+#. module: sale_order_webkit
385+#: report:addons/sale_order_webkit/report/sale_order.mako:202
386+msgid "Taxes:"
387+msgstr "Taxes:"
388+
389+#. module: sale_order_webkit
390+#: model:ir.model,name:sale_order_webkit.model_sale_condition_text
391+msgid "sale conditions"
392+msgstr "sale conditions"
393+
394+#. module: sale_order_webkit
395+#: report:addons/sale_order_webkit/report/sale_order.mako:167
396+msgid "UoM"
397+msgstr "UoM"
398+
399+#. module: sale_order_webkit
400 #: selection:sale.condition_text,type:0
401 msgid "Top condition"
402 msgstr "Top condition"
403
404 #. module: sale_order_webkit
405-#: view:sale.condition_text:0
406-msgid "Sale condition text"
407-msgstr "Sale condition text"
408+#: report:addons/sale_order_webkit/report/sale_order.mako:165
409+msgid "Description"
410+msgstr "Description"
411+
412+#. module: sale_order_webkit
413+#: field:sale.order,note1:0
414+#: field:sale.order,text_condition1:0
415+msgid "Header"
416+msgstr "Header"
417+
418+#. module: sale_order_webkit
419+#: report:addons/sale_order_webkit/report/sale_order.mako:171
420+msgid "Price"
421+msgstr "Price"
422+
423+#. module: sale_order_webkit
424+#: report:addons/sale_order_webkit/report/sale_order.mako:169
425+msgid "VAT"
426+msgstr "VAT"
427+
428+#. module: sale_order_webkit
429+#: field:sale.condition_text,type:0
430+msgid "type"
431+msgstr "type"
432+
433+#. module: sale_order_webkit
434+#: field:sale.condition_text,text:0
435+msgid "Condition"
436+msgstr "Condition"
437+
438+#. module: sale_order_webkit
439+#: report:addons/sale_order_webkit/report/sale_order.mako:207
440+msgid "Total:"
441+msgstr "Total:"
442
443 #. module: sale_order_webkit
444 #: field:sale.order,note2:0
445@@ -37,41 +113,75 @@
446 msgstr "Footer"
447
448 #. module: sale_order_webkit
449+#: report:addons/sale_order_webkit/report/sale_order.mako:105
450+msgid "Shipping address:"
451+msgstr "Shipping address:"
452+
453+#. module: sale_order_webkit
454+#: report:addons/sale_order_webkit/report/sale_order.mako:143
455+msgid "Date Ordered"
456+msgstr "Date Ordered"
457+
458+#. module: sale_order_webkit
459+#: report:addons/sale_order_webkit/report/sale_order.mako:122
460+msgid "Invoice address:"
461+msgstr "Invoice address:"
462+
463+#. module: sale_order_webkit
464+#: report:addons/sale_order_webkit/report/sale_order.mako:144
465+msgid "Your Reference"
466+msgstr "Your Reference"
467+
468+#. module: sale_order_webkit
469+#: field:sale.order.line,formatted_note:0
470+msgid "Formatted Note"
471+msgstr "Formatted Note"
472+
473+#. module: sale_order_webkit
474+#: report:addons/sale_order_webkit/report/sale_order.mako:166
475+msgid "Quantity"
476+msgstr "Quantity"
477+
478+#. module: sale_order_webkit
479+#: view:sale.order:0
480+msgid "Your top conditions here"
481+msgstr "Your top conditions here"
482+
483+#. module: sale_order_webkit
484+#: view:sale.condition_text:0
485+msgid "Sale condition text"
486+msgstr "Sale condition text"
487+
488+#. module: sale_order_webkit
489+#: report:addons/sale_order_webkit/report/sale_order.mako:143
490+msgid "Quotation Date"
491+msgstr "Quotation Date"
492+
493+#. module: sale_order_webkit
494 #: model:ir.actions.act_window,name:sale_order_webkit.action_sale_condition_form_webkit
495 #: model:ir.actions.act_window,name:sale_order_webkit.action_sale_condition_webkit
496 msgid "sale.condition_text"
497 msgstr "sale.condition_text"
498
499 #. module: sale_order_webkit
500-#: selection:sale.condition_text,type:0
501-msgid "Bottom condition"
502-msgstr "Bottom condition"
503-
504-#. module: sale_order_webkit
505-#: field:sale.order,note1:0
506-#: field:sale.order,text_condition1:0
507-msgid "Header"
508-msgstr "Header"
509-
510-#. module: sale_order_webkit
511-#: model:ir.model,name:sale_order_webkit.model_sale_condition_text
512-msgid "sale conditions"
513-msgstr "sale conditions"
514-
515-#. module: sale_order_webkit
516-#: field:sale.condition_text,text:0
517-msgid "Condition"
518-msgstr "Condition"
519-
520-#. module: sale_order_webkit
521-#: field:sale.condition_text,type:0
522-msgid "type"
523-msgstr "type"
524-
525-#. module: sale_order_webkit
526-#: view:sale.condition_text:0
527-msgid "sale condition text"
528-msgstr "sale condition text"
529+#: report:addons/sale_order_webkit/report/sale_order.mako:146
530+msgid "Payment Term"
531+msgstr "Payment Term"
532+
533+#. module: sale_order_webkit
534+#: report:addons/sale_order_webkit/report/sale_order.mako:197
535+msgid "Net Total:"
536+msgstr "Net Total:"
537+
538+#. module: sale_order_webkit
539+#: report:addons/sale_order_webkit/report/sale_order.mako:139
540+msgid "Quotation N°"
541+msgstr "Quotation N°"
542+
543+#. module: sale_order_webkit
544+#: model:ir.model,name:sale_order_webkit.model_sale_order_line
545+msgid "Sales Order Line"
546+msgstr "Sales Order Line"
547
548 #. module: sale_order_webkit
549 #: model:ir.model,name:sale_order_webkit.model_sale_order
550@@ -79,17 +189,12 @@
551 msgstr "Sales Order"
552
553 #. module: sale_order_webkit
554-#: view:sale.order:0
555-msgid "Conditions"
556-msgstr "Conditions"
557-
558-#. module: sale_order_webkit
559-#: model:ir.model,name:sale_order_webkit.model_sale_order_line
560-msgid "Sales Order Line"
561-msgstr "Sales Order Line"
562-
563-#. module: sale_order_webkit
564-#: field:sale.order.line,formatted_note:0
565-msgid "Formatted Note"
566-msgstr "Formatted Note"
567+#: report:addons/sale_order_webkit/report/sale_order.mako:145
568+msgid "Salesman"
569+msgstr "Salesman"
570+
571+#. module: sale_order_webkit
572+#: selection:sale.condition_text,type:0
573+msgid "Bottom condition"
574+msgstr "Bottom condition"
575
576
577=== modified file 'sale_order_webkit/i18n/fr.po'
578--- sale_order_webkit/i18n/fr.po 2013-02-05 12:33:18 +0000
579+++ sale_order_webkit/i18n/fr.po 2013-12-17 16:14:05 +0000
580@@ -1,122 +1,161 @@
581 # Translation of OpenERP Server.
582 # This file contains the translation of the following modules:
583-# * sale_order_webkit
584+# * sale_order_webkit
585 #
586 msgid ""
587 msgstr ""
588-"Project-Id-Version: OpenERP Server 6.0.3\n"
589+"Project-Id-Version: OpenERP Server 7.0\n"
590 "Report-Msgid-Bugs-To: \n"
591-"POT-Creation-Date: 2013-02-04 10:57+0000\n"
592-"PO-Revision-Date: 2011-12-12 11:13+0000\n"
593+"POT-Creation-Date: 2013-11-27 12:56+0000\n"
594+"PO-Revision-Date: 2013-11-27 12:56+0000\n"
595 "Last-Translator: <>\n"
596 "Language-Team: \n"
597-"Language: \n"
598 "MIME-Version: 1.0\n"
599 "Content-Type: text/plain; charset=UTF-8\n"
600 "Content-Transfer-Encoding: \n"
601 "Plural-Forms: \n"
602
603-
604-#. module: sale_order_webkit
605-#: report:addons/sale_order_webkit/report/sale_order.mako:78
606-msgid "Your Reference"
607-msgstr "Votre Référence"
608-
609-#. module: sale_order_webkit
610-#: report:addons/sale_order_webkit/report/sale_order.mako:35
611-msgid "Fax"
612-msgstr "Fax"
613-
614-#. module: sale_order_webkit
615-#: report:addons/sale_order_webkit/report/sale_order.mako:32
616-msgid "Tel"
617-msgstr "Tél"
618-
619-#. module: sale_order_webkit
620-#: report:addons/sale_order_webkit/report/sale_order.mako:94
621-msgid "Description"
622-msgstr "Description"
623-
624-#. module: sale_order_webkit
625-#: report:addons/sale_order_webkit/report/sale_order.mako:79
626-msgid "Quotation Date"
627-msgstr "Date du devis"
628-
629-#. module: sale_order_webkit
630-#: report:addons/sale_order_webkit/report/sale_order.mako:99
631-msgid "Price"
632-msgstr "Prix"
633-
634-#. module: sale_order_webkit
635-#: report:addons/sale_order_webkit/report/sale_order.mako:79
636-msgid "Date Ordered"
637-msgstr "Date de commande"
638-
639-#. module: sale_order_webkit
640-#: report:addons/sale_order_webkit/report/sale_order.mako:81
641-msgid "Payment Term"
642-msgstr "Condition de règlement"
643-
644-#. module: sale_order_webkit
645-#: report:addons/sale_order_webkit/report/sale_order.mako:38
646-msgid "E-mail"
647-msgstr "E-mail"
648-
649-#. module: sale_order_webkit
650-#: report:addons/sale_order_webkit/report/sale_order.mako:74
651-msgid "Quotation N°"
652-msgstr "Devis N°"
653-
654-#. module: sale_order_webkit
655-#: report:addons/sale_order_webkit/report/sale_order.mako:97
656+#. module: sale_order_webkit
657+#: field:sale.condition_text,name:0
658+msgid "Condition summary"
659+msgstr "Texte de commentaire imprimable"
660+
661+#. module: sale_order_webkit
662+#: view:sale.condition_text:0
663+msgid "sale condition text"
664+msgstr "Commentaire imprimable"
665+
666+#. module: sale_order_webkit
667+#: report:addons/sale_order_webkit/report/sale_order.mako:168
668 msgid "Unit Price"
669 msgstr "Prix unitaire"
670
671 #. module: sale_order_webkit
672-#: report:addons/sale_order_webkit/report/sale_order.mako:74
673+#: view:sale.order:0
674+msgid "Your bottom conditions here"
675+msgstr "Vos commentaires de bas de page"
676+
677+#. module: sale_order_webkit
678+#: report:addons/sale_order_webkit/report/sale_order.mako:139
679 msgid "Order N°"
680 msgstr "N° de commande"
681
682 #. module: sale_order_webkit
683-#: report:addons/sale_order_webkit/report/sale_order.mako:98
684+#: report:addons/sale_order_webkit/report/sale_order.mako:170
685 msgid "Disc.(%)"
686 msgstr "Rem.(%)"
687
688 #. module: sale_order_webkit
689-#: report:addons/sale_order_webkit/report/sale_order.mako:80
690-msgid "Salesman"
691-msgstr "Vendeur"
692-
693-#. module: sale_order_webkit
694-#: report:addons/sale_order_webkit/report/sale_order.mako:41
695-#: report:addons/sale_order_webkit/report/sale_order.mako:95
696+#: view:sale.order:0
697+msgid "Conditions"
698+msgstr "Conditions"
699+
700+#. module: sale_order_webkit
701+#: report:addons/sale_order_webkit/report/sale_order.mako:202
702+msgid "Taxes:"
703+msgstr "Taxes:"
704+
705+#. module: sale_order_webkit
706+#: model:ir.model,name:sale_order_webkit.model_sale_condition_text
707+msgid "sale conditions"
708+msgstr "Commentaire imprimable"
709+
710+#. module: sale_order_webkit
711+#: report:addons/sale_order_webkit/report/sale_order.mako:167
712+msgid "UoM"
713+msgstr "UdM"
714+
715+#. module: sale_order_webkit
716+#: selection:sale.condition_text,type:0
717+msgid "Top condition"
718+msgstr "Commentaire de début de page"
719+
720+#. module: sale_order_webkit
721+#: report:addons/sale_order_webkit/report/sale_order.mako:165
722+msgid "Description"
723+msgstr "Description"
724+
725+#. module: sale_order_webkit
726+#: field:sale.order,note1:0
727+#: field:sale.order,text_condition1:0
728+msgid "Header"
729+msgstr "Commentaire de début de page"
730+
731+#. module: sale_order_webkit
732+#: report:addons/sale_order_webkit/report/sale_order.mako:171
733+msgid "Price"
734+msgstr "Prix"
735+
736+#. module: sale_order_webkit
737+#: report:addons/sale_order_webkit/report/sale_order.mako:169
738 msgid "VAT"
739 msgstr "TVA"
740
741 #. module: sale_order_webkit
742-#: report:addons/sale_order_webkit/report/sale_order.mako:96
743+#: field:sale.condition_text,type:0
744+msgid "type"
745+msgstr "type"
746+
747+#. module: sale_order_webkit
748+#: field:sale.condition_text,text:0
749+msgid "Condition"
750+msgstr "Condition"
751+
752+#. module: sale_order_webkit
753+#: report:addons/sale_order_webkit/report/sale_order.mako:207
754+msgid "Total:"
755+msgstr "Total:"
756+
757+#. module: sale_order_webkit
758+#: field:sale.order,note2:0
759+#: field:sale.order,text_condition2:0
760+msgid "Footer"
761+msgstr "Commentaire de fin de page"
762+
763+#. module: sale_order_webkit
764+#: report:addons/sale_order_webkit/report/sale_order.mako:105
765+msgid "Shipping address:"
766+msgstr "Adresse de livraison:"
767+
768+#. module: sale_order_webkit
769+#: report:addons/sale_order_webkit/report/sale_order.mako:143
770+msgid "Date Ordered"
771+msgstr "Date de commande"
772+
773+#. module: sale_order_webkit
774+#: report:addons/sale_order_webkit/report/sale_order.mako:122
775+msgid "Invoice address:"
776+msgstr "Adresse Facturation:"
777+
778+#. module: sale_order_webkit
779+#: report:addons/sale_order_webkit/report/sale_order.mako:144
780+msgid "Your Reference"
781+msgstr "Votre Référence"
782+
783+#. module: sale_order_webkit
784+#: field:sale.order.line,formatted_note:0
785+msgid "Formatted Note"
786+msgstr "Note formatée"
787+
788+#. module: sale_order_webkit
789+#: report:addons/sale_order_webkit/report/sale_order.mako:166
790 msgid "Quantity"
791 msgstr "Quantité"
792
793 #. module: sale_order_webkit
794-#: field:sale.condition_text,name:0
795-msgid "Condition summary"
796-msgstr "Texte de commentaire imprimable"
797-
798-#. module: sale_order_webkit
799-#: selection:sale.condition_text,type:0
800-msgid "Top condition"
801-msgstr "Commentaire de début de page"
802+#: view:sale.order:0
803+msgid "Your top conditions here"
804+msgstr "Your top conditions here"
805
806 #. module: sale_order_webkit
807 #: view:sale.condition_text:0
808 msgid "Sale condition text"
809-msgstr "commentaire imprimable"
810+msgstr "Commentaire imprimable"
811
812 #. module: sale_order_webkit
813-#: field:sale.order,note2:0 field:sale.order,text_condition2:0
814-msgid "Footer"
815-msgstr "Commentaire de fin de page"
816+#: report:addons/sale_order_webkit/report/sale_order.mako:143
817+msgid "Quotation Date"
818+msgstr "Date du devis"
819
820 #. module: sale_order_webkit
821 #: model:ir.actions.act_window,name:sale_order_webkit.action_sale_condition_form_webkit
822@@ -125,34 +164,24 @@
823 msgstr "sale.condition_text"
824
825 #. module: sale_order_webkit
826-#: selection:sale.condition_text,type:0
827-msgid "Bottom condition"
828-msgstr "Commentaire de fin de page"
829-
830-#. module: sale_order_webkit
831-#: field:sale.order,note1:0 field:sale.order,text_condition1:0
832-msgid "Header"
833-msgstr "Commentaire de début de page"
834-
835-#. module: sale_order_webkit
836-#: model:ir.model,name:sale_order_webkit.model_sale_condition_text
837-msgid "sale conditions"
838-msgstr "Commentaire imprimable"
839-
840-#. module: sale_order_webkit
841-#: field:sale.condition_text,text:0
842-msgid "Condition"
843-msgstr "Condition"
844-
845-#. module: sale_order_webkit
846-#: field:sale.condition_text,type:0
847-msgid "type"
848-msgstr "type"
849-
850-#. module: sale_order_webkit
851-#: view:sale.condition_text:0
852-msgid "sale condition text"
853-msgstr "Commentaire imprimable"
854+#: report:addons/sale_order_webkit/report/sale_order.mako:146
855+msgid "Payment Term"
856+msgstr "Condition de règlement"
857+
858+#. module: sale_order_webkit
859+#: report:addons/sale_order_webkit/report/sale_order.mako:197
860+msgid "Net Total:"
861+msgstr "Net Total:"
862+
863+#. module: sale_order_webkit
864+#: report:addons/sale_order_webkit/report/sale_order.mako:139
865+msgid "Quotation N°"
866+msgstr "Devis N°"
867+
868+#. module: sale_order_webkit
869+#: model:ir.model,name:sale_order_webkit.model_sale_order_line
870+msgid "Sales Order Line"
871+msgstr "Ligne de commande"
872
873 #. module: sale_order_webkit
874 #: model:ir.model,name:sale_order_webkit.model_sale_order
875@@ -160,16 +189,12 @@
876 msgstr "Bon de commande"
877
878 #. module: sale_order_webkit
879-#: view:sale.order:0
880-msgid "Conditions"
881-msgstr "Conditions"
882-
883-#. module: sale_order_webkit
884-#: model:ir.model,name:sale_order_webkit.model_sale_order_line
885-msgid "Sales Order Line"
886-msgstr "Ligne de commande"
887-
888-#. module: sale_order_webkit
889-#: field:sale.order.line,formatted_note:0
890-msgid "Formatted Note"
891-msgstr "Note formatée"
892+#: report:addons/sale_order_webkit/report/sale_order.mako:145
893+msgid "Salesman"
894+msgstr "Vendeur"
895+
896+#. module: sale_order_webkit
897+#: selection:sale.condition_text,type:0
898+msgid "Bottom condition"
899+msgstr "Commentaire de fin de page"
900+
901
902=== modified file 'sale_order_webkit/i18n/sale_order_webkit.pot'
903--- sale_order_webkit/i18n/sale_order_webkit.pot 2013-01-24 10:28:45 +0000
904+++ sale_order_webkit/i18n/sale_order_webkit.pot 2013-12-17 16:14:05 +0000
905@@ -4,10 +4,10 @@
906 #
907 msgid ""
908 msgstr ""
909-"Project-Id-Version: OpenERP Server 6.0.3\n"
910-"Report-Msgid-Bugs-To: support@openerp.com\n"
911-"POT-Creation-Date: 2011-12-12 11:13+0000\n"
912-"PO-Revision-Date: 2011-12-12 11:13+0000\n"
913+"Project-Id-Version: OpenERP Server 7.0\n"
914+"Report-Msgid-Bugs-To: \n"
915+"POT-Creation-Date: 2013-11-27 12:50+0000\n"
916+"PO-Revision-Date: 2013-11-27 12:50+0000\n"
917 "Last-Translator: <>\n"
918 "Language-Team: \n"
919 "MIME-Version: 1.0\n"
920@@ -16,83 +16,185 @@
921 "Plural-Forms: \n"
922
923 #. module: sale_order_webkit
924-#: report:addons/sale_order_webkit/report/sale_order.mako:78
925-msgid "Your Reference"
926-msgstr ""
927-
928-#. module: sale_order_webkit
929-#: report:addons/sale_order_webkit/report/sale_order.mako:35
930-msgid "Fax"
931-msgstr ""
932-
933-#. module: sale_order_webkit
934-#: report:addons/sale_order_webkit/report/sale_order.mako:32
935-msgid "Tel"
936-msgstr ""
937-
938-#. module: sale_order_webkit
939-#: report:addons/sale_order_webkit/report/sale_order.mako:94
940+#: field:sale.condition_text,name:0
941+msgid "Condition summary"
942+msgstr ""
943+
944+#. module: sale_order_webkit
945+#: view:sale.condition_text:0
946+msgid "sale condition text"
947+msgstr ""
948+
949+#. module: sale_order_webkit
950+#: report:addons/sale_order_webkit/report/sale_order.mako:168
951+msgid "Unit Price"
952+msgstr ""
953+
954+#. module: sale_order_webkit
955+#: view:sale.order:0
956+msgid "Your bottom conditions here"
957+msgstr ""
958+
959+#. module: sale_order_webkit
960+#: report:addons/sale_order_webkit/report/sale_order.mako:139
961+msgid "Order N°"
962+msgstr ""
963+
964+#. module: sale_order_webkit
965+#: report:addons/sale_order_webkit/report/sale_order.mako:170
966+msgid "Disc.(%)"
967+msgstr ""
968+
969+#. module: sale_order_webkit
970+#: view:sale.order:0
971+msgid "Conditions"
972+msgstr ""
973+
974+#. module: sale_order_webkit
975+#: report:addons/sale_order_webkit/report/sale_order.mako:202
976+msgid "Taxes:"
977+msgstr ""
978+
979+#. module: sale_order_webkit
980+#: model:ir.model,name:sale_order_webkit.model_sale_condition_text
981+msgid "sale conditions"
982+msgstr ""
983+
984+#. module: sale_order_webkit
985+#: report:addons/sale_order_webkit/report/sale_order.mako:167
986+msgid "UoM"
987+msgstr ""
988+
989+#. module: sale_order_webkit
990+#: selection:sale.condition_text,type:0
991+msgid "Top condition"
992+msgstr ""
993+
994+#. module: sale_order_webkit
995+#: report:addons/sale_order_webkit/report/sale_order.mako:165
996 msgid "Description"
997 msgstr ""
998
999 #. module: sale_order_webkit
1000-#: report:addons/sale_order_webkit/report/sale_order.mako:79
1001-msgid "Quotation Date"
1002+#: field:sale.order,note1:0
1003+#: field:sale.order,text_condition1:0
1004+msgid "Header"
1005 msgstr ""
1006
1007 #. module: sale_order_webkit
1008-#: report:addons/sale_order_webkit/report/sale_order.mako:99
1009+#: report:addons/sale_order_webkit/report/sale_order.mako:171
1010 msgid "Price"
1011 msgstr ""
1012
1013 #. module: sale_order_webkit
1014-#: report:addons/sale_order_webkit/report/sale_order.mako:79
1015+#: report:addons/sale_order_webkit/report/sale_order.mako:169
1016+msgid "VAT"
1017+msgstr ""
1018+
1019+#. module: sale_order_webkit
1020+#: field:sale.condition_text,type:0
1021+msgid "type"
1022+msgstr ""
1023+
1024+#. module: sale_order_webkit
1025+#: field:sale.condition_text,text:0
1026+msgid "Condition"
1027+msgstr ""
1028+
1029+#. module: sale_order_webkit
1030+#: report:addons/sale_order_webkit/report/sale_order.mako:207
1031+msgid "Total:"
1032+msgstr ""
1033+
1034+#. module: sale_order_webkit
1035+#: field:sale.order,note2:0
1036+#: field:sale.order,text_condition2:0
1037+msgid "Footer"
1038+msgstr ""
1039+
1040+#. module: sale_order_webkit
1041+#: report:addons/sale_order_webkit/report/sale_order.mako:105
1042+msgid "Shipping address:"
1043+msgstr ""
1044+
1045+#. module: sale_order_webkit
1046+#: report:addons/sale_order_webkit/report/sale_order.mako:143
1047 msgid "Date Ordered"
1048 msgstr ""
1049
1050 #. module: sale_order_webkit
1051-#: report:addons/sale_order_webkit/report/sale_order.mako:81
1052+#: report:addons/sale_order_webkit/report/sale_order.mako:122
1053+msgid "Invoice address:"
1054+msgstr ""
1055+
1056+#. module: sale_order_webkit
1057+#: report:addons/sale_order_webkit/report/sale_order.mako:144
1058+msgid "Your Reference"
1059+msgstr ""
1060+
1061+#. module: sale_order_webkit
1062+#: field:sale.order.line,formatted_note:0
1063+msgid "Formatted Note"
1064+msgstr ""
1065+
1066+#. module: sale_order_webkit
1067+#: report:addons/sale_order_webkit/report/sale_order.mako:166
1068+msgid "Quantity"
1069+msgstr ""
1070+
1071+#. module: sale_order_webkit
1072+#: view:sale.order:0
1073+msgid "Your top conditions here"
1074+msgstr ""
1075+
1076+#. module: sale_order_webkit
1077+#: view:sale.condition_text:0
1078+msgid "Sale condition text"
1079+msgstr ""
1080+
1081+#. module: sale_order_webkit
1082+#: report:addons/sale_order_webkit/report/sale_order.mako:143
1083+msgid "Quotation Date"
1084+msgstr ""
1085+
1086+#. module: sale_order_webkit
1087+#: model:ir.actions.act_window,name:sale_order_webkit.action_sale_condition_form_webkit
1088+#: model:ir.actions.act_window,name:sale_order_webkit.action_sale_condition_webkit
1089+msgid "sale.condition_text"
1090+msgstr ""
1091+
1092+#. module: sale_order_webkit
1093+#: report:addons/sale_order_webkit/report/sale_order.mako:146
1094 msgid "Payment Term"
1095 msgstr ""
1096
1097 #. module: sale_order_webkit
1098-#: report:addons/sale_order_webkit/report/sale_order.mako:38
1099-msgid "E-mail"
1100+#: report:addons/sale_order_webkit/report/sale_order.mako:197
1101+msgid "Net Total:"
1102 msgstr ""
1103
1104 #. module: sale_order_webkit
1105-#: report:addons/sale_order_webkit/report/sale_order.mako:74
1106+#: report:addons/sale_order_webkit/report/sale_order.mako:139
1107 msgid "Quotation N°"
1108 msgstr ""
1109
1110 #. module: sale_order_webkit
1111-#: report:addons/sale_order_webkit/report/sale_order.mako:97
1112-msgid "Unit Price"
1113-msgstr ""
1114-
1115-#. module: sale_order_webkit
1116-#: report:addons/sale_order_webkit/report/sale_order.mako:74
1117-msgid "Order N°"
1118-msgstr ""
1119-
1120-#. module: sale_order_webkit
1121-#: report:addons/sale_order_webkit/report/sale_order.mako:98
1122-msgid "Disc.(%)"
1123-msgstr ""
1124-
1125-#. module: sale_order_webkit
1126-#: report:addons/sale_order_webkit/report/sale_order.mako:80
1127+#: model:ir.model,name:sale_order_webkit.model_sale_order_line
1128+msgid "Sales Order Line"
1129+msgstr ""
1130+
1131+#. module: sale_order_webkit
1132+#: model:ir.model,name:sale_order_webkit.model_sale_order
1133+msgid "Sales Order"
1134+msgstr ""
1135+
1136+#. module: sale_order_webkit
1137+#: report:addons/sale_order_webkit/report/sale_order.mako:145
1138 msgid "Salesman"
1139 msgstr ""
1140
1141 #. module: sale_order_webkit
1142-#: report:addons/sale_order_webkit/report/sale_order.mako:41
1143-#: report:addons/sale_order_webkit/report/sale_order.mako:95
1144-msgid "VAT"
1145-msgstr ""
1146-
1147-#. module: sale_order_webkit
1148-#: report:addons/sale_order_webkit/report/sale_order.mako:96
1149-msgid "Quantity"
1150+#: selection:sale.condition_text,type:0
1151+msgid "Bottom condition"
1152 msgstr ""
1153

Subscribers

People subscribed via source and target branches