Merge lp:~camptocamp/sale-reports/fix-translation into lp:~sale-core-editors/sale-reports/7.0
- fix-translation
- Merge into 7.0
Proposed by
Nicolas Bessi - Camptocamp
Status: | Merged |
---|---|
Merged at revision: | 13 |
Proposed branch: | lp:~camptocamp/sale-reports/fix-translation |
Merge into: | lp:~sale-core-editors/sale-reports/7.0 |
Diff against target: |
388 lines (+350/-3) 3 files modified
sale_order_webkit/i18n/de.po (+175/-0) sale_order_webkit/i18n/en.po (+95/-0) sale_order_webkit/i18n/fr.po (+80/-3) |
To merge this branch: | bzr merge lp:~camptocamp/sale-reports/fix-translation |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Nicolas Bessi - Camptocamp (community) | Needs Fixing | ||
Review via email: mp+146395@code.launchpad.net |
Commit message
Description of the change
Fix addon translation for V7.0
To post a comment you must log in.
- 14. By Nicolas Bessi - Camptocamp
-
[FIX] fuzzy comment
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote : | # |
review:
Needs Fixing
- 15. By Nicolas Bessi - Camptocamp
-
[FIX] swapped translation
- 16. By Nicolas Bessi - Camptocamp
-
[FIX] forgotten french translation in de.po
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'sale_order_webkit/i18n/de.po' | |||
2 | --- sale_order_webkit/i18n/de.po 1970-01-01 00:00:00 +0000 | |||
3 | +++ sale_order_webkit/i18n/de.po 2013-02-06 09:28:27 +0000 | |||
4 | @@ -0,0 +1,175 @@ | |||
5 | 1 | # Translation of OpenERP Server. | ||
6 | 2 | # This file contains the translation of the following modules: | ||
7 | 3 | # * sale_order_webkit | ||
8 | 4 | # | ||
9 | 5 | msgid "" | ||
10 | 6 | msgstr "" | ||
11 | 7 | "Project-Id-Version: OpenERP Server 6.0.3\n" | ||
12 | 8 | "Report-Msgid-Bugs-To: \n" | ||
13 | 9 | "POT-Creation-Date: 2013-02-04 10:57+0000\n" | ||
14 | 10 | "PO-Revision-Date: 2011-12-12 11:13+0000\n" | ||
15 | 11 | "Last-Translator: <>\n" | ||
16 | 12 | "Language-Team: \n" | ||
17 | 13 | "Language: \n" | ||
18 | 14 | "MIME-Version: 1.0\n" | ||
19 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | ||
20 | 16 | "Content-Transfer-Encoding: \n" | ||
21 | 17 | "Plural-Forms: \n" | ||
22 | 18 | |||
23 | 19 | |||
24 | 20 | #. module: sale_order_webkit | ||
25 | 21 | #: report:addons/sale_order_webkit/report/sale_order.mako:78 | ||
26 | 22 | msgid "Your Reference" | ||
27 | 23 | msgstr "Ihre Referenz" | ||
28 | 24 | |||
29 | 25 | #. module: sale_order_webkit | ||
30 | 26 | #: report:addons/sale_order_webkit/report/sale_order.mako:35 | ||
31 | 27 | msgid "Fax" | ||
32 | 28 | msgstr "Fax" | ||
33 | 29 | |||
34 | 30 | #. module: sale_order_webkit | ||
35 | 31 | #: report:addons/sale_order_webkit/report/sale_order.mako:32 | ||
36 | 32 | msgid "Tel" | ||
37 | 33 | msgstr "Tél" | ||
38 | 34 | |||
39 | 35 | #. module: sale_order_webkit | ||
40 | 36 | #: report:addons/sale_order_webkit/report/sale_order.mako:94 | ||
41 | 37 | msgid "Description" | ||
42 | 38 | msgstr "Beschreibung" | ||
43 | 39 | |||
44 | 40 | #. module: sale_order_webkit | ||
45 | 41 | #: report:addons/sale_order_webkit/report/sale_order.mako:79 | ||
46 | 42 | msgid "Quotation Date" | ||
47 | 43 | msgstr "Offertdatum" | ||
48 | 44 | |||
49 | 45 | #. module: sale_order_webkit | ||
50 | 46 | #: report:addons/sale_order_webkit/report/sale_order.mako:99 | ||
51 | 47 | msgid "Price" | ||
52 | 48 | msgstr "Preis" | ||
53 | 49 | |||
54 | 50 | #. module: sale_order_webkit | ||
55 | 51 | #: report:addons/sale_order_webkit/report/sale_order.mako:79 | ||
56 | 52 | msgid "Date Ordered" | ||
57 | 53 | msgstr "Bestelldatum" | ||
58 | 54 | |||
59 | 55 | #. module: sale_order_webkit | ||
60 | 56 | #: report:addons/sale_order_webkit/report/sale_order.mako:81 | ||
61 | 57 | msgid "Payment Term" | ||
62 | 58 | msgstr "Zahlungskonditionen" | ||
63 | 59 | |||
64 | 60 | #. module: sale_order_webkit | ||
65 | 61 | #: report:addons/sale_order_webkit/report/sale_order.mako:38 | ||
66 | 62 | msgid "E-mail" | ||
67 | 63 | msgstr "E-mail" | ||
68 | 64 | |||
69 | 65 | #. module: sale_order_webkit | ||
70 | 66 | #: report:addons/sale_order_webkit/report/sale_order.mako:74 | ||
71 | 67 | msgid "Quotation N°" | ||
72 | 68 | msgstr "Offerte N°" | ||
73 | 69 | |||
74 | 70 | #. module: sale_order_webkit | ||
75 | 71 | #: report:addons/sale_order_webkit/report/sale_order.mako:97 | ||
76 | 72 | msgid "Unit Price" | ||
77 | 73 | msgstr "Stückpreis" | ||
78 | 74 | |||
79 | 75 | #. module: sale_order_webkit | ||
80 | 76 | #: report:addons/sale_order_webkit/report/sale_order.mako:74 | ||
81 | 77 | msgid "Order N°" | ||
82 | 78 | msgstr "Bestell-Nr." | ||
83 | 79 | |||
84 | 80 | #. module: sale_order_webkit | ||
85 | 81 | #: report:addons/sale_order_webkit/report/sale_order.mako:98 | ||
86 | 82 | msgid "Disc.(%)" | ||
87 | 83 | msgstr "Rab.(%)" | ||
88 | 84 | |||
89 | 85 | #. module: sale_order_webkit | ||
90 | 86 | #: report:addons/sale_order_webkit/report/sale_order.mako:80 | ||
91 | 87 | msgid "Salesman" | ||
92 | 88 | msgstr "Verkäufer" | ||
93 | 89 | |||
94 | 90 | #. module: sale_order_webkit | ||
95 | 91 | #: report:addons/sale_order_webkit/report/sale_order.mako:41 | ||
96 | 92 | #: report:addons/sale_order_webkit/report/sale_order.mako:95 | ||
97 | 93 | msgid "VAT" | ||
98 | 94 | msgstr "MvSt." | ||
99 | 95 | |||
100 | 96 | #. module: sale_order_webkit | ||
101 | 97 | #: report:addons/sale_order_webkit/report/sale_order.mako:96 | ||
102 | 98 | msgid "Quantity" | ||
103 | 99 | msgstr "Menge" | ||
104 | 100 | |||
105 | 101 | #. module: sale_order_webkit | ||
106 | 102 | #: field:sale.condition_text,name:0 | ||
107 | 103 | msgid "Condition summary" | ||
108 | 104 | msgstr "Rapport Bemerkung" | ||
109 | 105 | |||
110 | 106 | #. module: sale_order_webkit | ||
111 | 107 | #: selection:sale.condition_text,type:0 | ||
112 | 108 | msgid "Top condition" | ||
113 | 109 | msgstr "Kopfzeile Seite Bemerkung" | ||
114 | 110 | |||
115 | 111 | #. module: sale_order_webkit | ||
116 | 112 | #: view:sale.condition_text:0 | ||
117 | 113 | msgid "Sale condition text" | ||
118 | 114 | msgstr "Rapport Bemerkung" | ||
119 | 115 | |||
120 | 116 | #. module: sale_order_webkit | ||
121 | 117 | #: field:sale.order,note2:0 field:sale.order,text_condition2:0 | ||
122 | 118 | msgid "Footer" | ||
123 | 119 | msgstr "Fusszeilen-Bemerkung" | ||
124 | 120 | |||
125 | 121 | #. module: sale_order_webkit | ||
126 | 122 | #: model:ir.actions.act_window,name:sale_order_webkit.action_sale_condition_form_webkit | ||
127 | 123 | #: model:ir.actions.act_window,name:sale_order_webkit.action_sale_condition_webkit | ||
128 | 124 | msgid "sale.condition_text" | ||
129 | 125 | msgstr "sale.condition_text" | ||
130 | 126 | |||
131 | 127 | #. module: sale_order_webkit | ||
132 | 128 | #: selection:sale.condition_text,type:0 | ||
133 | 129 | msgid "Bottom condition" | ||
134 | 130 | msgstr "Fusszeilen-Bemerkung" | ||
135 | 131 | |||
136 | 132 | #. module: sale_order_webkit | ||
137 | 133 | #: field:sale.order,note1:0 field:sale.order,text_condition1:0 | ||
138 | 134 | msgid "Header" | ||
139 | 135 | msgstr "Kopfzeile" | ||
140 | 136 | |||
141 | 137 | #. module: sale_order_webkit | ||
142 | 138 | #: model:ir.model,name:sale_order_webkit.model_sale_condition_text | ||
143 | 139 | msgid "sale conditions" | ||
144 | 140 | msgstr "Verfauf Bemerkung" | ||
145 | 141 | |||
146 | 142 | #. module: sale_order_webkit | ||
147 | 143 | #: field:sale.condition_text,text:0 | ||
148 | 144 | msgid "Condition" | ||
149 | 145 | msgstr "Konditionen" | ||
150 | 146 | |||
151 | 147 | #. module: sale_order_webkit | ||
152 | 148 | #: field:sale.condition_text,type:0 | ||
153 | 149 | msgid "type" | ||
154 | 150 | msgstr "type" | ||
155 | 151 | |||
156 | 152 | #. module: sale_order_webkit | ||
157 | 153 | #: view:sale.condition_text:0 | ||
158 | 154 | msgid "sale condition text" | ||
159 | 155 | msgstr "Verkauf Bemerkung" | ||
160 | 156 | |||
161 | 157 | #. module: sale_order_webkit | ||
162 | 158 | #: model:ir.model,name:sale_order_webkit.model_sale_order | ||
163 | 159 | msgid "Sales Order" | ||
164 | 160 | msgstr "Bestellung" | ||
165 | 161 | |||
166 | 162 | #. module: sale_order_webkit | ||
167 | 163 | #: view:sale.order:0 | ||
168 | 164 | msgid "Conditions" | ||
169 | 165 | msgstr "Konditionen" | ||
170 | 166 | |||
171 | 167 | #. module: sale_order_webkit | ||
172 | 168 | #: model:ir.model,name:sale_order_webkit.model_sale_order_line | ||
173 | 169 | msgid "Sales Order Line" | ||
174 | 170 | msgstr "Bestellung" | ||
175 | 171 | |||
176 | 172 | #. module: sale_order_webkit | ||
177 | 173 | #: field:sale.order.line,formatted_note:0 | ||
178 | 174 | msgid "Formatted Note" | ||
179 | 175 | msgstr "Notizen" | ||
180 | 0 | 176 | ||
181 | === added file 'sale_order_webkit/i18n/en.po' | |||
182 | --- sale_order_webkit/i18n/en.po 1970-01-01 00:00:00 +0000 | |||
183 | +++ sale_order_webkit/i18n/en.po 2013-02-06 09:28:27 +0000 | |||
184 | @@ -0,0 +1,95 @@ | |||
185 | 1 | # Translation of OpenERP Server. | ||
186 | 2 | # This file contains the translation of the following modules: | ||
187 | 3 | # * sale_order_webkit | ||
188 | 4 | # | ||
189 | 5 | msgid "" | ||
190 | 6 | msgstr "" | ||
191 | 7 | "Project-Id-Version: OpenERP Server 7.0\n" | ||
192 | 8 | "Report-Msgid-Bugs-To: \n" | ||
193 | 9 | "POT-Creation-Date: 2013-02-04 10:57+0000\n" | ||
194 | 10 | "PO-Revision-Date: 2013-02-04 10:57+0000\n" | ||
195 | 11 | "Last-Translator: <>\n" | ||
196 | 12 | "Language-Team: \n" | ||
197 | 13 | "MIME-Version: 1.0\n" | ||
198 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | ||
199 | 15 | "Content-Transfer-Encoding: \n" | ||
200 | 16 | "Plural-Forms: \n" | ||
201 | 17 | |||
202 | 18 | #. module: sale_order_webkit | ||
203 | 19 | #: field:sale.condition_text,name:0 | ||
204 | 20 | msgid "Condition summary" | ||
205 | 21 | msgstr "Condition summary" | ||
206 | 22 | |||
207 | 23 | #. module: sale_order_webkit | ||
208 | 24 | #: selection:sale.condition_text,type:0 | ||
209 | 25 | msgid "Top condition" | ||
210 | 26 | msgstr "Top condition" | ||
211 | 27 | |||
212 | 28 | #. module: sale_order_webkit | ||
213 | 29 | #: view:sale.condition_text:0 | ||
214 | 30 | msgid "Sale condition text" | ||
215 | 31 | msgstr "Sale condition text" | ||
216 | 32 | |||
217 | 33 | #. module: sale_order_webkit | ||
218 | 34 | #: field:sale.order,note2:0 | ||
219 | 35 | #: field:sale.order,text_condition2:0 | ||
220 | 36 | msgid "Footer" | ||
221 | 37 | msgstr "Footer" | ||
222 | 38 | |||
223 | 39 | #. module: sale_order_webkit | ||
224 | 40 | #: model:ir.actions.act_window,name:sale_order_webkit.action_sale_condition_form_webkit | ||
225 | 41 | #: model:ir.actions.act_window,name:sale_order_webkit.action_sale_condition_webkit | ||
226 | 42 | msgid "sale.condition_text" | ||
227 | 43 | msgstr "sale.condition_text" | ||
228 | 44 | |||
229 | 45 | #. module: sale_order_webkit | ||
230 | 46 | #: selection:sale.condition_text,type:0 | ||
231 | 47 | msgid "Bottom condition" | ||
232 | 48 | msgstr "Bottom condition" | ||
233 | 49 | |||
234 | 50 | #. module: sale_order_webkit | ||
235 | 51 | #: field:sale.order,note1:0 | ||
236 | 52 | #: field:sale.order,text_condition1:0 | ||
237 | 53 | msgid "Header" | ||
238 | 54 | msgstr "Header" | ||
239 | 55 | |||
240 | 56 | #. module: sale_order_webkit | ||
241 | 57 | #: model:ir.model,name:sale_order_webkit.model_sale_condition_text | ||
242 | 58 | msgid "sale conditions" | ||
243 | 59 | msgstr "sale conditions" | ||
244 | 60 | |||
245 | 61 | #. module: sale_order_webkit | ||
246 | 62 | #: field:sale.condition_text,text:0 | ||
247 | 63 | msgid "Condition" | ||
248 | 64 | msgstr "Condition" | ||
249 | 65 | |||
250 | 66 | #. module: sale_order_webkit | ||
251 | 67 | #: field:sale.condition_text,type:0 | ||
252 | 68 | msgid "type" | ||
253 | 69 | msgstr "type" | ||
254 | 70 | |||
255 | 71 | #. module: sale_order_webkit | ||
256 | 72 | #: view:sale.condition_text:0 | ||
257 | 73 | msgid "sale condition text" | ||
258 | 74 | msgstr "sale condition text" | ||
259 | 75 | |||
260 | 76 | #. module: sale_order_webkit | ||
261 | 77 | #: model:ir.model,name:sale_order_webkit.model_sale_order | ||
262 | 78 | msgid "Sales Order" | ||
263 | 79 | msgstr "Sales Order" | ||
264 | 80 | |||
265 | 81 | #. module: sale_order_webkit | ||
266 | 82 | #: view:sale.order:0 | ||
267 | 83 | msgid "Conditions" | ||
268 | 84 | msgstr "Conditions" | ||
269 | 85 | |||
270 | 86 | #. module: sale_order_webkit | ||
271 | 87 | #: model:ir.model,name:sale_order_webkit.model_sale_order_line | ||
272 | 88 | msgid "Sales Order Line" | ||
273 | 89 | msgstr "Sales Order Line" | ||
274 | 90 | |||
275 | 91 | #. module: sale_order_webkit | ||
276 | 92 | #: field:sale.order.line,formatted_note:0 | ||
277 | 93 | msgid "Formatted Note" | ||
278 | 94 | msgstr "Formatted Note" | ||
279 | 95 | |||
280 | 0 | 96 | ||
281 | === modified file 'sale_order_webkit/i18n/fr.po' | |||
282 | --- sale_order_webkit/i18n/fr.po 2013-01-24 10:28:45 +0000 | |||
283 | +++ sale_order_webkit/i18n/fr.po 2013-02-06 09:28:27 +0000 | |||
284 | @@ -1,20 +1,22 @@ | |||
285 | 1 | # Translation of OpenERP Server. | 1 | # Translation of OpenERP Server. |
286 | 2 | # This file contains the translation of the following modules: | 2 | # This file contains the translation of the following modules: |
288 | 3 | # * sale_order_webkit | 3 | # * sale_order_webkit |
289 | 4 | # | 4 | # |
290 | 5 | msgid "" | 5 | msgid "" |
291 | 6 | msgstr "" | 6 | msgstr "" |
292 | 7 | "Project-Id-Version: OpenERP Server 6.0.3\n" | 7 | "Project-Id-Version: OpenERP Server 6.0.3\n" |
295 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 8 | "Report-Msgid-Bugs-To: \n" |
296 | 9 | "POT-Creation-Date: 2011-12-12 11:13+0000\n" | 9 | "POT-Creation-Date: 2013-02-04 10:57+0000\n" |
297 | 10 | "PO-Revision-Date: 2011-12-12 11:13+0000\n" | 10 | "PO-Revision-Date: 2011-12-12 11:13+0000\n" |
298 | 11 | "Last-Translator: <>\n" | 11 | "Last-Translator: <>\n" |
299 | 12 | "Language-Team: \n" | 12 | "Language-Team: \n" |
300 | 13 | "Language: \n" | ||
301 | 13 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
302 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
303 | 15 | "Content-Transfer-Encoding: \n" | 16 | "Content-Transfer-Encoding: \n" |
304 | 16 | "Plural-Forms: \n" | 17 | "Plural-Forms: \n" |
305 | 17 | 18 | ||
306 | 19 | |||
307 | 18 | #. module: sale_order_webkit | 20 | #. module: sale_order_webkit |
308 | 19 | #: report:addons/sale_order_webkit/report/sale_order.mako:78 | 21 | #: report:addons/sale_order_webkit/report/sale_order.mako:78 |
309 | 20 | msgid "Your Reference" | 22 | msgid "Your Reference" |
310 | @@ -96,3 +98,78 @@ | |||
311 | 96 | msgid "Quantity" | 98 | msgid "Quantity" |
312 | 97 | msgstr "Quantité" | 99 | msgstr "Quantité" |
313 | 98 | 100 | ||
314 | 101 | #. module: sale_order_webkit | ||
315 | 102 | #: field:sale.condition_text,name:0 | ||
316 | 103 | msgid "Condition summary" | ||
317 | 104 | msgstr "Texte de commentaire imprimable" | ||
318 | 105 | |||
319 | 106 | #. module: sale_order_webkit | ||
320 | 107 | #: selection:sale.condition_text,type:0 | ||
321 | 108 | msgid "Top condition" | ||
322 | 109 | msgstr "Commentaire de début de page" | ||
323 | 110 | |||
324 | 111 | #. module: sale_order_webkit | ||
325 | 112 | #: view:sale.condition_text:0 | ||
326 | 113 | msgid "Sale condition text" | ||
327 | 114 | msgstr "commentaire imprimable" | ||
328 | 115 | |||
329 | 116 | #. module: sale_order_webkit | ||
330 | 117 | #: field:sale.order,note2:0 field:sale.order,text_condition2:0 | ||
331 | 118 | msgid "Footer" | ||
332 | 119 | msgstr "Commentaire de fin de page" | ||
333 | 120 | |||
334 | 121 | #. module: sale_order_webkit | ||
335 | 122 | #: model:ir.actions.act_window,name:sale_order_webkit.action_sale_condition_form_webkit | ||
336 | 123 | #: model:ir.actions.act_window,name:sale_order_webkit.action_sale_condition_webkit | ||
337 | 124 | msgid "sale.condition_text" | ||
338 | 125 | msgstr "sale.condition_text" | ||
339 | 126 | |||
340 | 127 | #. module: sale_order_webkit | ||
341 | 128 | #: selection:sale.condition_text,type:0 | ||
342 | 129 | msgid "Bottom condition" | ||
343 | 130 | msgstr "Commentaire de fin de page" | ||
344 | 131 | |||
345 | 132 | #. module: sale_order_webkit | ||
346 | 133 | #: field:sale.order,note1:0 field:sale.order,text_condition1:0 | ||
347 | 134 | msgid "Header" | ||
348 | 135 | msgstr "Commentaire de début de page" | ||
349 | 136 | |||
350 | 137 | #. module: sale_order_webkit | ||
351 | 138 | #: model:ir.model,name:sale_order_webkit.model_sale_condition_text | ||
352 | 139 | msgid "sale conditions" | ||
353 | 140 | msgstr "Commentaire imprimable" | ||
354 | 141 | |||
355 | 142 | #. module: sale_order_webkit | ||
356 | 143 | #: field:sale.condition_text,text:0 | ||
357 | 144 | msgid "Condition" | ||
358 | 145 | msgstr "Condition" | ||
359 | 146 | |||
360 | 147 | #. module: sale_order_webkit | ||
361 | 148 | #: field:sale.condition_text,type:0 | ||
362 | 149 | msgid "type" | ||
363 | 150 | msgstr "type" | ||
364 | 151 | |||
365 | 152 | #. module: sale_order_webkit | ||
366 | 153 | #: view:sale.condition_text:0 | ||
367 | 154 | msgid "sale condition text" | ||
368 | 155 | msgstr "Commentaire imprimable" | ||
369 | 156 | |||
370 | 157 | #. module: sale_order_webkit | ||
371 | 158 | #: model:ir.model,name:sale_order_webkit.model_sale_order | ||
372 | 159 | msgid "Sales Order" | ||
373 | 160 | msgstr "Bon de commande" | ||
374 | 161 | |||
375 | 162 | #. module: sale_order_webkit | ||
376 | 163 | #: view:sale.order:0 | ||
377 | 164 | msgid "Conditions" | ||
378 | 165 | msgstr "Conditions" | ||
379 | 166 | |||
380 | 167 | #. module: sale_order_webkit | ||
381 | 168 | #: model:ir.model,name:sale_order_webkit.model_sale_order_line | ||
382 | 169 | msgid "Sales Order Line" | ||
383 | 170 | msgstr "Ligne de commande" | ||
384 | 171 | |||
385 | 172 | #. module: sale_order_webkit | ||
386 | 173 | #: field:sale.order.line,formatted_note:0 | ||
387 | 174 | msgid "Formatted Note" | ||
388 | 175 | msgstr "Note formatée" |
Some comment in German and french are swapped. The translation where already False in v.6x