Merge lp:~matjaz-6/openerpsl/openerpsl_02_17 into lp:openerpsl/7.0
- openerpsl_02_17
- Merge into 7.0
Proposed by
Matjaz Kalic
Status: | Merged |
---|---|
Merged at revision: | 329 |
Proposed branch: | lp:~matjaz-6/openerpsl/openerpsl_02_17 |
Merge into: | lp:openerpsl/7.0 |
Diff against target: |
424 lines (+264/-2) 3 files modified
mrp_procurement_qty/i18n/en_US.po (+87/-0) mrp_procurement_qty/i18n/mrp_procurement_qty.pot (+88/-0) mrp_procurement_qty/i18n/sl.po (+89/-2) |
To merge this branch: | bzr merge lp:~matjaz-6/openerpsl/openerpsl_02_17 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mentis | Pending | ||
Review via email: mp+206769@code.launchpad.net |
Commit message
Description of the change
[MOD] mrp_procurement_qty - translation
To post a comment you must log in.
- 329. By Dušan Laznik (Mentis)
-
[MOD] mrp_procurement_qty - translation
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'mrp_procurement_qty/i18n/en_US.po' |
2 | --- mrp_procurement_qty/i18n/en_US.po 2014-02-17 15:12:21 +0000 |
3 | +++ mrp_procurement_qty/i18n/en_US.po 2014-02-17 17:12:37 +0000 |
4 | @@ -16,6 +16,7 @@ |
5 | "Plural-Forms: \n" |
6 | |
7 | #. module: mrp_procurement_qty |
8 | +#: view:procurement.order.orderpoint.run.wizard:0 |
9 | #: view:procurement.order.run.wizard:0 |
10 | msgid "Run Scheduler" |
11 | msgstr "Run Scheduler" |
12 | @@ -26,6 +27,7 @@ |
13 | msgstr "Change Invoice State" |
14 | |
15 | #. module: mrp_procurement_qty |
16 | +#: field:procurement.order.orderpoint.run.wizard,repeat_number:0 |
17 | #: field:procurement.order.run.wizard,repeat_number:0 |
18 | msgid "Repeat Number" |
19 | msgstr "Repeat Number" |
20 | @@ -267,6 +269,7 @@ |
21 | #. module: mrp_procurement_qty |
22 | #: view:delivery.order.chginvoice.state:0 |
23 | #: view:mrp.procurement.qty:0 |
24 | +#: view:procurement.order.orderpoint.run.wizard:0 |
25 | #: view:procurement.order.run.wizard:0 |
26 | #: view:sale.order.confirm.wizard:0 |
27 | #: view:sale.order.journal.wizard:0 |
28 | @@ -363,6 +366,25 @@ |
29 | |
30 | |
31 | |
32 | + |
33 | +#. module: mrp_procurement_qty |
34 | +#: field:delivery.order.confirm,override:0 |
35 | +#: field:mrp.procurement.qty,override:0 |
36 | +#: field:procurement.order.orderpoint.run.wizard,override:0 |
37 | +#: field:procurement.order.run.wizard,override:0 |
38 | +#: field:sale.order.confirm.wizard,override:0 |
39 | +msgid "Override running process" |
40 | +msgstr "" |
41 | + |
42 | +#. module: mrp_procurement_qty |
43 | +#: help:delivery.order.confirm,override:0 |
44 | +#: help:mrp.procurement.qty,override:0 |
45 | +#: help:procurement.order.orderpoint.run.wizard,override:0 |
46 | +#: help:procurement.order.run.wizard,override:0 |
47 | +#: help:sale.order.confirm.wizard,override:0 |
48 | +msgid "Run the process, even if there is another one running" |
49 | +msgstr "" |
50 | + |
51 | #. module: mrp_procurement_qty |
52 | #: model:ir.actions.act_window,name:mrp_procurement_qty.action_bakery_production |
53 | #: model:ir.ui.menu,name:mrp_procurement_qty.menu_bakery_production |
54 | @@ -370,11 +392,75 @@ |
55 | msgstr "" |
56 | |
57 | #. module: mrp_procurement_qty |
58 | +#: field:bakery.process,running:0 |
59 | +#: field:bakery.production,running:0 |
60 | +msgid "Running" |
61 | +msgstr "" |
62 | + |
63 | +#. module: mrp_procurement_qty |
64 | +#: field:bakery.process,date_start:0 |
65 | +#: field:bakery.production,date_start:0 |
66 | +msgid "Start Date" |
67 | +msgstr "" |
68 | + |
69 | +#. module: mrp_procurement_qty |
70 | +#: field:bakery.process,date_end:0 |
71 | +#: field:bakery.production,date_end:0 |
72 | +msgid "End Date" |
73 | +msgstr "" |
74 | + |
75 | +#. module: mrp_procurement_qty |
76 | +#: field:bakery.process,process:0 |
77 | +msgid "Process" |
78 | +msgstr "" |
79 | + |
80 | +#. module: mrp_procurement_qty |
81 | +#: view:bakery.process:0 |
82 | +#: view:bakery.production:0 |
83 | +msgid "Processes" |
84 | +msgstr "" |
85 | + |
86 | +#. module: mrp_procurement_qty |
87 | +#: field:bakery.production,sale_done:0 |
88 | +msgid "Sale confirmed" |
89 | +msgstr "" |
90 | + |
91 | +#. module: mrp_procurement_qty |
92 | +#: field:bakery.production,procurement_done:0 |
93 | +msgid "Procurement done" |
94 | +msgstr "" |
95 | + |
96 | +#. module: mrp_procurement_qty |
97 | +#: field:bakery.production,op_procurement_done:0 |
98 | +msgid "OP procurement done" |
99 | +msgstr "" |
100 | + |
101 | +#. module: mrp_procurement_qty |
102 | +#: field:bakery.production,delivery_done:0 |
103 | +msgid "Delivery done" |
104 | +msgstr "" |
105 | + |
106 | +#. module: mrp_procurement_qty |
107 | +#: field:bakery.production,manufactury_done:0 |
108 | +msgid "Manufactury done" |
109 | +msgstr "" |
110 | + |
111 | + |
112 | +#. module: mrp_procurement_qty |
113 | #: model:ir.actions.act_window,name:mrp_procurement_qty.action_bakery_process |
114 | #: model:ir.ui.menu,name:mrp_procurement_qty.menu_bakery_process |
115 | msgid "Bakery Process" |
116 | msgstr "" |
117 | |
118 | +#. module: mrp_procurement_qty |
119 | +#: field:bakery.process,user_id:0 |
120 | +msgid "User" |
121 | +msgstr "" |
122 | + |
123 | +#. module: mrp_procurement_qty |
124 | +#: field:bakery.process,duration:0 |
125 | +msgid "Duration" |
126 | +msgstr "" |
127 | |
128 | |
129 | #. module: mrp_procurement_qty |
130 | @@ -385,5 +471,6 @@ |
131 | |
132 | #. module: mrp_procurement_qty |
133 | #: model:ir.model,name:mrp_procurement_qty.model_procurement_order_orderpoint_run_wizard |
134 | +#: view:procurement.order.orderpoint.run.wizard:0 |
135 | msgid "Run Orderpoint Scheduler multiple times" |
136 | msgstr "" |
137 | |
138 | === modified file 'mrp_procurement_qty/i18n/mrp_procurement_qty.pot' |
139 | --- mrp_procurement_qty/i18n/mrp_procurement_qty.pot 2014-02-17 15:12:21 +0000 |
140 | +++ mrp_procurement_qty/i18n/mrp_procurement_qty.pot 2014-02-17 17:12:37 +0000 |
141 | @@ -16,6 +16,7 @@ |
142 | "Plural-Forms: \n" |
143 | |
144 | #. module: mrp_procurement_qty |
145 | +#: view:procurement.order.orderpoint.run.wizard:0 |
146 | #: view:procurement.order.run.wizard:0 |
147 | msgid "Run Scheduler" |
148 | msgstr "" |
149 | @@ -26,6 +27,7 @@ |
150 | msgstr "" |
151 | |
152 | #. module: mrp_procurement_qty |
153 | +#: field:procurement.order.orderpoint.run.wizard,repeat_number:0 |
154 | #: field:procurement.order.run.wizard,repeat_number:0 |
155 | msgid "Repeat Number" |
156 | msgstr "" |
157 | @@ -194,6 +196,7 @@ |
158 | "But you can only produce up to total %s quantities." |
159 | msgstr "" |
160 | |
161 | + |
162 | #. module: mrp_procurement_qty |
163 | #: model:ir.actions.act_window,name:mrp_procurement_qty.action_run_scheduler_multiple_times |
164 | #: model:ir.ui.menu,name:mrp_procurement_qty.menu_run_scheduler_multiple_times |
165 | @@ -265,6 +268,7 @@ |
166 | #. module: mrp_procurement_qty |
167 | #: view:delivery.order.chginvoice.state:0 |
168 | #: view:mrp.procurement.qty:0 |
169 | +#: view:procurement.order.orderpoint.run.wizard:0 |
170 | #: view:procurement.order.run.wizard:0 |
171 | #: view:sale.order.confirm.wizard:0 |
172 | #: view:sale.order.journal.wizard:0 |
173 | @@ -361,6 +365,26 @@ |
174 | |
175 | |
176 | |
177 | + |
178 | + |
179 | +#. module: mrp_procurement_qty |
180 | +#: field:delivery.order.confirm,override:0 |
181 | +#: field:mrp.procurement.qty,override:0 |
182 | +#: field:procurement.order.orderpoint.run.wizard,override:0 |
183 | +#: field:procurement.order.run.wizard,override:0 |
184 | +#: field:sale.order.confirm.wizard,override:0 |
185 | +msgid "Override running process" |
186 | +msgstr "" |
187 | + |
188 | +#. module: mrp_procurement_qty |
189 | +#: help:delivery.order.confirm,override:0 |
190 | +#: help:mrp.procurement.qty,override:0 |
191 | +#: help:procurement.order.orderpoint.run.wizard,override:0 |
192 | +#: help:procurement.order.run.wizard,override:0 |
193 | +#: help:sale.order.confirm.wizard,override:0 |
194 | +msgid "Run the process, even if there is another one running" |
195 | +msgstr "" |
196 | + |
197 | #. module: mrp_procurement_qty |
198 | #: model:ir.actions.act_window,name:mrp_procurement_qty.action_bakery_production |
199 | #: model:ir.ui.menu,name:mrp_procurement_qty.menu_bakery_production |
200 | @@ -368,12 +392,75 @@ |
201 | msgstr "" |
202 | |
203 | #. module: mrp_procurement_qty |
204 | +#: field:bakery.process,running:0 |
205 | +#: field:bakery.production,running:0 |
206 | +msgid "Running" |
207 | +msgstr "" |
208 | + |
209 | +#. module: mrp_procurement_qty |
210 | +#: field:bakery.process,date_start:0 |
211 | +#: field:bakery.production,date_start:0 |
212 | +msgid "Start Date" |
213 | +msgstr "" |
214 | + |
215 | +#. module: mrp_procurement_qty |
216 | +#: field:bakery.process,date_end:0 |
217 | +#: field:bakery.production,date_end:0 |
218 | +msgid "End Date" |
219 | +msgstr "" |
220 | + |
221 | +#. module: mrp_procurement_qty |
222 | +#: field:bakery.process,process:0 |
223 | +msgid "Process" |
224 | +msgstr "" |
225 | + |
226 | +#. module: mrp_procurement_qty |
227 | +#: view:bakery.process:0 |
228 | +#: view:bakery.production:0 |
229 | +msgid "Processes" |
230 | +msgstr "" |
231 | + |
232 | +#. module: mrp_procurement_qty |
233 | +#: field:bakery.production,sale_done:0 |
234 | +msgid "Sale confirmed" |
235 | +msgstr "" |
236 | + |
237 | +#. module: mrp_procurement_qty |
238 | +#: field:bakery.production,procurement_done:0 |
239 | +msgid "Procurement done" |
240 | +msgstr "" |
241 | + |
242 | +#. module: mrp_procurement_qty |
243 | +#: field:bakery.production,op_procurement_done:0 |
244 | +msgid "OP procurement done" |
245 | +msgstr "" |
246 | + |
247 | +#. module: mrp_procurement_qty |
248 | +#: field:bakery.production,delivery_done:0 |
249 | +msgid "Delivery done" |
250 | +msgstr "" |
251 | + |
252 | +#. module: mrp_procurement_qty |
253 | +#: field:bakery.production,manufactury_done:0 |
254 | +msgid "Manufactury done" |
255 | +msgstr "" |
256 | + |
257 | + |
258 | +#. module: mrp_procurement_qty |
259 | #: model:ir.actions.act_window,name:mrp_procurement_qty.action_bakery_process |
260 | #: model:ir.ui.menu,name:mrp_procurement_qty.menu_bakery_process |
261 | msgid "Bakery Process" |
262 | msgstr "" |
263 | |
264 | +#. module: mrp_procurement_qty |
265 | +#: field:bakery.process,user_id:0 |
266 | +msgid "User" |
267 | +msgstr "" |
268 | |
269 | +#. module: mrp_procurement_qty |
270 | +#: field:bakery.process,duration:0 |
271 | +msgid "Duration" |
272 | +msgstr "" |
273 | |
274 | #. module: mrp_procurement_qty |
275 | #: model:ir.actions.act_window,name:mrp_procurement_qty.action_run_scheduler_orderpoint_multiple_times |
276 | @@ -383,5 +470,6 @@ |
277 | |
278 | #. module: mrp_procurement_qty |
279 | #: model:ir.model,name:mrp_procurement_qty.model_procurement_order_orderpoint_run_wizard |
280 | +#: view:procurement.order.orderpoint.run.wizard:0 |
281 | msgid "Run Orderpoint Scheduler multiple times" |
282 | msgstr "" |
283 | |
284 | === modified file 'mrp_procurement_qty/i18n/sl.po' |
285 | --- mrp_procurement_qty/i18n/sl.po 2014-02-17 15:12:21 +0000 |
286 | +++ mrp_procurement_qty/i18n/sl.po 2014-02-17 17:12:37 +0000 |
287 | @@ -16,6 +16,7 @@ |
288 | "Plural-Forms: \n" |
289 | |
290 | #. module: mrp_procurement_qty |
291 | +#: view:procurement.order.orderpoint.run.wizard:0 |
292 | #: view:procurement.order.run.wizard:0 |
293 | msgid "Run Scheduler" |
294 | msgstr "Zagon načrtovalca" |
295 | @@ -26,6 +27,7 @@ |
296 | msgstr "Sprememba statusa izdaje računov" |
297 | |
298 | #. module: mrp_procurement_qty |
299 | +#: field:procurement.order.orderpoint.run.wizard,repeat_number:0 |
300 | #: field:procurement.order.run.wizard,repeat_number:0 |
301 | msgid "Repeat Number" |
302 | msgstr "Število ponovitev" |
303 | @@ -267,6 +269,7 @@ |
304 | #. module: mrp_procurement_qty |
305 | #: view:delivery.order.chginvoice.state:0 |
306 | #: view:mrp.procurement.qty:0 |
307 | +#: view:procurement.order.orderpoint.run.wizard:0 |
308 | #: view:procurement.order.run.wizard:0 |
309 | #: view:sale.order.confirm.wizard:0 |
310 | #: view:sale.order.journal.wizard:0 |
311 | @@ -363,6 +366,25 @@ |
312 | |
313 | |
314 | |
315 | + |
316 | +#. module: mrp_procurement_qty |
317 | +#: field:delivery.order.confirm,override:0 |
318 | +#: field:mrp.procurement.qty,override:0 |
319 | +#: field:procurement.order.orderpoint.run.wizard,override:0 |
320 | +#: field:procurement.order.run.wizard,override:0 |
321 | +#: field:sale.order.confirm.wizard,override:0 |
322 | +msgid "Override running process" |
323 | +msgstr "Zaženi brez preverjanja statusa" |
324 | + |
325 | +#. module: mrp_procurement_qty |
326 | +#: help:delivery.order.confirm,override:0 |
327 | +#: help:mrp.procurement.qty,override:0 |
328 | +#: help:procurement.order.orderpoint.run.wizard,override:0 |
329 | +#: help:procurement.order.run.wizard,override:0 |
330 | +#: help:sale.order.confirm.wizard,override:0 |
331 | +msgid "Run the process, even if there is another one running" |
332 | +msgstr "Zaženi proces kljub temu, da je ta morda že zagnan." |
333 | + |
334 | #. module: mrp_procurement_qty |
335 | #: model:ir.actions.act_window,name:mrp_procurement_qty.action_bakery_production |
336 | #: model:ir.ui.menu,name:mrp_procurement_qty.menu_bakery_production |
337 | @@ -370,20 +392,85 @@ |
338 | msgstr "Pregled proizvodnje" |
339 | |
340 | #. module: mrp_procurement_qty |
341 | +#: field:bakery.process,running:0 |
342 | +#: field:bakery.production,running:0 |
343 | +msgid "Running" |
344 | +msgstr "V teku" |
345 | + |
346 | +#. module: mrp_procurement_qty |
347 | +#: field:bakery.process,date_start:0 |
348 | +#: field:bakery.production,date_start:0 |
349 | +msgid "Start Date" |
350 | +msgstr "Začetni datum" |
351 | + |
352 | +#. module: mrp_procurement_qty |
353 | +#: field:bakery.process,date_end:0 |
354 | +#: field:bakery.production,date_end:0 |
355 | +msgid "End Date" |
356 | +msgstr "Končni datum" |
357 | + |
358 | +#. module: mrp_procurement_qty |
359 | +#: field:bakery.process,process:0 |
360 | +msgid "Process" |
361 | +msgstr "Proces" |
362 | + |
363 | +#. module: mrp_procurement_qty |
364 | +#: view:bakery.process:0 |
365 | +#: view:bakery.production:0 |
366 | +msgid "Processes" |
367 | +msgstr "Faze" |
368 | + |
369 | +#. module: mrp_procurement_qty |
370 | +#: field:bakery.production,sale_done:0 |
371 | +msgid "Sale confirmed" |
372 | +msgstr "Prodaja potrjena" |
373 | + |
374 | +#. module: mrp_procurement_qty |
375 | +#: field:bakery.production,procurement_done:0 |
376 | +msgid "Procurement done" |
377 | +msgstr "Proizvodnja lansirana" |
378 | + |
379 | +#. module: mrp_procurement_qty |
380 | +#: field:bakery.production,op_procurement_done:0 |
381 | +msgid "OP procurement done" |
382 | +msgstr "Proizvodnja lans. iz zaloge" |
383 | + |
384 | +#. module: mrp_procurement_qty |
385 | +#: field:bakery.production,delivery_done:0 |
386 | +msgid "Delivery done" |
387 | +msgstr "Dobava opravljena" |
388 | + |
389 | +#. module: mrp_procurement_qty |
390 | +#: field:bakery.production,manufactury_done:0 |
391 | +msgid "Manufactury done" |
392 | +msgstr "Proizvodnja zaključena" |
393 | + |
394 | + |
395 | +#. module: mrp_procurement_qty |
396 | #: model:ir.actions.act_window,name:mrp_procurement_qty.action_bakery_process |
397 | #: model:ir.ui.menu,name:mrp_procurement_qty.menu_bakery_process |
398 | msgid "Bakery Process" |
399 | msgstr "Pregled procesov" |
400 | |
401 | +#. module: mrp_procurement_qty |
402 | +#: field:bakery.process,user_id:0 |
403 | +msgid "User" |
404 | +msgstr "Uporabnik" |
405 | + |
406 | +#. module: mrp_procurement_qty |
407 | +#: field:bakery.process,duration:0 |
408 | +msgid "Duration" |
409 | +msgstr "Trajanje" |
410 | |
411 | |
412 | #. module: mrp_procurement_qty |
413 | #: model:ir.actions.act_window,name:mrp_procurement_qty.action_run_scheduler_orderpoint_multiple_times |
414 | #: model:ir.ui.menu,name:mrp_procurement_qty.menu_run_scheduler_orderpoint_multiple_times |
415 | msgid "Run Orderpoint Scheduler x times" |
416 | -msgstr "Lansiranje proizvodnje iz OP" |
417 | +msgstr "Lansiranje proizvodnje iz zaloge" |
418 | |
419 | #. module: mrp_procurement_qty |
420 | #: model:ir.model,name:mrp_procurement_qty.model_procurement_order_orderpoint_run_wizard |
421 | +#: view:procurement.order.orderpoint.run.wizard:0 |
422 | msgid "Run Orderpoint Scheduler multiple times" |
423 | -msgstr "Lansiranje proizvodnje iz točk naročanja" |
424 | +msgstr "Lansiranje proizvodnje iz zaloge" |