Merge lp:~matjaz-6/openerpsl/openerpsl_02_17 into lp:openerpsl/7.0

Proposed by Matjaz Kalic
Status: Merged
Merged at revision: 350
Proposed branch: lp:~matjaz-6/openerpsl/openerpsl_02_17
Merge into: lp:openerpsl/7.0
Diff against target: 655 lines (+47/-520)
8 files modified
inovatim_reports/i18n/en_US.po (+5/-0)
inovatim_reports/i18n/inovatim_reports.pot (+5/-0)
inovatim_reports/i18n/sl.po (+5/-0)
inovatim_reports/i18n/sl_SI.po (+0/-520)
novaqua_reports/i18n/en_US.po (+8/-0)
novaqua_reports/i18n/novaqua_reports.pot (+8/-0)
novaqua_reports/i18n/sl.po (+8/-0)
novaqua_reports/i18n/sl_SI.po (+8/-0)
To merge this branch: bzr merge lp:~matjaz-6/openerpsl/openerpsl_02_17
Reviewer Review Type Date Requested Status
Mentis Pending
Review via email: mp+208757@code.launchpad.net

Description of the change

[FIX] novaqua_reports, inovatim_reports (translation added)

To post a comment you must log in.
350. By Dušan Laznik (Mentis)

[FIX] novaqua_reports, inovatim_reports (translation added)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'inovatim_reports/i18n/en_US.po'
2--- inovatim_reports/i18n/en_US.po 2014-02-25 12:29:43 +0000
3+++ inovatim_reports/i18n/en_US.po 2014-02-28 10:07:22 +0000
4@@ -521,3 +521,8 @@
5 #: report:purchase.order.inovatim:0
6 msgid "Net Price (€)"
7 msgstr "Net Price (€)"
8+
9+#. module: inovatim_reports
10+#: field:res.partner,delivery_prices:0
11+msgid "Prices on delivery report"
12+msgstr ""
13
14=== modified file 'inovatim_reports/i18n/inovatim_reports.pot'
15--- inovatim_reports/i18n/inovatim_reports.pot 2014-02-25 12:29:43 +0000
16+++ inovatim_reports/i18n/inovatim_reports.pot 2014-02-28 10:07:22 +0000
17@@ -521,3 +521,8 @@
18 #: report:purchase.order.inovatim:0
19 msgid "Net Price (€)"
20 msgstr ""
21+
22+#. module: inovatim_reports
23+#: field:res.partner,delivery_prices:0
24+msgid "Prices on delivery report"
25+msgstr ""
26
27=== modified file 'inovatim_reports/i18n/sl.po'
28--- inovatim_reports/i18n/sl.po 2014-02-25 12:29:43 +0000
29+++ inovatim_reports/i18n/sl.po 2014-02-28 10:07:22 +0000
30@@ -521,3 +521,8 @@
31 #: report:purchase.order.inovatim:0
32 msgid "Net Price (€)"
33 msgstr "Neto cena (€)"
34+
35+#. module: inovatim_reports
36+#: field:res.partner,delivery_prices:0
37+msgid "Prices on delivery report"
38+msgstr "Prikaz cen na dobavnici"
39
40=== removed file 'inovatim_reports/i18n/sl_SI.po'
41--- inovatim_reports/i18n/sl_SI.po 2014-01-22 17:14:14 +0000
42+++ inovatim_reports/i18n/sl_SI.po 1970-01-01 00:00:00 +0000
43@@ -1,520 +0,0 @@
44-# Translation of OpenERP Server.
45-# This file contains the translation of the following modules:
46-# * inovatim_reports
47-#
48-msgid ""
49-msgstr ""
50-"Project-Id-Version: OpenERP Server 7.0\n"
51-"Report-Msgid-Bugs-To: \n"
52-"POT-Creation-Date: 2014-01-19 16:01+0000\n"
53-"PO-Revision-Date: 2014-01-19 16:01+0000\n"
54-"Last-Translator: <>\n"
55-"Language-Team: \n"
56-"MIME-Version: 1.0\n"
57-"Content-Type: text/plain; charset=UTF-8\n"
58-"Content-Transfer-Encoding: \n"
59-"Plural-Forms: \n"
60-
61-#. module: inovatim_reports
62-#: model:ir.model,name:inovatim_reports.model_account_payment_term
63-msgid "Payment Term"
64-msgstr "Plačilni pogoj"
65-
66-#. module: account
67-#: report:account.invoice.inovatim:0
68-#: report:sale.order.inovatim:0
69-msgid "Payment Term:"
70-msgstr "Plačilni pogoj:"
71-
72-#. module: inovatim_reports
73-#: report:account.invoice.inovatim:0
74-msgid "Delivery Date:"
75-msgstr "Datum dobave:"
76-
77-#. module: inovatim_reports
78-#: report:account.invoice.inovatim:0
79-msgid "Due Date:"
80-msgstr "Datum valute:"
81-
82-#. module: inovatim_reports
83-#: report:account.invoice.inovatim:0
84-msgid "VAT:"
85-msgstr "ID DDV:"
86-
87-#. module: inovatim_reports
88-#: report:account.invoice.inovatim:0
89-msgid "Invoice issued by:"
90-msgstr "Račun izdal:"
91-
92-#. module: inovatim_reports
93-#: report:account.invoice.inovatim:0
94-#: report:sale.order.inovatim:0
95-msgid "Code"
96-msgstr "Koda"
97-
98-#. module: inovatim_reports
99-#: report:account.invoice.inovatim:0
100-msgid "Partner phone:"
101-msgstr "Tel.št. kupca:"
102-
103-#. module: inovatim_reports
104-#: report:account.invoice.inovatim:0
105-#: report:sale.order.inovatim:0
106-msgid "UM"
107-msgstr "EM"
108-
109-#. module: inovatim_reports
110-#: report:account.invoice.inovatim:0
111-#: report:sale.order.inovatim:0
112-msgid "Package"
113-msgstr "Paketi"
114-
115-#. module: inovatim_reports
116-#: report:account.invoice.inovatim:0
117-#: report:sale.order.inovatim:0
118-msgid "Disc."
119-msgstr "Rabat"
120-
121-#. module: inovatim_reports
122-#: report:account.invoice.inovatim:0
123-msgid "Price (EUR)"
124-msgstr "Vrednost (EUR)"
125-
126-#. module: inovatim_reports
127-#: report:account.invoice.inovatim:0
128-msgid "Delivery method:"
129-msgstr "Način dostave:"
130-
131-#. module: inovatim_reports
132-#: report:account.invoice.inovatim:0
133-#: report:sale.order.inovatim:0
134-msgid "Total net weight:"
135-msgstr "Skupaj neto teža:"
136-
137-#. module: inovatim_reports
138-#: report:account.invoice.inovatim:0
139-msgid "Cancelled Invoice"
140-msgstr "Preklicani račun"
141-
142-#. module: inovatim_reports
143-#: report:account.invoice.inovatim:0
144-msgid "Description"
145-msgstr "Naziv"
146-
147-#. module: inovatim_reports
148-#: report:account.invoice.inovatim:0
149-msgid "Disc. (%)"
150-msgstr "Pop. (%)"
151-
152-#. module: inovatim_reports
153-#: report:account.invoice.inovatim:0
154-msgid "Draft Invoice"
155-msgstr "Osnutek računa"
156-
157-#. module: inovatim_reports
158-#: report:account.invoice.inovatim:0
159-msgid "Invoice"
160-msgstr "Račun"
161-
162-#. module: inovatim_reports
163-#: report:account.invoice.inovatim:0
164-msgid "Invoice Date"
165-msgstr "Datum DUR"
166-
167-#. module: inovatim_reports
168-#: report:account.invoice.inovatim:0
169-msgid "Invoice issued by:"
170-msgstr "Račun izdal:"
171-
172-#. module: inovatim_reports
173-#: report:account.invoice.inovatim:0
174-msgid "Net Total:"
175-msgstr "Skupaj neto:"
176-
177-#. module: inovatim_reports
178-#: report:account.invoice.inovatim:0
179-msgid "PRO-FORMA"
180-msgstr "Predračun"
181-
182-#. module: inovatim_reports
183-#: report:account.invoice.inovatim:0
184-msgid "Quantity"
185-msgstr "Količina"
186-
187-#. module: inovatim_reports
188-#: report:account.invoice.inovatim:0
189-msgid "Reference:"
190-msgstr "Referenca:"
191-
192-#. module: inovatim_reports
193-#: report:account.invoice.inovatim:0
194-msgid "Refund"
195-msgstr "Dobropis"
196-
197-#. module: inovatim_reports
198-#: report:account.invoice.inovatim:0
199-msgid "Supplier Invoice"
200-msgstr "Račun dobavitelja"
201-
202-#. module: inovatim_reports
203-#: report:account.invoice.inovatim:0
204-msgid "Supplier Refund"
205-msgstr "Dobropis"
206-
207-#. module: inovatim_reports
208-#: report:account.invoice.inovatim:0
209-#: report:purchase.order.inovatim:0
210-msgid "Taxes:"
211-msgstr "Davki:"
212-
213-#. module: inovatim_reports
214-#: report:account.invoice.inovatim:0
215-#: report:purchase.order.inovatim:0
216-msgid "Total:"
217-msgstr "Skupaj:"
218-
219-#. module: inovatim_reports
220-#: report:account.invoice.inovatim:0
221-#: report:purchase.order.inovatim:0
222-msgid "Unit Price"
223-msgstr "Cena enote"
224-
225-#. module: inovatim_reports
226-#: report:account.invoice.inovatim:0
227-msgid "VAT:"
228-msgstr "ID DDV:"
229-
230-#. module: inovatim_reports
231-#: report:account.invoice.inovatim:0
232-msgid "Disc. Total:"
233-msgstr "Skupaj popust:"
234-
235-#. module: inovatim_reports
236-#: report:account.invoice.inovatim:0
237-msgid "Net:"
238-msgstr "Skupaj brez DDV:"
239-
240-#. module: inovatim_reports
241-#: report:account.invoice.inovatim:0
242-msgid "Disc. (€)"
243-msgstr "Pop. (€)"
244-
245-
246-
247-
248-
249-#. module: inovatim_reports
250-#: report:sale.order.inovatim:0
251-msgid "Expiration date:"
252-msgstr "Datum veljavnosti:"
253-
254-#. module: inovatim_reports
255-#: report:sale.order.inovatim:0
256-msgid "Confirmation date:"
257-msgstr "Datum potrditve:"
258-
259-#. module: inovatim_reports
260-#: report:sale.order.inovatim:0
261-msgid "Customer reference:"
262-msgstr "Referenca kupca:"
263-
264-#. module: inovatim_reports
265-#: report:sale.order.inovatim:0
266-msgid "Description"
267-msgstr "Opis"
268-
269-#. module: inovatim_reports
270-#: report:sale.order.inovatim:0
271-msgid "Disc. (%)"
272-msgstr "Pop. (%)"
273-
274-#. module: inovatim_reports
275-#: report:sale.order.inovatim:0
276-msgid "email:"
277-msgstr "email:"
278-
279-#. module: inovatim_reports
280-#: report:sale.order.inovatim:0
281-msgid "Incoterm:"
282-msgstr "Način dostave:"
283-
284-#. module: inovatim_reports
285-#: report:sale.order.inovatim:0
286-msgid "Invoice address :"
287-msgstr "Naslov za račun:"
288-
289-#. module: inovatim_reports
290-#: report:sale.order.inovatim:0
291-#: report:purchase.order.inovatim:0
292-msgid "Net Total:"
293-msgstr "Skupaj neto:"
294-
295-#. module: inovatim_reports
296-#: report:sale.order.inovatim:0
297-msgid "Order N°"
298-msgstr "Naročilo št."
299-
300-#. module: inovatim_reports
301-#: report:sale.order.inovatim:0
302-msgid "Order reference:"
303-msgstr "Referenca:"
304-
305-#. module: inovatim_reports
306-#: report:sale.order.inovatim:0
307-#: report:purchase.order.inovatim:0
308-msgid "Payment terms:"
309-msgstr "Plačilni pogoji:"
310-
311-#. module: inovatim_reports
312-#: report:sale.order.inovatim:0
313-msgid "Place, date:"
314-msgstr "Kraj, datum:"
315-
316-#. module: inovatim_reports
317-#: report:sale.order.inovatim:0
318-msgid "Price"
319-msgstr "Cena"
320-
321-#. module: inovatim_reports
322-#: report:sale.order.inovatim:0
323-msgid "Quantity"
324-msgstr "Količina"
325-
326-#. module: inovatim_reports
327-#: report:sale.order.inovatim:0
328-msgid "Quotation N°"
329-msgstr "Ponudba št."
330-
331-#. module: inovatim_reports
332-#: report:sale.order.inovatim:0
333-msgid "Salesperson:"
334-msgstr "Prodajalec:"
335-
336-#. module: inovatim_reports
337-#: report:sale.order.inovatim:0
338-msgid "Shipping address :"
339-msgstr "Naslov za odpremo"
340-
341-#. module: inovatim_reports
342-#: report:sale.order.inovatim:0
343-msgid "Taxes :"
344-msgstr "Davki:"
345-
346-#. module: inovatim_reports
347-#: report:sale.order.inovatim:0
348-msgid "tel.:"
349-msgstr "tel.:"
350-
351-#. module: inovatim_reports
352-#: report:sale.order.inovatim:0
353-msgid "Total :"
354-msgstr "Skupaj:"
355-
356-#. module: inovatim_reports
357-#: report:sale.order.inovatim:0
358-msgid "Unit Price"
359-msgstr "Cena enote"
360-
361-#. module: inovatim_reports
362-#: report:sale.order.inovatim:0
363-msgid "VAT"
364-msgstr "ID DDV"
365-
366-#. module: inovatim_reports
367-#: report:sale.order.inovatim:0
368-#: report:purchase.order.inovatim:0
369-msgid "VAT:"
370-msgstr "ID DDV:"
371-
372-#. module: inovatim_reports
373-#: report:sale.order.inovatim:0
374-msgid "Disc. (€)"
375-msgstr "Pop. (€)"
376-
377-#. module: inovatim_reports
378-#: report:sale.order.inovatim:0
379-msgid "Taxes (%)"
380-msgstr "Davki (%)"
381-
382-#. module: inovatim_reports
383-#: report:sale.order.inovatim:0
384-msgid "Price (€)"
385-msgstr "Vrednost (€)"
386-
387-#. module: inovatim_reports
388-#: report:sale.order.inovatim:0
389-msgid "Disc. Total:"
390-msgstr "Skupaj popust:"
391-
392-#. module: inovatim_reports
393-#: report:sale.order.inovatim:0
394-msgid "Net:"
395-msgstr "Skupaj brez DDV:"
396-
397-
398-
399-
400-
401-#. module: inovatim_reports
402-#: report:stock.picking.list.inovatim:0
403-#: report:stock.picking.list.inovatim.out:0
404-#: report:stock.picking.list.inovatim.in:0
405-msgid "Delivery Order:"
406-msgstr "Dobavnica:"
407-
408-#. module: inovatim_reports
409-#: report:stock.picking.list.inovatim:0
410-#: report:stock.picking.list.inovatim.out:0
411-#: report:stock.picking.list.inovatim.in:0
412-msgid "Incoming Shipment:"
413-msgstr "Prihajajoče pošiljke:"
414-
415-#. module: inovatim_reports
416-#: report:stock.picking.list.inovatim:0
417-#: report:stock.picking.list.inovatim.out:0
418-#: report:stock.picking.list.inovatim.in:0
419-msgid "Internal Shipment:"
420-msgstr "Interna pošiljka:"
421-
422-#. module: inovatim_reports
423-#: report:stock.picking.list.inovatim:0
424-#: report:stock.picking.list.inovatim.out:0
425-#: report:stock.picking.list.inovatim.in:0
426-msgid "Warehouse Address:"
427-msgstr "Naslov skladišča:"
428-
429-#. module: inovatim_reports
430-#: report:stock.picking.list.inovatim:0
431-#: report:stock.picking.list.inovatim.out:0
432-#: report:stock.picking.list.inovatim.in:0
433-msgid "Scheduled Date:"
434-msgstr "Načrtovani datum:"
435-
436-#. module: inovatim_reports
437-#: report:stock.picking.list.inovatim:0
438-#: report:stock.picking.list.inovatim.out:0
439-#: report:stock.picking.list.inovatim.in:0
440-msgid "Order:"
441-msgstr "Naročilo:"
442-
443-#. module: inovatim_reports
444-#: report:stock.picking.list.inovatim:0
445-#: report:stock.picking.list.inovatim.out:0
446-#: report:stock.picking.list.inovatim.in:0
447-msgid "Customer reference:"
448-msgstr "Referenca kupca:"
449-
450-#. module: inovatim_reports
451-#: report:stock.picking.list.inovatim:0
452-#: report:stock.picking.list.inovatim.out:0
453-#: report:stock.picking.list.inovatim.in:0
454-msgid "Delivery method:"
455-msgstr "Način dostave:"
456-
457-#. module: inovatim_reports
458-#: report:stock.picking.list.inovatim:0
459-#: report:stock.picking.list.inovatim.out:0
460-#: report:stock.picking.list.inovatim.in:0
461-msgid "Total net weight:"
462-msgstr "Skupaj neto teža:"
463-
464-#. module: inovatim_reports
465-#: report:stock.picking.list.inovatim:0
466-#: report:stock.picking.list.inovatim.out:0
467-#: report:stock.picking.list.inovatim.in:0
468-#: report:purchase.order.inovatim:0
469-msgid "Code"
470-msgstr "Koda"
471-
472-#. module: inovatim_reports
473-#: report:stock.picking.list.inovatim:0
474-#: report:stock.picking.list.inovatim.out:0
475-#: report:stock.picking.list.inovatim.in:0
476-#: report:purchase.order.inovatim:0
477-msgid "Description"
478-msgstr "Opis"
479-
480-#. module: inovatim_reports
481-#: report:stock.picking.list.inovatim:0
482-#: report:stock.picking.list.inovatim.out:0
483-#: report:stock.picking.list.inovatim.in:0
484-#: report:purchase.order.inovatim:0
485-msgid "Quantity"
486-msgstr "Količina"
487-
488-#. module: inovatim_reports
489-#: report:stock.picking.list.inovatim:0
490-#: report:stock.picking.list.inovatim.out:0
491-#: report:stock.picking.list.inovatim.in:0
492-#: report:purchase.order.inovatim:0
493-msgid "UM"
494-msgstr "EM"
495-
496-#. module: inovatim_reports
497-#: report:stock.picking.list.inovatim:0
498-#: report:stock.picking.list.inovatim.out:0
499-#: report:stock.picking.list.inovatim.in:0
500-msgid "Package"
501-msgstr "Paketi"
502-
503-#. module: inovatim_reports
504-#: report:stock.picking.list.inovatim:0
505-#: report:stock.picking.list.inovatim.out:0
506-#: report:stock.picking.list.inovatim.in:0
507-msgid "Price (€) / unit"
508-msgstr "Cena (€) / enoto"
509-
510-#. module: inovatim_reports
511-#: report:stock.picking.list.inovatim:0
512-#: report:stock.picking.list.inovatim.out:0
513-#: report:stock.picking.list.inovatim.in:0
514-msgid "Issued by:"
515-msgstr "Izdal:"
516-
517-#. module: inovatim_reports
518-#: report:stock.picking.list.inovatim:0
519-#: report:stock.picking.list.inovatim.out:0
520-#: report:stock.picking.list.inovatim.in:0
521-msgid "Received by:"
522-msgstr "Prevzel:"
523-
524-#. module: inovatim_reports
525-#: report:stock.picking.list.inovatim:0
526-#: report:stock.picking.list.inovatim.out:0
527-#: report:stock.picking.list.inovatim.in:0
528-msgid "Place, date:"
529-msgstr "Kraj, datum:"
530-
531-
532-
533-
534-
535-#. module: inovatim_reports
536-#: report:purchase.order.inovatim:0
537-msgid "Purchase Order Confirmation:"
538-msgstr "Nabavni nalog:"
539-
540-#. module: inovatim_reports
541-#: report:purchase.order.inovatim:0
542-msgid "Request for Quotation:"
543-msgstr "Ponudba:"
544-
545-#. module: inovatim_reports
546-#: report:purchase.order.inovatim:0
547-msgid "Order Date:"
548-msgstr "Datum naročila:"
549-
550-#. module: inovatim_reports
551-#: report:purchase.order.inovatim:0
552-msgid "Validated By:"
553-msgstr "Naročnik:"
554-
555-#. module: inovatim_reports
556-#: report:purchase.order.inovatim:0
557-msgid "Customer reference"
558-msgstr "Kupčeva ref."
559-
560-#. module: inovatim_reports
561-#: report:purchase.order.inovatim:0
562-msgid "Net Price (€)"
563-msgstr "Neto cena (€)"
564
565=== modified file 'novaqua_reports/i18n/en_US.po'
566--- novaqua_reports/i18n/en_US.po 2014-01-27 12:26:32 +0000
567+++ novaqua_reports/i18n/en_US.po 2014-02-28 10:07:22 +0000
568@@ -54,6 +54,9 @@
569
570 #. module: novaqua_reports
571 #: report:account.invoice.novaqua:0
572+#: report:stock.picking.list.novaqua:0
573+#: report:stock.picking.list.novaqua.out:0
574+#: report:stock.picking.list.novaqua.in:0
575 msgid "Partner phone:"
576 msgstr "Partner phone:"
577
578@@ -518,3 +521,8 @@
579 #: report:purchase.order.novaqua:0
580 msgid "Net Price (€)"
581 msgstr "Net Price (€)"
582+
583+#. module: novaqua_reports
584+#: field:res.partner,delivery_prices:0
585+msgid "Prices on delivery report"
586+msgstr "Prices on delivery report"
587
588=== modified file 'novaqua_reports/i18n/novaqua_reports.pot'
589--- novaqua_reports/i18n/novaqua_reports.pot 2014-01-27 12:26:32 +0000
590+++ novaqua_reports/i18n/novaqua_reports.pot 2014-02-28 10:07:22 +0000
591@@ -54,6 +54,9 @@
592
593 #. module: novaqua_reports
594 #: report:account.invoice.novaqua:0
595+#: report:stock.picking.list.novaqua:0
596+#: report:stock.picking.list.novaqua.out:0
597+#: report:stock.picking.list.novaqua.in:0
598 msgid "Partner phone:"
599 msgstr ""
600
601@@ -518,3 +521,8 @@
602 #: report:purchase.order.novaqua:0
603 msgid "Net Price (€)"
604 msgstr ""
605+
606+#. module: novaqua_reports
607+#: field:res.partner,delivery_prices:0
608+msgid "Prices on delivery report"
609+msgstr ""
610
611=== modified file 'novaqua_reports/i18n/sl.po'
612--- novaqua_reports/i18n/sl.po 2014-01-27 12:26:32 +0000
613+++ novaqua_reports/i18n/sl.po 2014-02-28 10:07:22 +0000
614@@ -54,6 +54,9 @@
615
616 #. module: novaqua_reports
617 #: report:account.invoice.novaqua:0
618+#: report:stock.picking.list.novaqua:0
619+#: report:stock.picking.list.novaqua.out:0
620+#: report:stock.picking.list.novaqua.in:0
621 msgid "Partner phone:"
622 msgstr "Tel.št. kupca:"
623
624@@ -518,3 +521,8 @@
625 #: report:purchase.order.novaqua:0
626 msgid "Net Price (€)"
627 msgstr "Neto cena (€)"
628+
629+#. module: novaqua_reports
630+#: field:res.partner,delivery_prices:0
631+msgid "Prices on delivery report"
632+msgstr "Prikaz cen na dobavnici"
633
634=== modified file 'novaqua_reports/i18n/sl_SI.po'
635--- novaqua_reports/i18n/sl_SI.po 2014-01-27 12:26:32 +0000
636+++ novaqua_reports/i18n/sl_SI.po 2014-02-28 10:07:22 +0000
637@@ -54,6 +54,9 @@
638
639 #. module: novaqua_reports
640 #: report:account.invoice.novaqua:0
641+#: report:stock.picking.list.novaqua:0
642+#: report:stock.picking.list.novaqua.out:0
643+#: report:stock.picking.list.novaqua.in:0
644 msgid "Partner phone:"
645 msgstr "Tel.št. kupca:"
646
647@@ -518,3 +521,8 @@
648 #: report:purchase.order.novaqua:0
649 msgid "Net Price (€)"
650 msgstr "Neto cena (€)"
651+
652+#. module: novaqua_reports
653+#: field:res.partner,delivery_prices:0
654+msgid "Prices on delivery report"
655+msgstr "Prikaz cen na dobavnici"

Subscribers

People subscribed via source and target branches