Odoo GTK Client (MOVED TO GITHUB)

Merge lp://staging/~openerp-community/openobject-client/taktik_generic_maintenance into lp://staging/openobject-client

  1. taktik_generic_maintenance
  2. Merge into trunk
Proposed by Fabien Lydoire @ Taktik
Status: Work in progress
Proposed branch: lp://staging/~openerp-community/openobject-client/taktik_generic_maintenance
Merge into: lp://staging/openobject-client
Diff against target: 892 lines (+689/-79)
5 files modified
bin/common/common.py (+10/-72)
bin/po/nl.po (+257/-2)
bin/po/openerp-client.pot (+2/-2)
bin/po/uk.po (+419/-2)
bin/win_error.glade (+1/-1)
To merge this branch: bzr merge lp://staging/~openerp-community/openobject-client/taktik_generic_maintenance
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Needs Resubmitting
Review via email: mp+16278@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Fabien Lydoire @ Taktik (fl-taktik) wrote :

This branch makes generic the maintenance functions in order to select the bug report channel when OpenERP server crashes.

The channel JIRA has been added in addition to the existing OpenERP channel.
Yyou can specify a generic bug report server address and user.

Messages have also been made generic, so that OpenERP integrator can specify their own message on OpenERP server crash.

This branch depends on the server branch
~openerp-community/openobject-server/taktik_generic_maintenance
adjusting the server to this new generic bug report channel.

Reply
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello Fabien Lydoire @ Taktik ,

It's really a very work done by you but unfortunately the code contains conflicts too means you have commited your work along with the conflicts. It would be nice of you if you resolve them and resend the proposal so that we can test this nice work.

Thanks,

review: Needs Resubmitting
Reply

Unmerged revisions

1009. By flydoire <email address hidden>

Make generic the maintenance methods

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/common/common.py'
2--- bin/common/common.py 2009-12-09 10:57:48 +0000
3+++ bin/common/common.py 2009-12-17 11:55:25 +0000
4@@ -335,77 +335,15 @@
5 details = get_client_environment() + details
6 log.error('Message %s: %s' % (str(message),details))
7
8- show_message = True
9-
10- if not disconnected_mode:
11- maintenance = rpc.session.rpc_exec_auth_try('/object', 'execute', 'maintenance.contract', 'status')
12-
13- if maintenance['status'] == 'none':
14- maintenance_contract_message=_("""
15-<b>An unknown error has been reported.</b>
16-
17-<b>You do not have a valid Open ERP maintenance contract !</b>
18-If you are using Open ERP in production, it is highly suggested to subscribe
19-a maintenance program.
20-
21-The Open ERP maintenance contract provides you a bugfix guarantee and an
22-automatic migration system so that we can fix your problems within a few
23-hours. If you had a maintenance contract, this error would have been sent
24-to the quality team of the Open ERP editor.
25-
26-The maintenance program offers you:
27-* Automatic migrations on new versions,
28-* A bugfix guarantee,
29-* Monthly announces of potential bugs and their fixes,
30-* Security alerts by email and automatic migration,
31-* Access to the customer portal.
32-
33-You can use the link bellow for more information. The detail of the error
34-is displayed on the second tab.
35-""")
36- elif maintenance['status'] == 'partial':
37- maintenance_contract_message=_("""
38-<b>An unknown error has been reported.</b>
39-
40-Your maintenance contract does not cover all modules installed in your system !
41-If you are using Open ERP in production, it is highly suggested to upgrade your
42-contract.
43-
44-If you have developed your own modules or installed third party module, we
45-can provide you an additional maintenance contract for these modules. After
46-having reviewed your modules, our quality team will ensure they will migrate
47-automatically for all future stable versions of Open ERP at no extra cost.
48-
49-Here is the list of modules not covered by your maintenance contract:
50-%s
51-
52-You can use the link bellow for more information. The detail of the error
53-is displayed on the second tab.""") % (", ".join(maintenance['uncovered_modules']), )
54- else:
55- show_message = False
56+ lang = rpc.session.context.get('lang')
57+ maintenance = rpc.session.rpc_exec_auth_try('/object', 'execute', 'maintenance.contract', 'status_text', disconnected_mode, lang)
58+ contract_stats = rpc.session.rpc_exec_auth_try('/object', 'execute', 'maintenance.contract', 'status')
59+ maintenance_contract_message = maintenance
60+
61+ if contract_stats['status'] == 'full':
62+ show_message = False
63 else:
64- maintenance_contract_message=_("""
65-<b>An unknown error has been reported.</b>
66-
67-<b>You do not have a valid Open ERP maintenance contract !</b>
68-If you are using Open ERP in production, it is highly suggested to subscribe
69-a maintenance program.
70-
71-The Open ERP maintenance contract provides you a bugfix guarantee and an
72-automatic migration system so that we can fix your problems within a few
73-hours. If you had a maintenance contract, this error would have been sent
74-to the quality team of the Open ERP editor.
75-
76-The maintenance program offers you:
77-* Automatic migrations on new versions,
78-* A bugfix guarantee,
79-* Monthly announces of potential bugs and their fixes,
80-* Security alerts by email and automatic migration,
81-* Access to the customer portal.
82-
83-You can use the link bellow for more information. The detail of the error
84-is displayed on the second tab.
85-""")
86+ show_message = True
87
88 xmlGlade = glade.XML(terp_path('win_error.glade'), 'dialog_error', gettext.textdomain())
89 win = xmlGlade.get_widget('dialog_error')
90@@ -437,12 +375,12 @@
91 tb = get_text_from_text_view(xmlGlade.get_widget('details_explanation'))
92 explanation = get_text_from_text_view(xmlGlade.get_widget('explanation_textview'))
93 remarks = get_text_from_text_view(xmlGlade.get_widget('remarks_textview'))
94-
95+
96 if rpc.session.rpc_exec_auth_try('/object', 'execute', 'maintenance.contract', 'send', tb, explanation, remarks):
97 common.message(_('Your problem has been sent to the quality team !\nWe will recontact you after analysing the problem.'), parent=win)
98 win.destroy()
99 else:
100- common.message(_('Your problem could *NOT* be sent to the quality team !\nPlease report this error manually at:\n\t%s') % ('http://openerp.com/report_bug.html',), title=_('Error'), type=gtk.MESSAGE_ERROR, parent=win)
101+ common.message(_('Your problem could *NOT* be sent to the quality team !\nPlease report this error manually to your service provider.'), title=_('Error'), type=gtk.MESSAGE_ERROR, parent=win)
102
103 xmlGlade.signal_connect('on_button_send_clicked', send)
104 xmlGlade.signal_connect('on_closebutton_clicked', lambda x : win.destroy())
105
106=== modified file 'bin/po/nl.po'
107--- bin/po/nl.po 2009-12-17 04:43:46 +0000
108+++ bin/po/nl.po 2009-12-17 11:55:25 +0000
109@@ -2403,18 +2403,25 @@
110 msgid ""
111 "<b>Complete this form to submit your bug and/or send a support request.</b>\n"
112 "<i>\n"
113-"Your request will be sent to the OpenERP team and we will reply shortly.\n"
114+"Your request will be sent to the support team and we will reply shortly.\n"
115 "Note that we may not reply if you do not have a support contract with Tiny "
116 "or an official partner.</i>"
117 msgstr ""
118 "<b>Vul dit formulier is om een fout te melden en/of een "
119 "ondersteuningsverzoek te versturen.</b>\n"
120 "<i>\n"
121+<<<<<<< TREE
122 "Uw verzoek zal verzonden worden naar het OpenERP-team. Er zal zo snel "
123 "mogelijk contact met u worden opgenomen.\n"
124 "Merk op dat er niet gereageerd zal worden als u geen onderhoudscontract "
125 "heeft met OpenERP of een officiele partner.</i>"
126
127+=======
128+"Uw aanvraag zal verzonden worden naar de support team en er zal zo snel mogelijk "
129+"contact met u worden opgenomen.\n"
130+"Neem in acht dat er niet gereageerd zal worden als u geen contract heeft met "
131+"OpenERP of een officiele partner.</i>"
132+>>>>>>> MERGE-SOURCE
133 #
134 # File: bin/openerp.glade, line: 5328
135 #: bin/openerp.glade:4474
136@@ -3135,7 +3142,7 @@
137 msgid ""
138 "<b>Maintenance Contract.</b>\n"
139 "<i>\n"
140-"Your request will be send to OpenERP and maintenance team will reply you "
141+"Your request will be send to the maintenance team who will reply you "
142 "shortly.\n"
143 "</i>"
144 msgstr ""
145@@ -3368,6 +3375,7 @@
146 #~ msgstr ""
147 #~ "Ik zou graag willen dat er contact met mij wordt opgenomen voor een "
148 #~ "demonstratie"
149+<<<<<<< TREE
150
151 #
152 # File: bin/openerp.glade, line: 5037
153@@ -3438,3 +3446,250 @@
154
155 #~ msgid "The content of the widget or excpetion if not valid"
156 #~ msgstr "De inhoud van het widget of uitzondering indien niet geldig"
157+=======
158+#
159+#
160+#
161+#~ msgid "Gantt View Error !"
162+#~ msgstr "Gantt beeldfout"
163+#
164+#
165+#
166+#~ msgid "Gantt not implemented in GTK Client, please use the Web Client."
167+#~ msgstr "Gantt niet geinstalleerd in de GTK client, gebruik de webclient."
168+#
169+#
170+#
171+#~ msgid "Select a record"
172+#~ msgstr "Selecteer een item"
173+#
174+#
175+#
176+#~ msgid "Open this record"
177+#~ msgstr "Open dit item"
178+#
179+#
180+#
181+#~ msgid "OpenERP - Error"
182+#~ msgstr "OpenERP - fout"
183+#
184+#
185+#
186+#~ msgid "<b>Contract name:</b>"
187+#~ msgstr "<b>Contractnaam:</b>"
188+#
189+#
190+#
191+#~ msgid "<b>support contract id :</b>"
192+#~ msgstr "<b>onderhoudscontractnummer</b>"
193+#
194+#
195+#
196+#~ msgid "<b>_Error</b>"
197+#~ msgstr "<b>Fout</b>"
198+#
199+#
200+#
201+#~ msgid "<b>Error 404</b>"
202+#~ msgstr "<b>Fout 404</b>"
203+#
204+#
205+#
206+#~ msgid "<b>Error code:</b>"
207+#~ msgstr "<b>Foutcode:</b>"
208+#
209+#
210+#
211+#~ msgid ""
212+#~ "This Page does not exist !\n"
213+#~ "Please retry"
214+#~ msgstr ""
215+#~ "Deze pagina bestaat niet!\n"
216+#~ "Probeer opnieuw."
217+#
218+#
219+#
220+#~ msgid "<i>Click on the Support Request tab if you need more help !</i>"
221+#~ msgstr ""
222+#~ "<i>Klik op de ondersteunigsaanvraag als u meer ondersteuning wenst!</i>"
223+#
224+#
225+#
226+# File: bin/openerp.glade, line: 3886
227+# File: bin/openerp.glade, line: 3886
228+#~ msgid "De_scription"
229+#~ msgstr "Om_schrijving"
230+#
231+#
232+#
233+#~ msgid ""
234+#~ "<b>Complete this form to submit your bug and/or request a support.</b>\n"
235+#~ "<i>\n"
236+#~ "Your request will be send to the support team and we will reply you shortly.\n"
237+#~ "Note that we may not reply you if your Service Company is not a OpenERP "
238+#~ "partner.\n"
239+#~ "</i>"
240+#~ msgstr ""
241+#~ "<b>Maak dit formulier compleet om een ondersteuningsaanvraag te verzenden "
242+#~ "of een bug te melden.</b>\n"
243+#~ "<i>\n"
244+#~ "Uw aanvraag zal verzonden worden naar OpenERP en deze zullen zo snel "
245+#~ "mogelijk reageren.\n"
246+#~ "Neem in acht dat als uw ondersteuner geen OpenERP partner is wij niet "
247+#~ "zullen reageren.\n"
248+#~ "</i>"
249+#
250+#
251+#
252+# File: bin/openerp.glade, line: 4014
253+# File: bin/openerp.glade, line: 4014
254+#~ msgid "Phone Number:"
255+#~ msgstr "Telefoonnummer:"
256+#
257+#
258+#
259+#~ msgid "<b>support contract id</b>"
260+#~ msgstr "<b>onderhoudscontract id</b>"
261+#
262+#
263+#
264+# File: bin/openerp.glade, line: 4113
265+# File: bin/openerp.glade, line: 4113
266+#~ msgid "Send Support Request"
267+#~ msgstr "Verzend de ondersteuningsaanvraag"
268+#
269+#
270+#
271+# File: bin/openerp.glade, line: 4244
272+# File: bin/openerp.glade, line: 4244
273+#~ msgid "<b>Your Email:</b>"
274+#~ msgstr "<b>Je e-mail:</b>"
275+#
276+#
277+#
278+#
279+#~ msgid "You can use this feature in the web client"
280+#~ msgstr "Deze functie kan gebruikt worden in de web-cliënt"
281+#
282+#
283+#
284+#
285+#~ msgid "%d bytes"
286+#~ msgstr "%d bytes"
287+#
288+#
289+#
290+#~ msgid "No resource selected !"
291+#~ msgstr "Niets geselecteerd!"
292+#
293+#
294+#
295+#~ msgid "You have to select one resource!"
296+#~ msgstr "Selecteer eerst een regel!"
297+#
298+#
299+#
300+#
301+#~ msgid "Invalid form !"
302+#~ msgstr "Verkeerd formulier!"
303+#
304+#
305+#
306+#~ msgid "No record selected!"
307+#~ msgstr "Geen item geselecteerd!"
308+#
309+#
310+#
311+#
312+#~ msgid "Are you sure you want to remove this attachment ?"
313+#~ msgstr "Weet je zeker dat je deze bijlage wilt verwijderen?"
314+#
315+#
316+#
317+#
318+#~ msgid "Can not open file !"
319+#~ msgstr "Bestand kan niet worden geopend!"
320+#
321+#
322+#
323+#
324+#~ msgid "Can not write file !"
325+#~ msgstr "Bestand kan niet worden weggeschreven!"
326+#
327+#
328+#
329+#
330+#~ msgid "Do not use special characters !"
331+#~ msgstr "Gebruik geen speciale tekens!"
332+#
333+#
334+#
335+#~ msgid "Can not connect to server, please change it !"
336+#~ msgstr "Kan geen verbinding maken met de server, instellingen onjuist!"
337+#
338+#
339+#
340+#
341+#~ msgid "Default Theme"
342+#~ msgstr "Standaard thema"
343+#
344+#
345+#
346+#
347+#~ msgid "_Theme"
348+#~ msgstr "_Thema"
349+#
350+#
351+#
352+#
353+#~ msgid "Tiny ERP Theme"
354+#~ msgstr "OpenERP Thema"
355+#
356+#
357+#
358+#
359+#~ msgid "View"
360+#~ msgstr "Aanzicht"
361+#
362+#
363+#
364+#
365+#~ msgid "test"
366+#~ msgstr "test"
367+#
368+#
369+#
370+#
371+#~ msgid "Filter:"
372+#~ msgstr "Filter:"
373+#
374+#
375+#
376+#
377+#~ msgid "Tiny ERP - Attachment"
378+#~ msgstr "OpenERP - bijlage"
379+#
380+#
381+#
382+#
383+#~ msgid "Filename:"
384+#~ msgstr "Bestandsnaam:"
385+#
386+#
387+#
388+#
389+#~ msgid "Description:"
390+#~ msgstr "Omschrijving:"
391+#
392+#
393+#
394+#
395+#~ msgid "_Unselect"
396+#~ msgstr "Deselecteer"
397+#
398+#
399+#
400+#
401+#~ msgid "Set to _Default"
402+#~ msgstr "Selecteer als standaar_d"
403+>>>>>>> MERGE-SOURCE
404
405=== modified file 'bin/po/openerp-client.pot'
406--- bin/po/openerp-client.pot 2009-11-25 06:44:05 +0000
407+++ bin/po/openerp-client.pot 2009-12-17 11:55:25 +0000
408@@ -1647,7 +1647,7 @@
409 msgid ""
410 "<b>Complete this form to submit your bug and/or send a support request.</b>\n"
411 "<i>\n"
412-"Your request will be sent to the OpenERP team and we will reply shortly.\n"
413+"Your request will be sent to the support team and we will reply shortly.\n"
414 "Note that we may not reply if you do not have a support contract with Tiny "
415 "or an official partner.</i>"
416 msgstr ""
417@@ -2168,7 +2168,7 @@
418 msgid ""
419 "<b>Maintenance Contract.</b>\n"
420 "<i>\n"
421-"Your request will be send to OpenERP and maintenance team will reply you "
422+"Your request will be send to the maintenance team who will reply you "
423 "shortly.\n"
424 "</i>"
425 msgstr ""
426
427=== modified file 'bin/po/uk.po'
428--- bin/po/uk.po 2009-11-26 04:37:46 +0000
429+++ bin/po/uk.po 2009-12-17 11:55:25 +0000
430@@ -2344,7 +2344,7 @@
431 msgid ""
432 "<b>Complete this form to submit your bug and/or send a support request.</b>\n"
433 "<i>\n"
434-"Your request will be sent to the OpenERP team and we will reply shortly.\n"
435+"Your request will be sent to the support team and we will reply shortly.\n"
436 "Note that we may not reply if you do not have a support contract with Tiny "
437 "or an official partner.</i>"
438 msgstr ""
439@@ -3092,7 +3092,7 @@
440 msgid ""
441 "<b>Maintenance Contract.</b>\n"
442 "<i>\n"
443-"Your request will be send to OpenERP and maintenance team will reply you "
444+"Your request will be send to the maintenance team who will reply you "
445 "shortly.\n"
446 "</i>"
447 msgstr ""
448@@ -3318,6 +3318,7 @@
449
450 #~ msgid "I want to be contacted for a demonstration"
451 #~ msgstr "Я хочу щоб зі мною зконтактували для демонстрації"
452+<<<<<<< TREE
453
454 #~ msgid ""
455 #~ "<i>Please fill in the following form in order to help us to improve OpenERP "
456@@ -3372,3 +3373,419 @@
457 #~ "Ви можете використати посилання внизу для більш детальної інформації. "
458 #~ "Деталі\n"
459 #~ "помилки відображені в наступній закладці."
460+=======
461+#
462+#
463+#
464+#~ msgid "Error details"
465+#~ msgstr "Деталі помилки"
466+#
467+#
468+#
469+#~ msgid "<b>Error 404</b>"
470+#~ msgstr "<b>Помилка 404</b>"
471+#
472+#
473+#
474+#~ msgid "<b>Error code:</b>"
475+#~ msgstr "<b>Код помилки:</b>"
476+#
477+#
478+#
479+#~ msgid ""
480+#~ "This Page does not exist !\n"
481+#~ "Please retry"
482+#~ msgstr ""
483+#~ "Сторінка не існує!\n"
484+#~ "Спробуйте ще раз"
485+#
486+#
487+#
488+#~ msgid "<i>Click on the Support Request tab if you need more help !</i>"
489+#~ msgstr ""
490+#~ "<i>Клацніть на вкладку Запит Підтримки, якщо Вам потрібно більше допомоги!"
491+#~ "</i>"
492+#
493+#
494+#
495+#~ msgid "De_scription"
496+#~ msgstr "Оп_ис"
497+#
498+#
499+#
500+#~ msgid "<b>support contract id</b>"
501+#~ msgstr "<b>id договору про підтримку</b>"
502+#
503+#
504+#
505+#~ msgid "Send Support Request"
506+#~ msgstr "Надіслати запит про підтримку"
507+#
508+#
509+#
510+#~ msgid "<b>Your Email:</b>"
511+#~ msgstr "<b>Ваша ел.пошта:</b>"
512+#
513+#
514+#
515+#~ msgid "You can use this feature in the web client"
516+#~ msgstr "Ви можете користуватися цією функцією у веб-клієнті"
517+#
518+#
519+#
520+#~ msgid "%d bytes"
521+#~ msgstr "%d байтів"
522+#
523+#
524+#
525+#~ msgid "No resource selected !"
526+#~ msgstr "Не вибрано ресурс!"
527+#
528+#
529+#
530+#~ msgid "You have to select one resource!"
531+#~ msgstr "Виберіть ресурс!"
532+#
533+#
534+#
535+#~ msgid "Invalid form !"
536+#~ msgstr "Невірна форма!"
537+#
538+#
539+#
540+#~ msgid "No record selected!"
541+#~ msgstr "Не вибрано запису!"
542+#
543+#
544+#
545+#~ msgid "Are you sure you want to remove this attachment ?"
546+#~ msgstr "Ви впевнені що хочете видалити це долучення?"
547+#
548+#
549+#
550+#~ msgid "Can not open file !"
551+#~ msgstr "Не можу відкрити файл !"
552+#
553+#
554+#
555+#~ msgid "Can not write file !"
556+#~ msgstr "Не можу записати у файл !"
557+#
558+#
559+#
560+#~ msgid ""
561+#~ "Unable to preview image file !\n"
562+#~ "Verify the format."
563+#~ msgstr ""
564+#~ "Не можу відкрити малюнок !\n"
565+#~ "Перевірте формат."
566+#
567+#
568+#
569+#~ msgid "Do not use special characters !"
570+#~ msgstr "Не використовуйте спецсимволи!"
571+#
572+#
573+#
574+#~ msgid "Can not connect to server, please change it !"
575+#~ msgstr "Неможливо під'єднатися до цього сервера, спробуйте інший!"
576+#
577+#
578+#
579+#~ msgid "Default Theme"
580+#~ msgstr "Типова тема"
581+#
582+#
583+#
584+#~ msgid "_Theme"
585+#~ msgstr "_Тема"
586+#
587+#
588+#
589+#~ msgid "Tiny ERP Theme"
590+#~ msgstr "Тема Tiny ERP"
591+#
592+#
593+#
594+#~ msgid "Find a resource"
595+#~ msgstr "Знайти ресурс"
596+#
597+#
598+#
599+#~ msgid "Switch current view: form / list / graph"
600+#~ msgstr "Змінити поточний вигляд: форма / список / граф"
601+#
602+#
603+#
604+#~ msgid "View"
605+#~ msgstr "Переглянути"
606+#
607+#
608+#
609+#~ msgid "_Tiny ERP"
610+#~ msgstr "_Tiny ERP"
611+#
612+#
613+#
614+#~ msgid "Remove selected entry"
615+#~ msgstr "Видалити вибраний запис"
616+#
617+#
618+#
619+#~ msgid "Tiny ERP - Filter"
620+#~ msgstr "Tiny ERP - Фільтр"
621+#
622+#
623+#
624+#~ msgid "test"
625+#~ msgstr "тест"
626+#
627+#
628+#
629+#~ msgid "Filter:"
630+#~ msgstr "Фільтр:"
631+#
632+#
633+#
634+#~ msgid "<b><u>Actions</u></b>"
635+#~ msgstr "<b><u>Дії</u></b>"
636+#
637+#
638+#
639+#~ msgid "-"
640+#~ msgstr "-"
641+#
642+#
643+#
644+#~ msgid "Date de début"
645+#~ msgstr "Дата початку"
646+#
647+#
648+#
649+#~ msgid "Search with this name"
650+#~ msgstr "Шукати за вказаним ім'ям"
651+#
652+#
653+#
654+#~ msgid "Clear the field"
655+#~ msgstr "Очистити поле"
656+#
657+#
658+#
659+#~ msgid ""
660+#~ "\n"
661+#~ "Yes\n"
662+#~ "No"
663+#~ msgstr ""
664+#~ "\n"
665+#~ "Так\n"
666+#~ "Ні"
667+#
668+#
669+#
670+#~ msgid "Tiny ERP - Attachment"
671+#~ msgstr "Tiny ERP - Долучення"
672+#
673+#
674+#
675+#~ msgid "Filename:"
676+#~ msgstr "Ім'я файлу:"
677+#
678+#
679+#
680+#~ msgid "Description:"
681+#~ msgstr "Опис:"
682+#
683+#
684+#
685+#~ msgid "Save text"
686+#~ msgstr "Зберегти текст"
687+#
688+#
689+#
690+#~ msgid "Tiny ERP - Ressource Edit"
691+#~ msgstr "Tiny ERP - Редагування Ресурсу"
692+#
693+#
694+#
695+#~ msgid "Tiny ERP - List"
696+#~ msgstr "Tiny ERP - Список"
697+#
698+#
699+#
700+#~ msgid "Tiny ERP - Date & Time selection"
701+#~ msgstr "Tiny ERP - Вибір дати та часу"
702+#
703+#
704+#
705+#~ msgid "(Get Tiny ERP announces, docs and new releases by email)"
706+#~ msgstr ""
707+#~ "(Отримувати анонси Tiny ERP, документацію та нові релізи електронною "
708+#~ "поштою)"
709+#
710+#
711+#
712+#~ msgid "Company:"
713+#~ msgstr "Компанія:"
714+#
715+#
716+#
717+#~ msgid "Tiny ERP"
718+#~ msgstr "Tiny ERP"
719+#
720+#
721+#
722+#~ msgid "Super admin password:"
723+#~ msgstr "Пароль суперадміністратора:"
724+#
725+#
726+#
727+#~ msgid "(use 'admin', if you did not changed it)"
728+#~ msgstr "(використовуйте 'admin', якщо Ви його не змінювали)"
729+#
730+#
731+#
732+#~ msgid "Hello World"
733+#~ msgstr "Привіт Світ"
734+#
735+#
736+#
737+#~ msgid "(must not contain any special character)"
738+#~ msgstr "(не повинно містити жодного спецсимволу)"
739+#
740+#
741+#
742+#~ msgid "Client Mode"
743+#~ msgstr "Клієнтський режим"
744+#
745+#
746+#
747+#~ msgid "Normal"
748+#~ msgstr "Нормальний"
749+#
750+#
751+#
752+#~ msgid "Mode PDA"
753+#~ msgstr "Режим PDA"
754+#
755+#
756+#
757+#~ msgid "Reload / Undo Form"
758+#~ msgstr "Поновити/Скасувати форму"
759+#
760+#
761+#
762+#~ msgid "Titre"
763+#~ msgstr "Titre"
764+#
765+#
766+#
767+#~ msgid "S_earch:"
768+#~ msgstr "По_шук:"
769+#
770+#
771+#
772+#~ msgid "on _field:"
773+#~ msgstr "за по_лем:"
774+#
775+#
776+#
777+#~ msgid "_Unselect"
778+#~ msgstr "_Скасувати вибір"
779+#
780+#
781+#
782+#~ msgid "AL_L"
783+#~ msgstr "ВС_І"
784+#
785+#
786+#
787+#~ msgid "N_ONE"
788+#~ msgstr "_ЖОДНОГО"
789+#
790+#
791+#
792+#~ msgid "Set to _Default"
793+#~ msgstr "Встан_овити типове"
794+#
795+#
796+#
797+#~ msgid "Value _Preference"
798+#~ msgstr "Настройки _значення"
799+#
800+#
801+#
802+#~ msgid "Tiny ERP - Search Widgets"
803+#~ msgstr "Tiny ERP - Вікно пошуку"
804+#
805+#
806+#
807+#~ msgid "Tiny ERP - Error"
808+#~ msgstr "Tiny ERP - Помилка"
809+#
810+#
811+#
812+#~ msgid ""
813+#~ "<b>Complete this form to submit your bug and/or request a support.</b>\n"
814+#~ "<i>\n"
815+#~ "Your request will be send to the support team and we will reply you shortly.\n"
816+#~ "</i>"
817+#~ msgstr ""
818+#~ "<b>Заповніть цю форму, щоб повідомити про помилку та/або для запиту про "
819+#~ "підтримку.</b>\n"
820+#~ "<i>\n"
821+#~ "Ваш запит буде відіслано до Tiny ERP і ми Вам незабаром відповімо.\n"
822+#~ "Зверніть увагу на те, що ми можемо не відповісти Вам, якщо Ваша сервісна "
823+#~ "компанія не є парнером Tiny ERP.\n"
824+#~ "</i>"
825+#
826+#
827+#
828+#~ msgid "Preferences"
829+#~ msgstr "Налаштування"
830+#
831+#
832+#
833+#~ msgid "Owner"
834+#~ msgstr "Власник"
835+#
836+#
837+#
838+#~ msgid "Group Owner"
839+#~ msgstr "Група-власник"
840+#
841+#
842+#
843+#~ msgid "Access Level"
844+#~ msgstr "Рівень доступу"
845+#
846+#
847+#
848+#~ msgid "Resources not removed !"
849+#~ msgstr "Ресурси не видалено!"
850+#
851+#
852+#
853+#~ msgid "No preference available for this resource !"
854+#~ msgstr "Немає налаштувань для цього ресурсу !"
855+#
856+#
857+#
858+#~ msgid "No action defined!"
859+#~ msgstr "Не визначено жодних дій!"
860+#
861+#
862+#
863+#~ msgid "<b>Edit resource preferences</b>"
864+#~ msgstr "<b>Редагувати параметри ресурсів</b>"
865+#
866+#
867+#
868+#~ msgid "You need to save resource before adding translations"
869+#~ msgstr "Потрібно зберегти ресурс перед додаванням перекладу"
870+#
871+#
872+#
873+#~ msgid "Write Report to File"
874+#~ msgstr "Писати звіт у файл"
875+>>>>>>> MERGE-SOURCE
876
877=== modified file 'bin/share/locale/nl/LC_MESSAGES/openerp-client.mo'
878Binary files bin/share/locale/nl/LC_MESSAGES/openerp-client.mo 2009-08-07 08:07:53 +0000 and bin/share/locale/nl/LC_MESSAGES/openerp-client.mo 2009-12-17 11:55:25 +0000 differ
879=== modified file 'bin/share/locale/uk/LC_MESSAGES/openerp-client.mo'
880Binary files bin/share/locale/uk/LC_MESSAGES/openerp-client.mo 2009-08-07 08:07:53 +0000 and bin/share/locale/uk/LC_MESSAGES/openerp-client.mo 2009-12-17 11:55:25 +0000 differ
881=== modified file 'bin/win_error.glade'
882--- bin/win_error.glade 2008-12-31 13:34:48 +0000
883+++ bin/win_error.glade 2009-12-17 11:55:24 +0000
884@@ -149,7 +149,7 @@
885 <property name="ypad">10</property>
886 <property name="label" translatable="yes">&lt;b&gt;Maintenance Contract.&lt;/b&gt;
887 &lt;i&gt;
888-Your request will be send to OpenERP and maintenance team will reply you shortly.
889+Your request will be send to the maintenance team who will reply you shortly.
890 &lt;/i&gt;</property>
891 <property name="use_markup">True</property>
892 </widget>