Merge lp:~unifield-team/unifield-web/web_aio_28 into lp:unifield-web
- web_aio_28
- Merge into trunk
Proposed by
jftempo
Status: | Rejected |
---|---|
Rejected by: | jftempo |
Proposed branch: | lp:~unifield-team/unifield-web/web_aio_28 |
Merge into: | lp:unifield-web |
Diff against target: |
32839 lines (+19283/-3729) (has conflicts) 381 files modified
MANIFEST.in (+1/-1) addons/openerp/controllers/actions.py (+21/-5) addons/openerp/controllers/attachment.py (+2/-1) addons/openerp/controllers/database.py (+12/-3) addons/openerp/controllers/form.py (+56/-6) addons/openerp/controllers/impex.py (+13/-17) addons/openerp/controllers/listgrid.py (+42/-9) addons/openerp/controllers/openo2m.py (+14/-3) addons/openerp/controllers/root.py (+18/-1) addons/openerp/controllers/search.py (+55/-3) addons/openerp/controllers/templates/base.mako (+1/-1) addons/openerp/controllers/templates/database_restore.mako (+86/-0) addons/openerp/controllers/templates/error_page.mako (+10/-1) addons/openerp/controllers/templates/form.mako (+1/-0) addons/openerp/controllers/templates/translator.mako (+14/-6) addons/openerp/controllers/translator.py (+6/-4) addons/openerp/controllers/tree.py (+11/-0) addons/openerp/po/javascript/ar.po (+6/-1) addons/openerp/po/javascript/bg.po (+5/-0) addons/openerp/po/javascript/ca.po (+8/-3) addons/openerp/po/javascript/cs.po (+106/-0) addons/openerp/po/javascript/da.po (+5/-0) addons/openerp/po/javascript/de.po (+5/-0) addons/openerp/po/javascript/en_AU.po (+5/-0) addons/openerp/po/javascript/en_CA.po (+5/-0) addons/openerp/po/javascript/en_GB.po (+5/-0) addons/openerp/po/javascript/es.po (+5/-0) addons/openerp/po/javascript/es_CL.po (+7/-2) addons/openerp/po/javascript/eu.po (+6/-1) addons/openerp/po/javascript/fa.po (+101/-0) addons/openerp/po/javascript/fi.po (+5/-0) addons/openerp/po/javascript/fr.po (+14/-10) addons/openerp/po/javascript/gl.po (+5/-0) addons/openerp/po/javascript/he.po (+5/-0) addons/openerp/po/javascript/hr.po (+12/-7) addons/openerp/po/javascript/hu.po (+7/-1) addons/openerp/po/javascript/id.po (+7/-2) addons/openerp/po/javascript/it.po (+5/-0) addons/openerp/po/javascript/lt.po (+6/-1) addons/openerp/po/javascript/lv.po (+6/-1) addons/openerp/po/javascript/mk.po (+5/-0) addons/openerp/po/javascript/mn.po (+7/-2) addons/openerp/po/javascript/nb.po (+7/-2) addons/openerp/po/javascript/nl.po (+6/-1) addons/openerp/po/javascript/pl.po (+9/-4) addons/openerp/po/javascript/pt.po (+9/-4) addons/openerp/po/javascript/pt_BR.po (+5/-0) addons/openerp/po/javascript/ro.po (+30/-16) addons/openerp/po/javascript/ru.po (+5/-0) addons/openerp/po/javascript/sk.po (+5/-0) addons/openerp/po/javascript/sl.po (+104/-0) addons/openerp/po/javascript/sr.po (+6/-1) addons/openerp/po/javascript/sr@latin.po (+7/-2) addons/openerp/po/javascript/sv.po (+18/-11) addons/openerp/po/javascript/th.po (+5/-0) addons/openerp/po/javascript/tr.po (+18/-13) addons/openerp/po/javascript/uk.po (+5/-0) addons/openerp/po/javascript/zh_CN.po (+5/-0) addons/openerp/po/javascript/zh_TW.po (+101/-0) addons/openerp/po/messages/ar.po (+8/-79) addons/openerp/po/messages/bg.po (+9/-11) addons/openerp/po/messages/bn.po (+1540/-0) addons/openerp/po/messages/ca.po (+11/-89) addons/openerp/po/messages/cs.po (+1594/-0) addons/openerp/po/messages/da.po (+7/-2) addons/openerp/po/messages/de.po (+5/-89) addons/openerp/po/messages/en_AU.po (+9/-0) addons/openerp/po/messages/en_CA.po (+5/-84) addons/openerp/po/messages/en_GB.po (+8/-3) addons/openerp/po/messages/es.po (+5/-83) addons/openerp/po/messages/es_CL.po (+6/-7) addons/openerp/po/messages/et.po (+5/-3) addons/openerp/po/messages/eu.po (+5/-0) addons/openerp/po/messages/fa.po (+1537/-0) addons/openerp/po/messages/fi.po (+62/-24) addons/openerp/po/messages/fr.po (+8/-90) addons/openerp/po/messages/gl.po (+6/-87) addons/openerp/po/messages/he.po (+5/-0) addons/openerp/po/messages/hr.po (+25/-25) addons/openerp/po/messages/hu.po (+5/-86) addons/openerp/po/messages/id.po (+6/-1) addons/openerp/po/messages/is.po (+1537/-0) addons/openerp/po/messages/it.po (+5/-6) addons/openerp/po/messages/ln.po (+1537/-0) addons/openerp/po/messages/lt.po (+5/-6) addons/openerp/po/messages/lv.po (+5/-6) addons/openerp/po/messages/mk.po (+200/-170) addons/openerp/po/messages/mn.po (+59/-56) addons/openerp/po/messages/nb.po (+6/-440) addons/openerp/po/messages/nl.po (+6/-88) addons/openerp/po/messages/pl.po (+53/-38) addons/openerp/po/messages/pt.po (+50/-40) addons/openerp/po/messages/pt_BR.po (+8/-88) addons/openerp/po/messages/ro.po (+135/-111) addons/openerp/po/messages/ru.po (+5/-84) addons/openerp/po/messages/sk.po (+5/-74) addons/openerp/po/messages/sl.po (+1593/-0) addons/openerp/po/messages/sr.po (+5/-6) addons/openerp/po/messages/sr@latin.po (+21/-23) addons/openerp/po/messages/sv.po (+112/-81) addons/openerp/po/messages/th.po (+5/-0) addons/openerp/po/messages/tr.po (+5/-87) addons/openerp/po/messages/uk.po (+5/-12) addons/openerp/po/messages/vi.po (+5/-6) addons/openerp/po/messages/zh_CN.po (+5/-74) addons/openerp/po/messages/zh_TW.po (+1547/-0) addons/openerp/static/css/database.css (+4/-0) addons/openerp/static/css/screen.css (+1/-1) addons/openerp/static/css/style-ie.css (+3/-0) addons/openerp/static/css/style.css (+2/-1) addons/openerp/static/javascript/binary.js (+7/-2) addons/openerp/static/javascript/form.js (+99/-10) addons/openerp/static/javascript/form_state.js (+203/-26) addons/openerp/static/javascript/listgrid.js (+97/-22) addons/openerp/static/javascript/m2m.js (+6/-0) addons/openerp/static/javascript/m2o.js (+11/-8) addons/openerp/static/javascript/o2m.js (+60/-12) addons/openerp/static/javascript/openerp/openerp.base.js (+16/-5) addons/openerp/static/javascript/openerp/openerp.ui.textarea.js (+1/-1) addons/openerp/static/javascript/search.js (+29/-2) addons/openerp/utils/rpc.py (+1/-0) addons/openerp/validators.py (+17/-4) addons/openerp/widgets/_interface.py (+10/-1) addons/openerp/widgets/form/_action.py (+2/-2) addons/openerp/widgets/form/_binary.py (+13/-2) addons/openerp/widgets/form/_form.py (+5/-4) addons/openerp/widgets/form/_m2m.py (+14/-1) addons/openerp/widgets/form/_o2m.py (+0/-3) addons/openerp/widgets/form/templates/binary.mako (+2/-2) addons/openerp/widgets/form/templates/boolean.mako (+2/-2) addons/openerp/widgets/form/templates/button.mako (+3/-2) addons/openerp/widgets/form/templates/char.mako (+3/-3) addons/openerp/widgets/form/templates/datetime.mako (+5/-0) addons/openerp/widgets/form/templates/float.mako (+1/-1) addons/openerp/widgets/form/templates/many2one.mako (+1/-1) addons/openerp/widgets/form/templates/one2many.mako (+1/-1) addons/openerp/widgets/form/templates/text.mako (+14/-5) addons/openerp/widgets/form_view.py (+2/-2) addons/openerp/widgets/listgrid.py (+148/-13) addons/openerp/widgets/listgroup.py (+28/-9) addons/openerp/widgets/logs.py (+14/-0) addons/openerp/widgets/search.py (+20/-1) addons/openerp/widgets/templates/listgrid/listgrid.mako (+11/-1) addons/openerp/widgets/templates/listgrid/listgroup.mako (+26/-29) addons/openerp/widgets/templates/listgrid/multiple_group.mako (+99/-2) addons/openerp/widgets/templates/logs.mako (+12/-0) addons/openerp/widgets/templates/search/filter.mako (+2/-0) addons/openerp/widgets/templates/viewform.mako (+0/-15) addons/view_calendar/po/javascript/ar.po (+6/-1) addons/view_calendar/po/javascript/bg.po (+5/-0) addons/view_calendar/po/javascript/ca.po (+5/-0) addons/view_calendar/po/javascript/cs.po (+66/-0) addons/view_calendar/po/javascript/da.po (+5/-0) addons/view_calendar/po/javascript/de.po (+5/-0) addons/view_calendar/po/javascript/en_AU.po (+5/-0) addons/view_calendar/po/javascript/en_CA.po (+5/-0) addons/view_calendar/po/javascript/en_GB.po (+5/-0) addons/view_calendar/po/javascript/es.po (+5/-0) addons/view_calendar/po/javascript/eu.po (+8/-3) addons/view_calendar/po/javascript/fa.po (+5/-0) addons/view_calendar/po/javascript/fi.po (+5/-0) addons/view_calendar/po/javascript/fr.po (+6/-1) addons/view_calendar/po/javascript/gl.po (+6/-1) addons/view_calendar/po/javascript/he.po (+5/-0) addons/view_calendar/po/javascript/hr.po (+9/-4) addons/view_calendar/po/javascript/hu.po (+6/-1) addons/view_calendar/po/javascript/id.po (+6/-1) addons/view_calendar/po/javascript/is.po (+66/-0) addons/view_calendar/po/javascript/it.po (+6/-1) addons/view_calendar/po/javascript/ln.po (+66/-0) addons/view_calendar/po/javascript/lt.po (+6/-1) addons/view_calendar/po/javascript/lv.po (+6/-1) addons/view_calendar/po/javascript/mk.po (+5/-0) addons/view_calendar/po/javascript/mn.po (+66/-0) addons/view_calendar/po/javascript/nb.po (+6/-1) addons/view_calendar/po/javascript/nl.po (+6/-1) addons/view_calendar/po/javascript/pl.po (+5/-0) addons/view_calendar/po/javascript/pt.po (+6/-1) addons/view_calendar/po/javascript/pt_BR.po (+6/-1) addons/view_calendar/po/javascript/ro.po (+66/-0) addons/view_calendar/po/javascript/ru.po (+5/-0) addons/view_calendar/po/javascript/sk.po (+5/-0) addons/view_calendar/po/javascript/sl.po (+66/-0) addons/view_calendar/po/javascript/sr.po (+6/-1) addons/view_calendar/po/javascript/sr@latin.po (+5/-0) addons/view_calendar/po/javascript/sv.po (+9/-4) addons/view_calendar/po/javascript/th.po (+66/-0) addons/view_calendar/po/javascript/tr.po (+11/-6) addons/view_calendar/po/javascript/uk.po (+5/-0) addons/view_calendar/po/javascript/zh_CN.po (+6/-1) addons/view_calendar/po/messages/ar.po (+6/-1) addons/view_calendar/po/messages/bg.po (+5/-0) addons/view_calendar/po/messages/ca.po (+5/-0) addons/view_calendar/po/messages/cs.po (+215/-0) addons/view_calendar/po/messages/da.po (+5/-0) addons/view_calendar/po/messages/de.po (+5/-6) addons/view_calendar/po/messages/en_AU.po (+5/-0) addons/view_calendar/po/messages/en_CA.po (+5/-0) addons/view_calendar/po/messages/en_GB.po (+5/-0) addons/view_calendar/po/messages/es.po (+5/-0) addons/view_calendar/po/messages/eu.po (+6/-1) addons/view_calendar/po/messages/fa.po (+215/-0) addons/view_calendar/po/messages/fi.po (+5/-0) addons/view_calendar/po/messages/fr.po (+6/-1) addons/view_calendar/po/messages/gl.po (+6/-1) addons/view_calendar/po/messages/he.po (+5/-0) addons/view_calendar/po/messages/hr.po (+10/-5) addons/view_calendar/po/messages/hu.po (+6/-1) addons/view_calendar/po/messages/id.po (+6/-1) addons/view_calendar/po/messages/it.po (+6/-7) addons/view_calendar/po/messages/ln.po (+215/-0) addons/view_calendar/po/messages/lt.po (+6/-1) addons/view_calendar/po/messages/lv.po (+6/-1) addons/view_calendar/po/messages/nb.po (+5/-0) addons/view_calendar/po/messages/nl.po (+6/-7) addons/view_calendar/po/messages/pl.po (+6/-7) addons/view_calendar/po/messages/pt.po (+6/-1) addons/view_calendar/po/messages/pt_BR.po (+6/-7) addons/view_calendar/po/messages/ru.po (+5/-0) addons/view_calendar/po/messages/sk.po (+5/-0) addons/view_calendar/po/messages/sl.po (+215/-0) addons/view_calendar/po/messages/sr.po (+6/-7) addons/view_calendar/po/messages/sr@latin.po (+6/-1) addons/view_calendar/po/messages/sv.po (+27/-28) addons/view_calendar/po/messages/th.po (+215/-0) addons/view_calendar/po/messages/tr.po (+5/-0) addons/view_calendar/po/messages/zh_CN.po (+6/-1) addons/view_calendar/static/css/calendar.css (+1/-1) addons/view_calendar/static/javascript/calendar_month.js (+3/-3) addons/view_calendar/widgets/_base.py (+12/-9) addons/view_calendar/widgets/templates/day.mako (+3/-2) addons/view_calendar/widgets/templates/month.mako (+2/-2) addons/view_calendar/widgets/templates/week.mako (+3/-2) addons/view_diagram/po/javascript/ar.po (+6/-1) addons/view_diagram/po/javascript/bg.po (+5/-0) addons/view_diagram/po/javascript/ca.po (+5/-0) addons/view_diagram/po/javascript/cs.po (+46/-0) addons/view_diagram/po/javascript/da.po (+5/-0) addons/view_diagram/po/javascript/de.po (+6/-1) addons/view_diagram/po/javascript/en_AU.po (+5/-0) addons/view_diagram/po/javascript/en_CA.po (+5/-0) addons/view_diagram/po/javascript/en_GB.po (+5/-0) addons/view_diagram/po/javascript/es.po (+5/-0) addons/view_diagram/po/javascript/eu.po (+6/-1) addons/view_diagram/po/javascript/fa.po (+46/-0) addons/view_diagram/po/javascript/fi.po (+5/-0) addons/view_diagram/po/javascript/fr.po (+5/-0) addons/view_diagram/po/javascript/gl.po (+6/-1) addons/view_diagram/po/javascript/he.po (+5/-0) addons/view_diagram/po/javascript/hr.po (+5/-0) addons/view_diagram/po/javascript/hu.po (+7/-1) addons/view_diagram/po/javascript/id.po (+6/-1) addons/view_diagram/po/javascript/is.po (+46/-0) addons/view_diagram/po/javascript/it.po (+6/-1) addons/view_diagram/po/javascript/ln.po (+46/-0) addons/view_diagram/po/javascript/lt.po (+6/-1) addons/view_diagram/po/javascript/lv.po (+6/-1) addons/view_diagram/po/javascript/mk.po (+5/-0) addons/view_diagram/po/javascript/nb.po (+6/-1) addons/view_diagram/po/javascript/nl.po (+6/-1) addons/view_diagram/po/javascript/pl.po (+5/-0) addons/view_diagram/po/javascript/pt.po (+6/-1) addons/view_diagram/po/javascript/pt_BR.po (+5/-0) addons/view_diagram/po/javascript/ro.po (+46/-0) addons/view_diagram/po/javascript/ru.po (+5/-0) addons/view_diagram/po/javascript/sk.po (+5/-0) addons/view_diagram/po/javascript/sl.po (+46/-0) addons/view_diagram/po/javascript/sq.po (+46/-0) addons/view_diagram/po/javascript/sr.po (+6/-1) addons/view_diagram/po/javascript/sr@latin.po (+6/-1) addons/view_diagram/po/javascript/sv.po (+9/-4) addons/view_diagram/po/javascript/th.po (+5/-0) addons/view_diagram/po/javascript/tr.po (+5/-0) addons/view_diagram/po/javascript/uk.po (+5/-0) addons/view_diagram/po/javascript/zh_CN.po (+5/-0) addons/view_diagram/po/messages/ar.po (+6/-1) addons/view_diagram/po/messages/bg.po (+5/-0) addons/view_diagram/po/messages/ca.po (+5/-0) addons/view_diagram/po/messages/cs.po (+128/-0) addons/view_diagram/po/messages/da.po (+7/-2) addons/view_diagram/po/messages/de.po (+5/-33) addons/view_diagram/po/messages/en_AU.po (+5/-0) addons/view_diagram/po/messages/en_CA.po (+5/-0) addons/view_diagram/po/messages/en_GB.po (+5/-0) addons/view_diagram/po/messages/es.po (+5/-12) addons/view_diagram/po/messages/eu.po (+6/-1) addons/view_diagram/po/messages/fa.po (+128/-0) addons/view_diagram/po/messages/fi.po (+5/-0) addons/view_diagram/po/messages/fr.po (+6/-13) addons/view_diagram/po/messages/gl.po (+6/-1) addons/view_diagram/po/messages/hr.po (+22/-17) addons/view_diagram/po/messages/hu.po (+7/-13) addons/view_diagram/po/messages/id.po (+6/-1) addons/view_diagram/po/messages/it.po (+6/-19) addons/view_diagram/po/messages/ln.po (+128/-0) addons/view_diagram/po/messages/lt.po (+6/-1) addons/view_diagram/po/messages/lv.po (+6/-1) addons/view_diagram/po/messages/nb.po (+5/-0) addons/view_diagram/po/messages/nl.po (+6/-22) addons/view_diagram/po/messages/pl.po (+8/-15) addons/view_diagram/po/messages/pt.po (+6/-13) addons/view_diagram/po/messages/pt_BR.po (+6/-34) addons/view_diagram/po/messages/ro.po (+128/-0) addons/view_diagram/po/messages/ru.po (+5/-0) addons/view_diagram/po/messages/sk.po (+5/-12) addons/view_diagram/po/messages/sl.po (+128/-0) addons/view_diagram/po/messages/sq.po (+128/-0) addons/view_diagram/po/messages/sr.po (+6/-22) addons/view_diagram/po/messages/sr@latin.po (+6/-1) addons/view_diagram/po/messages/sv.po (+12/-28) addons/view_diagram/po/messages/th.po (+5/-0) addons/view_diagram/po/messages/tr.po (+5/-0) addons/view_diagram/po/messages/uk.po (+5/-9) addons/view_diagram/po/messages/zh_CN.po (+5/-12) addons/view_graph/po/javascript/ar.po (+20/-0) addons/view_graph/po/javascript/de.po (+5/-0) addons/view_graph/po/javascript/fa.po (+20/-0) addons/view_graph/po/javascript/fr.po (+5/-0) addons/view_graph/po/javascript/gl.po (+5/-0) addons/view_graph/po/javascript/it.po (+5/-0) addons/view_graph/po/javascript/nl.po (+5/-0) addons/view_graph/po/javascript/pt_BR.po (+5/-0) addons/view_graph/po/javascript/sr.po (+5/-0) addons/view_graph/po/javascript/sr@latin.po (+5/-0) addons/view_graph/po/javascript/sv.po (+5/-0) addons/view_graph/po/javascript/tr.po (+5/-0) addons/view_graph/po/javascript/uk.po (+5/-0) addons/view_graph/po/messages/ar.po (+6/-1) addons/view_graph/po/messages/bg.po (+5/-0) addons/view_graph/po/messages/ca.po (+5/-0) addons/view_graph/po/messages/cs.po (+26/-0) addons/view_graph/po/messages/da.po (+5/-0) addons/view_graph/po/messages/de.po (+5/-0) addons/view_graph/po/messages/en_AU.po (+5/-0) addons/view_graph/po/messages/en_CA.po (+5/-0) addons/view_graph/po/messages/en_GB.po (+5/-0) addons/view_graph/po/messages/es.po (+5/-0) addons/view_graph/po/messages/eu.po (+6/-1) addons/view_graph/po/messages/fa.po (+26/-0) addons/view_graph/po/messages/fi.po (+5/-0) addons/view_graph/po/messages/fr.po (+8/-3) addons/view_graph/po/messages/gl.po (+6/-1) addons/view_graph/po/messages/he.po (+5/-0) addons/view_graph/po/messages/hr.po (+5/-0) addons/view_graph/po/messages/hu.po (+6/-1) addons/view_graph/po/messages/id.po (+6/-1) addons/view_graph/po/messages/is.po (+26/-0) addons/view_graph/po/messages/it.po (+6/-1) addons/view_graph/po/messages/lt.po (+6/-1) addons/view_graph/po/messages/lv.po (+6/-1) addons/view_graph/po/messages/mk.po (+5/-0) addons/view_graph/po/messages/mn.po (+26/-0) addons/view_graph/po/messages/nb.po (+5/-0) addons/view_graph/po/messages/nl.po (+6/-1) addons/view_graph/po/messages/pl.po (+5/-0) addons/view_graph/po/messages/pt.po (+6/-1) addons/view_graph/po/messages/pt_BR.po (+6/-1) addons/view_graph/po/messages/ro.po (+26/-0) addons/view_graph/po/messages/ru.po (+5/-0) addons/view_graph/po/messages/sk.po (+5/-0) addons/view_graph/po/messages/sl.po (+26/-0) addons/view_graph/po/messages/sq.po (+26/-0) addons/view_graph/po/messages/sr.po (+6/-1) addons/view_graph/po/messages/sr@latin.po (+6/-1) addons/view_graph/po/messages/sv.po (+8/-3) addons/view_graph/po/messages/th.po (+5/-0) addons/view_graph/po/messages/tr.po (+6/-1) addons/view_graph/po/messages/uk.po (+5/-0) addons/view_graph/po/messages/zh_CN.po (+5/-0) addons/widget_ckeditor/po/javascript/ar.po (+20/-0) addons/widget_ckeditor/po/javascript/fa.po (+20/-0) addons/widget_ckeditor/po/javascript/fr.po (+5/-0) addons/widget_ckeditor/po/messages/ar.po (+20/-0) addons/widget_ckeditor/po/messages/fa.po (+20/-0) addons/widget_ckeditor/po/messages/fr.po (+5/-0) doc/ChangeLog (+241/-0) doc/openerp-web.cfg (+2/-0) openobject/i18n/format.py (+87/-7) openobject/release.py (+1/-1) openobject/static/javascript/jQuery/jquery.form.js (+1071/-660) openobject/static/javascript/openobject/openobject.dom.js (+10/-4) Text conflict in addons/openerp/controllers/actions.py Text conflict in addons/openerp/controllers/form.py Text conflict in addons/openerp/controllers/impex.py Text conflict in addons/openerp/controllers/search.py Text conflict in addons/openerp/controllers/tree.py Text conflict in addons/openerp/po/javascript/ar.po Text conflict in addons/openerp/po/javascript/bg.po Text conflict in addons/openerp/po/javascript/ca.po Text conflict in addons/openerp/po/javascript/da.po Text conflict in addons/openerp/po/javascript/de.po Text conflict in addons/openerp/po/javascript/en_AU.po Text conflict in addons/openerp/po/javascript/en_CA.po Text conflict in addons/openerp/po/javascript/en_GB.po Text conflict in addons/openerp/po/javascript/es.po Text conflict in addons/openerp/po/javascript/es_CL.po Text conflict in addons/openerp/po/javascript/eu.po Text conflict in addons/openerp/po/javascript/fi.po Text conflict in addons/openerp/po/javascript/fr.po Text conflict in addons/openerp/po/javascript/gl.po Text conflict in addons/openerp/po/javascript/he.po Text conflict in addons/openerp/po/javascript/hr.po Text conflict in addons/openerp/po/javascript/hu.po Text conflict in addons/openerp/po/javascript/id.po Text conflict in addons/openerp/po/javascript/it.po Text conflict in addons/openerp/po/javascript/lt.po Text conflict in addons/openerp/po/javascript/lv.po Text conflict in addons/openerp/po/javascript/mk.po Text conflict in addons/openerp/po/javascript/mn.po Text conflict in addons/openerp/po/javascript/nb.po Text conflict in addons/openerp/po/javascript/nl.po Text conflict in addons/openerp/po/javascript/pl.po Text conflict in addons/openerp/po/javascript/pt.po Text conflict in addons/openerp/po/javascript/pt_BR.po Text conflict in addons/openerp/po/javascript/ro.po Text conflict in addons/openerp/po/javascript/ru.po Text conflict in addons/openerp/po/javascript/sk.po Text conflict in addons/openerp/po/javascript/sr.po Text conflict in addons/openerp/po/javascript/sr@latin.po Text conflict in addons/openerp/po/javascript/sv.po Text conflict in addons/openerp/po/javascript/th.po Text conflict in addons/openerp/po/javascript/tr.po Text conflict in addons/openerp/po/javascript/uk.po Text conflict in addons/openerp/po/javascript/zh_CN.po Text conflict in addons/openerp/po/messages/ar.po Text conflict in addons/openerp/po/messages/bg.po Text conflict in addons/openerp/po/messages/ca.po Text conflict in addons/openerp/po/messages/da.po Text conflict in addons/openerp/po/messages/de.po Text conflict in addons/openerp/po/messages/en_AU.po Text conflict in addons/openerp/po/messages/en_CA.po Text conflict in addons/openerp/po/messages/en_GB.po Text conflict in addons/openerp/po/messages/es.po Text conflict in addons/openerp/po/messages/es_CL.po Text conflict in addons/openerp/po/messages/et.po Text conflict in addons/openerp/po/messages/eu.po Text conflict in addons/openerp/po/messages/fi.po Text conflict in addons/openerp/po/messages/fr.po Text conflict in addons/openerp/po/messages/gl.po Text conflict in addons/openerp/po/messages/he.po Text conflict in addons/openerp/po/messages/hr.po Text conflict in addons/openerp/po/messages/hu.po Text conflict in addons/openerp/po/messages/id.po Text conflict in addons/openerp/po/messages/it.po Text conflict in addons/openerp/po/messages/lt.po Text conflict in addons/openerp/po/messages/lv.po Text conflict in addons/openerp/po/messages/mk.po Text conflict in addons/openerp/po/messages/mn.po Text conflict in addons/openerp/po/messages/nb.po Text conflict in addons/openerp/po/messages/nl.po Text conflict in addons/openerp/po/messages/pl.po Text conflict in addons/openerp/po/messages/pt.po Text conflict in addons/openerp/po/messages/pt_BR.po Text conflict in addons/openerp/po/messages/ro.po Text conflict in addons/openerp/po/messages/ru.po Text conflict in addons/openerp/po/messages/sk.po Text conflict in addons/openerp/po/messages/sr.po Text conflict in addons/openerp/po/messages/sr@latin.po Text conflict in addons/openerp/po/messages/sv.po Text conflict in addons/openerp/po/messages/th.po Text conflict in addons/openerp/po/messages/tr.po Text conflict in addons/openerp/po/messages/uk.po Text conflict in addons/openerp/po/messages/vi.po Text conflict in addons/openerp/po/messages/zh_CN.po Text conflict in addons/openerp/static/javascript/binary.js Text conflict in addons/openerp/static/javascript/form.js Text conflict in addons/openerp/static/javascript/form_state.js Text conflict in addons/openerp/static/javascript/listgrid.js Text conflict in addons/openerp/static/javascript/m2m.js Text conflict in addons/openerp/static/javascript/search.js Text conflict in addons/openerp/widgets/form/_m2m.py Text conflict in addons/openerp/widgets/form/templates/datetime.mako Text conflict in addons/openerp/widgets/listgrid.py Text conflict in addons/openerp/widgets/templates/logs.mako Text conflict in addons/view_calendar/po/javascript/ar.po Text conflict in addons/view_calendar/po/javascript/bg.po Text conflict in addons/view_calendar/po/javascript/ca.po Text conflict in addons/view_calendar/po/javascript/da.po Text conflict in addons/view_calendar/po/javascript/de.po Text conflict in addons/view_calendar/po/javascript/en_AU.po Text conflict in addons/view_calendar/po/javascript/en_CA.po Text conflict in addons/view_calendar/po/javascript/en_GB.po Text conflict in addons/view_calendar/po/javascript/es.po Text conflict in addons/view_calendar/po/javascript/eu.po Text conflict in addons/view_calendar/po/javascript/fa.po Text conflict in addons/view_calendar/po/javascript/fi.po Text conflict in addons/view_calendar/po/javascript/fr.po Text conflict in addons/view_calendar/po/javascript/gl.po Text conflict in addons/view_calendar/po/javascript/he.po Text conflict in addons/view_calendar/po/javascript/hr.po Text conflict in addons/view_calendar/po/javascript/hu.po Text conflict in addons/view_calendar/po/javascript/id.po Text conflict in addons/view_calendar/po/javascript/it.po Text conflict in addons/view_calendar/po/javascript/lt.po Text conflict in addons/view_calendar/po/javascript/lv.po Text conflict in addons/view_calendar/po/javascript/mk.po Text conflict in addons/view_calendar/po/javascript/nb.po Text conflict in addons/view_calendar/po/javascript/nl.po Text conflict in addons/view_calendar/po/javascript/pl.po Text conflict in addons/view_calendar/po/javascript/pt.po Text conflict in addons/view_calendar/po/javascript/pt_BR.po Text conflict in addons/view_calendar/po/javascript/ru.po Text conflict in addons/view_calendar/po/javascript/sk.po Text conflict in addons/view_calendar/po/javascript/sr.po Text conflict in addons/view_calendar/po/javascript/sr@latin.po Text conflict in addons/view_calendar/po/javascript/sv.po Text conflict in addons/view_calendar/po/javascript/tr.po Text conflict in addons/view_calendar/po/javascript/uk.po Text conflict in addons/view_calendar/po/javascript/zh_CN.po Text conflict in addons/view_calendar/po/messages/ar.po Text conflict in addons/view_calendar/po/messages/bg.po Text conflict in addons/view_calendar/po/messages/ca.po Text conflict in addons/view_calendar/po/messages/da.po Text conflict in addons/view_calendar/po/messages/de.po Text conflict in addons/view_calendar/po/messages/en_AU.po Text conflict in addons/view_calendar/po/messages/en_CA.po Text conflict in addons/view_calendar/po/messages/en_GB.po Text conflict in addons/view_calendar/po/messages/es.po Text conflict in addons/view_calendar/po/messages/eu.po Text conflict in addons/view_calendar/po/messages/fi.po Text conflict in addons/view_calendar/po/messages/fr.po Text conflict in addons/view_calendar/po/messages/gl.po Text conflict in addons/view_calendar/po/messages/he.po Text conflict in addons/view_calendar/po/messages/hr.po Text conflict in addons/view_calendar/po/messages/hu.po Text conflict in addons/view_calendar/po/messages/id.po Text conflict in addons/view_calendar/po/messages/it.po Text conflict in addons/view_calendar/po/messages/lt.po Text conflict in addons/view_calendar/po/messages/lv.po Text conflict in addons/view_calendar/po/messages/nb.po Text conflict in addons/view_calendar/po/messages/nl.po Text conflict in addons/view_calendar/po/messages/pl.po Text conflict in addons/view_calendar/po/messages/pt.po Text conflict in addons/view_calendar/po/messages/pt_BR.po Text conflict in addons/view_calendar/po/messages/ru.po Text conflict in addons/view_calendar/po/messages/sk.po Text conflict in addons/view_calendar/po/messages/sr.po Text conflict in addons/view_calendar/po/messages/sr@latin.po Text conflict in addons/view_calendar/po/messages/sv.po Text conflict in addons/view_calendar/po/messages/tr.po Text conflict in addons/view_calendar/po/messages/zh_CN.po Text conflict in addons/view_diagram/po/javascript/ar.po Text conflict in addons/view_diagram/po/javascript/bg.po Text conflict in addons/view_diagram/po/javascript/ca.po Text conflict in addons/view_diagram/po/javascript/da.po Text conflict in addons/view_diagram/po/javascript/de.po Text conflict in addons/view_diagram/po/javascript/en_AU.po Text conflict in addons/view_diagram/po/javascript/en_CA.po Text conflict in addons/view_diagram/po/javascript/en_GB.po Text conflict in addons/view_diagram/po/javascript/es.po Text conflict in addons/view_diagram/po/javascript/eu.po Text conflict in addons/view_diagram/po/javascript/fi.po Text conflict in addons/view_diagram/po/javascript/fr.po Text conflict in addons/view_diagram/po/javascript/gl.po Text conflict in addons/view_diagram/po/javascript/he.po Text conflict in addons/view_diagram/po/javascript/hr.po Text conflict in addons/view_diagram/po/javascript/hu.po Text conflict in addons/view_diagram/po/javascript/id.po Text conflict in addons/view_diagram/po/javascript/it.po Text conflict in addons/view_diagram/po/javascript/lt.po Text conflict in addons/view_diagram/po/javascript/lv.po Text conflict in addons/view_diagram/po/javascript/mk.po Text conflict in addons/view_diagram/po/javascript/nb.po Text conflict in addons/view_diagram/po/javascript/nl.po Text conflict in addons/view_diagram/po/javascript/pl.po Text conflict in addons/view_diagram/po/javascript/pt.po Text conflict in addons/view_diagram/po/javascript/pt_BR.po Text conflict in addons/view_diagram/po/javascript/ru.po Text conflict in addons/view_diagram/po/javascript/sk.po Text conflict in addons/view_diagram/po/javascript/sr.po Text conflict in addons/view_diagram/po/javascript/sr@latin.po Text conflict in addons/view_diagram/po/javascript/sv.po Text conflict in addons/view_diagram/po/javascript/th.po Text conflict in addons/view_diagram/po/javascript/tr.po Text conflict in addons/view_diagram/po/javascript/uk.po Text conflict in addons/view_diagram/po/javascript/zh_CN.po Text conflict in addons/view_diagram/po/messages/ar.po Text conflict in addons/view_diagram/po/messages/bg.po Text conflict in addons/view_diagram/po/messages/ca.po Text conflict in addons/view_diagram/po/messages/da.po Text conflict in addons/view_diagram/po/messages/de.po Text conflict in addons/view_diagram/po/messages/en_AU.po Text conflict in addons/view_diagram/po/messages/en_CA.po Text conflict in addons/view_diagram/po/messages/en_GB.po Text conflict in addons/view_diagram/po/messages/es.po Text conflict in addons/view_diagram/po/messages/eu.po Text conflict in addons/view_diagram/po/messages/fi.po Text conflict in addons/view_diagram/po/messages/fr.po Text conflict in addons/view_diagram/po/messages/gl.po Text conflict in addons/view_diagram/po/messages/hr.po Text conflict in addons/view_diagram/po/messages/hu.po Text conflict in addons/view_diagram/po/messages/id.po Text conflict in addons/view_diagram/po/messages/it.po Text conflict in addons/view_diagram/po/messages/lt.po Text conflict in addons/view_diagram/po/messages/lv.po Text conflict in addons/view_diagram/po/messages/nb.po Text conflict in addons/view_diagram/po/messages/nl.po Text conflict in addons/view_diagram/po/messages/pl.po Text conflict in addons/view_diagram/po/messages/pt.po Text conflict in addons/view_diagram/po/messages/pt_BR.po Text conflict in addons/view_diagram/po/messages/ru.po Text conflict in addons/view_diagram/po/messages/sk.po Text conflict in addons/view_diagram/po/messages/sr.po Text conflict in addons/view_diagram/po/messages/sr@latin.po Text conflict in addons/view_diagram/po/messages/sv.po Text conflict in addons/view_diagram/po/messages/th.po Text conflict in addons/view_diagram/po/messages/tr.po Text conflict in addons/view_diagram/po/messages/uk.po Text conflict in addons/view_diagram/po/messages/zh_CN.po Text conflict in addons/view_graph/po/javascript/de.po Text conflict in addons/view_graph/po/javascript/fr.po Text conflict in addons/view_graph/po/javascript/gl.po Text conflict in addons/view_graph/po/javascript/it.po Text conflict in addons/view_graph/po/javascript/nl.po Text conflict in addons/view_graph/po/javascript/pt_BR.po Text conflict in addons/view_graph/po/javascript/sr.po Text conflict in addons/view_graph/po/javascript/sr@latin.po Text conflict in addons/view_graph/po/javascript/sv.po Text conflict in addons/view_graph/po/javascript/tr.po Text conflict in addons/view_graph/po/javascript/uk.po Text conflict in addons/view_graph/po/messages/ar.po Text conflict in addons/view_graph/po/messages/bg.po Text conflict in addons/view_graph/po/messages/ca.po Text conflict in addons/view_graph/po/messages/da.po Text conflict in addons/view_graph/po/messages/de.po Text conflict in addons/view_graph/po/messages/en_AU.po Text conflict in addons/view_graph/po/messages/en_CA.po Text conflict in addons/view_graph/po/messages/en_GB.po Text conflict in addons/view_graph/po/messages/es.po Text conflict in addons/view_graph/po/messages/eu.po Text conflict in addons/view_graph/po/messages/fi.po Text conflict in addons/view_graph/po/messages/fr.po Text conflict in addons/view_graph/po/messages/gl.po Text conflict in addons/view_graph/po/messages/he.po Text conflict in addons/view_graph/po/messages/hr.po Text conflict in addons/view_graph/po/messages/hu.po Text conflict in addons/view_graph/po/messages/id.po Text conflict in addons/view_graph/po/messages/it.po Text conflict in addons/view_graph/po/messages/lt.po Text conflict in addons/view_graph/po/messages/lv.po Text conflict in addons/view_graph/po/messages/mk.po Text conflict in addons/view_graph/po/messages/nb.po Text conflict in addons/view_graph/po/messages/nl.po Text conflict in addons/view_graph/po/messages/pl.po Text conflict in addons/view_graph/po/messages/pt.po Text conflict in addons/view_graph/po/messages/pt_BR.po Text conflict in addons/view_graph/po/messages/ru.po Text conflict in addons/view_graph/po/messages/sk.po Text conflict in addons/view_graph/po/messages/sr.po Text conflict in addons/view_graph/po/messages/sr@latin.po Text conflict in addons/view_graph/po/messages/sv.po Text conflict in addons/view_graph/po/messages/th.po Text conflict in addons/view_graph/po/messages/tr.po Text conflict in addons/view_graph/po/messages/uk.po Text conflict in addons/view_graph/po/messages/zh_CN.po Text conflict in addons/widget_ckeditor/po/javascript/fr.po Text conflict in addons/widget_ckeditor/po/messages/fr.po Text conflict in openobject/i18n/format.py |
To merge this branch: | bzr merge lp:~unifield-team/unifield-web/web_aio_28 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Dev Team | Pending | ||
Review via email: mp+134406@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Unmerged revisions
- 4892. By Xavier ALT
-
[IMP] AIO-28: add client-side js code to show file's extract db name
- 4891. By Xavier ALT
-
[FIX] AIO-28: automatically determine restore database name from submitted filename
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'MANIFEST.in' | |||
2 | --- MANIFEST.in 2010-11-25 08:48:06 +0000 | |||
3 | +++ MANIFEST.in 2012-11-15 08:05:25 +0000 | |||
4 | @@ -1,7 +1,7 @@ | |||
5 | 1 | include admin.py openerp-web.py run-tests.py py2exe_utils.py setup.nsi | 1 | include admin.py openerp-web.py run-tests.py py2exe_utils.py setup.nsi |
6 | 2 | graft doc | 2 | graft doc |
7 | 3 | prune dist | 3 | prune dist |
9 | 4 | prune lib | 4 | graft lib |
10 | 5 | graft win32 | 5 | graft win32 |
11 | 6 | graft pixmaps | 6 | graft pixmaps |
12 | 7 | 7 | ||
13 | 8 | 8 | ||
14 | === modified file 'addons/openerp/controllers/actions.py' | |||
15 | --- addons/openerp/controllers/actions.py 2012-03-07 16:27:59 +0000 | |||
16 | +++ addons/openerp/controllers/actions.py 2012-11-15 08:05:25 +0000 | |||
17 | @@ -312,7 +312,7 @@ | |||
18 | 312 | def act_url(action, data): | 312 | def act_url(action, data): |
19 | 313 | return execute_url(**dict(data, | 313 | return execute_url(**dict(data, |
20 | 314 | url=action['url'], | 314 | url=action['url'], |
22 | 315 | target=action['target'], | 315 | target=action.get('target','new'), |
23 | 316 | type=action['type'] | 316 | type=action['type'] |
24 | 317 | )) | 317 | )) |
25 | 318 | 318 | ||
26 | @@ -347,8 +347,16 @@ | |||
27 | 347 | # for that passing active_id in headers, to get it in openAction | 347 | # for that passing active_id in headers, to get it in openAction |
28 | 348 | if getattr(cherrypy.request, 'params', []): | 348 | if getattr(cherrypy.request, 'params', []): |
29 | 349 | if getattr(cherrypy.request.params, 'context', {}): | 349 | if getattr(cherrypy.request.params, 'context', {}): |
32 | 350 | cherrypy.response.headers['active_id'] = cherrypy.request.params.get('_terp_id')\ | 350 | <<<<<<< TREE |
33 | 351 | or cherrypy.request.params.context.get('active_id') | 351 | cherrypy.response.headers['active_id'] = cherrypy.request.params.get('_terp_id')\ |
34 | 352 | or cherrypy.request.params.context.get('active_id') | ||
35 | 353 | ======= | ||
36 | 354 | cherrypy.response.headers['active_id'] = cherrypy.request.params.get('_terp_id')\ | ||
37 | 355 | or cherrypy.request.params.context.get('active_id') | ||
38 | 356 | |||
39 | 357 | # when action 'open a new tab', make sure we follow 'nodestroy' flag, if set. | ||
40 | 358 | no_destroy = (action.get('nodestroy') and open_new_tab) and 'true' or 'false' | ||
41 | 359 | >>>>>>> MERGE-SOURCE | ||
42 | 352 | 360 | ||
43 | 353 | # Add 'opened' mark to indicate we're now within the popup and can | 361 | # Add 'opened' mark to indicate we're now within the popup and can |
44 | 354 | # continue on during the second round of execution | 362 | # continue on during the second round of execution |
45 | @@ -370,11 +378,12 @@ | |||
46 | 370 | url = '/?' + urllib.urlencode({'next': url}) | 378 | url = '/?' + urllib.urlencode({'next': url}) |
47 | 371 | 379 | ||
48 | 372 | cherrypy.response.headers['X-Target'] = action['target'] | 380 | cherrypy.response.headers['X-Target'] = action['target'] |
49 | 381 | cherrypy.response.headers['X-No-Destroy'] = no_destroy | ||
50 | 373 | cherrypy.response.headers['Location'] = url | 382 | cherrypy.response.headers['Location'] = url |
51 | 374 | return """<script type="text/javascript"> | 383 | return """<script type="text/javascript"> |
53 | 375 | window.top.openAction('%s', '%s'); | 384 | window.top.openAction('%s', '%s', false, %s); |
54 | 376 | </script> | 385 | </script> |
56 | 377 | """ % (url, action['target']) | 386 | """ % (url, action['target'], no_destroy) |
57 | 378 | 387 | ||
58 | 379 | def execute(action, **data): | 388 | def execute(action, **data): |
59 | 380 | """Execute the action with the provided data. for internal use only. | 389 | """Execute the action with the provided data. for internal use only. |
60 | @@ -406,6 +415,9 @@ | |||
61 | 406 | # determine target for openAction() | 415 | # determine target for openAction() |
62 | 407 | target = {'new': 'popup'}.get(data['target'], 'iframe') | 416 | target = {'new': 'popup'}.get(data['target'], 'iframe') |
63 | 408 | 417 | ||
64 | 418 | cherrypy.response.headers['X-Target'] = target | ||
65 | 419 | cherrypy.response.headers['Location'] = url | ||
66 | 420 | |||
67 | 409 | return """<script type="text/javascript"> | 421 | return """<script type="text/javascript"> |
68 | 410 | openAction('%s', '%s') | 422 | openAction('%s', '%s') |
69 | 411 | </script> | 423 | </script> |
70 | @@ -447,6 +459,10 @@ | |||
71 | 447 | 459 | ||
72 | 448 | ctx = dict(rpc.session.context, **(data.get('context') or {})) | 460 | ctx = dict(rpc.session.context, **(data.get('context') or {})) |
73 | 449 | 461 | ||
74 | 462 | if type == 'ir.actions.report.xml': | ||
75 | 463 | # avoid reading large binary values that we won't even care about | ||
76 | 464 | ctx['bin_size'] = True | ||
77 | 465 | |||
78 | 450 | res = rpc.session.execute('object', 'execute', type, 'read', act_id, False, ctx) | 466 | res = rpc.session.execute('object', 'execute', type, 'read', act_id, False, ctx) |
79 | 451 | return execute(res, **data) | 467 | return execute(res, **data) |
80 | 452 | 468 | ||
81 | 453 | 469 | ||
82 | === modified file 'addons/openerp/controllers/attachment.py' | |||
83 | --- addons/openerp/controllers/attachment.py 2011-01-17 11:57:11 +0000 | |||
84 | +++ addons/openerp/controllers/attachment.py 2012-11-15 08:05:25 +0000 | |||
85 | @@ -59,7 +59,7 @@ | |||
86 | 59 | attachment = rpc.RPCProxy('ir.attachment').read(record, [], rpc.session.context) | 59 | attachment = rpc.RPCProxy('ir.attachment').read(record, [], rpc.session.context) |
87 | 60 | 60 | ||
88 | 61 | if attachment['type'] == 'binary': | 61 | if attachment['type'] == 'binary': |
90 | 62 | cherrypy.response.headers["Content-Disposition"] = 'attachment; filename="%s"' % attachment['name'] | 62 | cherrypy.response.headers["Content-Disposition"] = 'attachment; filename="%s"' % attachment['name'].encode('utf-8') |
91 | 63 | return base64.decodestring(attachment['datas']) | 63 | return base64.decodestring(attachment['datas']) |
92 | 64 | elif attachment['type'] == 'url': | 64 | elif attachment['type'] == 'url': |
93 | 65 | raise redirect(attachment['url']) | 65 | raise redirect(attachment['url']) |
94 | @@ -75,6 +75,7 @@ | |||
95 | 75 | attachment_id = rpc.RPCProxy('ir.attachment').create({ | 75 | attachment_id = rpc.RPCProxy('ir.attachment').create({ |
96 | 76 | 'name': datas.filename, | 76 | 'name': datas.filename, |
97 | 77 | 'datas': base64.encodestring(datas.file.read()), | 77 | 'datas': base64.encodestring(datas.file.read()), |
98 | 78 | 'datas_fname': datas.filename, | ||
99 | 78 | }, ctx) | 79 | }, ctx) |
100 | 79 | return {'id': attachment_id, 'name': datas.filename} | 80 | return {'id': attachment_id, 'name': datas.filename} |
101 | 80 | 81 | ||
102 | 81 | 82 | ||
103 | === modified file 'addons/openerp/controllers/database.py' | |||
104 | --- addons/openerp/controllers/database.py 2012-08-17 09:47:58 +0000 | |||
105 | +++ addons/openerp/controllers/database.py 2012-11-15 08:05:25 +0000 | |||
106 | @@ -100,7 +100,7 @@ | |||
107 | 100 | submit_text = _('Restore') | 100 | submit_text = _('Restore') |
108 | 101 | fields = [openobject.widgets.FileField(name="filename", label=_('File:')), | 101 | fields = [openobject.widgets.FileField(name="filename", label=_('File:')), |
109 | 102 | openobject.widgets.PasswordField(name='password', label=_('Password:'), validator=formencode.validators.NotEmpty()), | 102 | openobject.widgets.PasswordField(name='password', label=_('Password:'), validator=formencode.validators.NotEmpty()), |
111 | 103 | openobject.widgets.TextField(name='dbname', label=_('New database name:'), validator=formencode.validators.NotEmpty())] | 103 | openobject.widgets.TextField(name='dbname', label=_('New database name:'), validator=formencode.validators.NotEmpty(), readonly=1, attrs={'disabled': 'disabled'})] |
112 | 104 | 104 | ||
113 | 105 | class FormPassword(DBForm): | 105 | class FormPassword(DBForm): |
114 | 106 | name = "password" | 106 | name = "password" |
115 | @@ -254,7 +254,7 @@ | |||
116 | 254 | return self.backup() | 254 | return self.backup() |
117 | 255 | raise redirect('/openerp/login') | 255 | raise redirect('/openerp/login') |
118 | 256 | 256 | ||
120 | 257 | @expose(template="/openerp/controllers/templates/database.mako") | 257 | @expose(template="/openerp/controllers/templates/database_restore.mako") |
121 | 258 | def restore(self, tg_errors=None, **kw): | 258 | def restore(self, tg_errors=None, **kw): |
122 | 259 | form = _FORMS['restore'] | 259 | form = _FORMS['restore'] |
123 | 260 | error = self.msg | 260 | error = self.msg |
124 | @@ -264,8 +264,17 @@ | |||
125 | 264 | @expose() | 264 | @expose() |
126 | 265 | @validate(form=_FORMS['restore']) | 265 | @validate(form=_FORMS['restore']) |
127 | 266 | @error_handler(restore) | 266 | @error_handler(restore) |
129 | 267 | def do_restore(self, filename, password, dbname, **kw): | 267 | def do_restore(self, filename, password, dbname=None, **kw): |
130 | 268 | self.msg = {} | 268 | self.msg = {} |
131 | 269 | if getattr(filename, 'filename', ''): | ||
132 | 270 | submitted_filename = filename.filename | ||
133 | 271 | matches = re.search('^(.*)-[0-9]{8}-[0-9]{6}.dump$', submitted_filename) | ||
134 | 272 | if matches: | ||
135 | 273 | dbname = matches.group(1) | ||
136 | 274 | else: | ||
137 | 275 | self.msg = {'message': _('The choosen file in not a valid database file'), | ||
138 | 276 | 'title': _('Error')} | ||
139 | 277 | return self.restore() | ||
140 | 269 | try: | 278 | try: |
141 | 270 | data = base64.encodestring(filename.file.read()) | 279 | data = base64.encodestring(filename.file.read()) |
142 | 271 | rpc.session.execute_db('restore', password, dbname, data) | 280 | rpc.session.execute_db('restore', password, dbname, data) |
143 | 272 | 281 | ||
144 | === modified file 'addons/openerp/controllers/form.py' | |||
145 | --- addons/openerp/controllers/form.py 2012-07-03 14:39:14 +0000 | |||
146 | +++ addons/openerp/controllers/form.py 2012-11-15 08:05:25 +0000 | |||
147 | @@ -415,6 +415,7 @@ | |||
148 | 415 | params.ids = (params.ids or []) + [params.id] | 415 | params.ids = (params.ids or []) + [params.id] |
149 | 416 | params.count += 1 | 416 | params.count += 1 |
150 | 417 | else: | 417 | else: |
151 | 418 | <<<<<<< TREE | ||
152 | 418 | ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info) | 419 | ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info) |
153 | 419 | if params.button and params.button.name: | 420 | if params.button and params.button.name: |
154 | 420 | ctx.update({'button': params.button.name}) | 421 | ctx.update({'button': params.button.name}) |
155 | @@ -428,11 +429,38 @@ | |||
156 | 428 | # original_data[field] = original_value[0] | 429 | # original_data[field] = original_value[0] |
157 | 429 | # if field in data and data[field] != original_data[field]: | 430 | # if field in data and data[field] != original_data[field]: |
158 | 430 | # modified[field] = data[field] | 431 | # modified[field] = data[field] |
159 | 432 | ======= | ||
160 | 433 | ctx = dict((params.context or {}), **rpc.session.context) | ||
161 | 434 | original_data = Model.read(params.id, data.keys(), ctx) | ||
162 | 435 | modified = {} | ||
163 | 436 | |||
164 | 437 | if original_data and isinstance(original_data, dict): | ||
165 | 438 | for field, original_value in original_data.iteritems(): | ||
166 | 439 | if isinstance(original_value, tuple): | ||
167 | 440 | original_data[field] = original_value[0] | ||
168 | 441 | if field in data and data[field] != original_data[field]: | ||
169 | 442 | #When field is many2many at that time following code will be applied | ||
170 | 443 | if isinstance(data[field], list) and isinstance(data[field][0][2], list): | ||
171 | 444 | if sorted(data[field][0][2]) != sorted(original_data[field]): | ||
172 | 445 | modified[field] = data[field] | ||
173 | 446 | else: | ||
174 | 447 | modified[field] = data[field] | ||
175 | 448 | >>>>>>> MERGE-SOURCE | ||
176 | 431 | 449 | ||
177 | 450 | <<<<<<< TREE | ||
178 | 432 | # Model.write([params.id], modified, ctx) | 451 | # Model.write([params.id], modified, ctx) |
179 | 433 | #else: | 452 | #else: |
180 | 434 | # Model.write([params.id], data, ctx) | 453 | # Model.write([params.id], data, ctx) |
181 | 435 | Model.write([params.id], data, ctx) | 454 | Model.write([params.id], data, ctx) |
182 | 455 | ======= | ||
183 | 456 | ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info) | ||
184 | 457 | if modified: | ||
185 | 458 | Model.write([params.id], modified, ctx) | ||
186 | 459 | else: | ||
187 | 460 | ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info) | ||
188 | 461 | if data: | ||
189 | 462 | Model.write([params.id], data, ctx) | ||
190 | 463 | >>>>>>> MERGE-SOURCE | ||
191 | 436 | 464 | ||
192 | 437 | tw.ConcurrencyInfo.update( | 465 | tw.ConcurrencyInfo.update( |
193 | 438 | params.model, Model.read([params.id], ['__last_update'], ctx) | 466 | params.model, Model.read([params.id], ['__last_update'], ctx) |
194 | @@ -672,7 +700,7 @@ | |||
195 | 672 | @expose(content_type='application/octet-stream') | 700 | @expose(content_type='application/octet-stream') |
196 | 673 | def save_binary_data(self, _fname='file.dat', **kw): | 701 | def save_binary_data(self, _fname='file.dat', **kw): |
197 | 674 | params, data = TinyDict.split(kw) | 702 | params, data = TinyDict.split(kw) |
199 | 675 | 703 | ||
200 | 676 | cherrypy.response.headers['Content-Disposition'] = 'attachment; filename="%s"' % _fname | 704 | cherrypy.response.headers['Content-Disposition'] = 'attachment; filename="%s"' % _fname |
201 | 677 | 705 | ||
202 | 678 | if params.datas: | 706 | if params.datas: |
203 | @@ -720,13 +748,14 @@ | |||
204 | 720 | model = kw.get('model') | 748 | model = kw.get('model') |
205 | 721 | field = kw.get('field') | 749 | field = kw.get('field') |
206 | 722 | id = kw.get('id') | 750 | id = kw.get('id') |
207 | 751 | default_value = kw.get('default_value') | ||
208 | 723 | proxy = rpc.RPCProxy(model) | 752 | proxy = rpc.RPCProxy(model) |
209 | 724 | if id == 'None': | 753 | if id == 'None': |
210 | 725 | # FIXME: doesnt honor the context | 754 | # FIXME: doesnt honor the context |
212 | 726 | res = proxy.default_get([field]).get(field,'') | 755 | res = default_value or proxy.default_get([field]).get(field,'') |
213 | 727 | else: | 756 | else: |
214 | 728 | res = proxy.read([int(id)], [field])[0].get(field) | 757 | res = proxy.read([int(id)], [field])[0].get(field) |
216 | 729 | if res: | 758 | if res and res != 'None': |
217 | 730 | return base64.decodestring(res) | 759 | return base64.decodestring(res) |
218 | 731 | else: | 760 | else: |
219 | 732 | return open(openobject.paths.addons('openerp','static','images','placeholder.png'),'rb').read() | 761 | return open(openobject.paths.addons('openerp','static','images','placeholder.png'),'rb').read() |
220 | @@ -984,7 +1013,7 @@ | |||
221 | 984 | @expose() | 1013 | @expose() |
222 | 985 | def action(self, **kw): | 1014 | def action(self, **kw): |
223 | 986 | params, data = TinyDict.split(kw) | 1015 | params, data = TinyDict.split(kw) |
225 | 987 | context_menu = kw.get('context_menu') | 1016 | context_menu = kw.get('context_menu') or False |
226 | 988 | 1017 | ||
227 | 989 | id = params.id or False | 1018 | id = params.id or False |
228 | 990 | ids = params.selection or [] | 1019 | ids = params.selection or [] |
229 | @@ -1009,7 +1038,11 @@ | |||
230 | 1009 | 1038 | ||
231 | 1010 | if type is None: | 1039 | if type is None: |
232 | 1011 | action_type = rpc.RPCProxy('ir.actions.actions').read(act_id, ['type'], context)['type'] | 1040 | action_type = rpc.RPCProxy('ir.actions.actions').read(act_id, ['type'], context)['type'] |
234 | 1012 | action = rpc.session.execute('object', 'execute', action_type, 'read', act_id, False, context) | 1041 | tmp_ctx = dict(context) |
235 | 1042 | if action_type == 'ir.actions.report.xml': | ||
236 | 1043 | # avoid reading large binary values that we won't even care about | ||
237 | 1044 | tmp_ctx['bin_size'] = True | ||
238 | 1045 | action = rpc.session.execute('object', 'execute', action_type, 'read', act_id, False, tmp_ctx) | ||
239 | 1013 | 1046 | ||
240 | 1014 | if domain: | 1047 | if domain: |
241 | 1015 | if isinstance(domain, basestring): | 1048 | if isinstance(domain, basestring): |
242 | @@ -1017,6 +1050,8 @@ | |||
243 | 1017 | domain.extend(expr_eval(action.get('domain', '[]'), context)) | 1050 | domain.extend(expr_eval(action.get('domain', '[]'), context)) |
244 | 1018 | action['domain'] = ustr(domain) | 1051 | action['domain'] = ustr(domain) |
245 | 1019 | 1052 | ||
246 | 1053 | if context.get('search_view'): | ||
247 | 1054 | context.pop('search_view') | ||
248 | 1020 | action['form_context'] = context or {} | 1055 | action['form_context'] = context or {} |
249 | 1021 | import actions | 1056 | import actions |
250 | 1022 | return actions.execute(action, model=params.model, id=id, ids=ids, report_type='pdf', context_menu=context_menu) | 1057 | return actions.execute(action, model=params.model, id=id, ids=ids, report_type='pdf', context_menu=context_menu) |
251 | @@ -1038,6 +1073,10 @@ | |||
252 | 1038 | model = data.pop('_terp_model') | 1073 | model = data.pop('_terp_model') |
253 | 1039 | context = data.pop('_terp_context') | 1074 | context = data.pop('_terp_context') |
254 | 1040 | 1075 | ||
255 | 1076 | change_default = False | ||
256 | 1077 | if '_terp_change_default' in data: | ||
257 | 1078 | change_default = data.pop('_terp_change_default') | ||
258 | 1079 | |||
259 | 1041 | try: | 1080 | try: |
260 | 1042 | context = eval(context) # convert to python dict | 1081 | context = eval(context) # convert to python dict |
261 | 1043 | except: | 1082 | except: |
262 | @@ -1148,6 +1187,17 @@ | |||
263 | 1148 | if 'domain' in result: | 1187 | if 'domain' in result: |
264 | 1149 | for k in result['domain']: | 1188 | for k in result['domain']: |
265 | 1150 | result['domain'][k] = ustr(result['domain'][k]) | 1189 | result['domain'][k] = ustr(result['domain'][k]) |
266 | 1190 | <<<<<<< TREE | ||
267 | 1191 | ======= | ||
268 | 1192 | |||
269 | 1193 | if change_default: | ||
270 | 1194 | value = data.get('_terp_value') | ||
271 | 1195 | proxy = rpc.RPCProxy('ir.values') | ||
272 | 1196 | values = proxy.get('default', '%s=%s' % (caller, value), [(model, False)], False, context) | ||
273 | 1197 | for index, fname, value in values: | ||
274 | 1198 | if fname not in result['value']: | ||
275 | 1199 | result['value'][fname] = value | ||
276 | 1200 | >>>>>>> MERGE-SOURCE | ||
277 | 1151 | return result | 1201 | return result |
278 | 1152 | 1202 | ||
279 | 1153 | @expose('json') | 1203 | @expose('json') |
280 | @@ -1221,7 +1271,7 @@ | |||
281 | 1221 | for index, fname, value in values: | 1271 | for index, fname, value in values: |
282 | 1222 | data[fname] = value | 1272 | data[fname] = value |
283 | 1223 | 1273 | ||
285 | 1224 | return dict(values=data) | 1274 | return dict(value=data) |
286 | 1225 | 1275 | ||
287 | 1226 | # Possible to create shortcut for particular object or not. | 1276 | # Possible to create shortcut for particular object or not. |
288 | 1227 | def can_shortcut_create(self): | 1277 | def can_shortcut_create(self): |
289 | 1228 | 1278 | ||
290 | === modified file 'addons/openerp/controllers/impex.py' | |||
291 | --- addons/openerp/controllers/impex.py 2012-10-03 12:32:26 +0000 | |||
292 | +++ addons/openerp/controllers/impex.py 2012-11-15 08:05:25 +0000 | |||
293 | @@ -112,6 +112,13 @@ | |||
294 | 112 | 112 | ||
295 | 113 | params, data = TinyDict.split(kw) | 113 | params, data = TinyDict.split(kw) |
296 | 114 | ctx = dict((params.context or {}), **rpc.session.context) | 114 | ctx = dict((params.context or {}), **rpc.session.context) |
297 | 115 | <<<<<<< TREE | ||
298 | 116 | ======= | ||
299 | 117 | |||
300 | 118 | if ctx.get("group_by_no_leaf", 0): | ||
301 | 119 | raise common.warning(_("You cannot export these record(s) !"), _('Error')) | ||
302 | 120 | |||
303 | 121 | >>>>>>> MERGE-SOURCE | ||
304 | 115 | views = {} | 122 | views = {} |
305 | 116 | if params.view_mode and params.view_ids: | 123 | if params.view_mode and params.view_ids: |
306 | 117 | for i, view in enumerate(params.view_mode): | 124 | for i, view in enumerate(params.view_mode): |
307 | @@ -235,23 +242,12 @@ | |||
308 | 235 | id = prefix + (prefix and '/' or '') + field | 242 | id = prefix + (prefix and '/' or '') + field |
309 | 236 | nm = name + (name and '/' or '') + value['string'] | 243 | nm = name + (name and '/' or '') + value['string'] |
310 | 237 | 244 | ||
328 | 238 | if is_importing and (value.get('type') not in ('reference',)) and (not value.get('readonly') \ | 245 | record.update(id=id, items={'name': nm}, |
329 | 239 | or not dict(value.get('states', {}).get('draft', [('readonly', True)])).get('readonly', True)): | 246 | action='javascript: void(0)', target=None, |
330 | 240 | 247 | icon=None, children=[], | |
331 | 241 | record.update(id=id, items={'name': nm}, | 248 | required=value.get('required', False)) |
332 | 242 | action='javascript: void(0)', target=None, | 249 | |
333 | 243 | icon=None, children=[], | 250 | records.append(record) |
317 | 244 | required=value.get('required', False)) | ||
318 | 245 | |||
319 | 246 | records.append(record) | ||
320 | 247 | |||
321 | 248 | elif not is_importing: | ||
322 | 249 | |||
323 | 250 | record.update(id=id, items={'name': nm}, | ||
324 | 251 | action='javascript: void(0)', target=None, | ||
325 | 252 | icon=None, children=[]) | ||
326 | 253 | records.append(record) | ||
327 | 254 | |||
334 | 255 | 251 | ||
335 | 256 | if len(nm.split('/')) < 3 and value.get('relation', False): | 252 | if len(nm.split('/')) < 3 and value.get('relation', False): |
336 | 257 | 253 | ||
337 | 258 | 254 | ||
338 | === modified file 'addons/openerp/controllers/listgrid.py' | |||
339 | --- addons/openerp/controllers/listgrid.py 2012-03-28 09:17:20 +0000 | |||
340 | +++ addons/openerp/controllers/listgrid.py 2012-11-15 08:05:25 +0000 | |||
341 | @@ -22,7 +22,7 @@ | |||
342 | 22 | import simplejson | 22 | import simplejson |
343 | 23 | 23 | ||
344 | 24 | import cherrypy | 24 | import cherrypy |
346 | 25 | from openerp.controllers import SecuredController | 25 | from openerp.controllers import SecuredController, openo2m |
347 | 26 | from openerp.utils import rpc, TinyDict, TinyForm, TinyFormError, context_with_concurrency_info, cache | 26 | from openerp.utils import rpc, TinyDict, TinyForm, TinyFormError, context_with_concurrency_info, cache |
348 | 27 | from openerp.widgets import listgrid, listgroup | 27 | from openerp.widgets import listgrid, listgroup |
349 | 28 | 28 | ||
350 | @@ -186,14 +186,23 @@ | |||
351 | 186 | domain = grp_domain | 186 | domain = grp_domain |
352 | 187 | group_level = ast.literal_eval(group_level) | 187 | group_level = ast.literal_eval(group_level) |
353 | 188 | groups = ast.literal_eval(groups) | 188 | groups = ast.literal_eval(groups) |
357 | 189 | 189 | # build a new TinyDict to correctly handle _terp_* params | |
358 | 190 | context = {'group_by_no_leaf': int(no_leaf), 'group_by': group_by, '__domain': domain} | 190 | params = TinyDict(**kw) |
359 | 191 | args = {'editable': True, | 191 | editable = params.editable |
360 | 192 | selectable = params.selectable or 2 | ||
361 | 193 | context = params.context or {} | ||
362 | 194 | context.update({'group_by_no_leaf': int(no_leaf), 'group_by': group_by, '__domain': domain}) | ||
363 | 195 | # we force offset to 0, as in group_by mode only 'limit' have an effect | ||
364 | 196 | # (offset pagination in only for base grouping - which is handled by ListGroup) | ||
365 | 197 | offset = 0 | ||
366 | 198 | limit = params.limit or 20 | ||
367 | 199 | args = {'editable': editable, | ||
368 | 192 | 'view_mode': ['tree', 'form', 'calendar', 'graph'], | 200 | 'view_mode': ['tree', 'form', 'calendar', 'graph'], |
369 | 193 | 'nolinks': 1, 'group_by_ctx': group_by, | 201 | 'nolinks': 1, 'group_by_ctx': group_by, |
371 | 194 | 'selectable': 2, | 202 | 'selectable': selectable, |
372 | 195 | 'multiple_group_by': True, | 203 | 'multiple_group_by': True, |
373 | 196 | 'sort_key': kw.get('sort_key'), | 204 | 'sort_key': kw.get('sort_key'), |
374 | 205 | 'offset': offset, 'limit': limit, | ||
375 | 197 | 'sort_order': kw.get('sort_order')} | 206 | 'sort_order': kw.get('sort_order')} |
376 | 198 | 207 | ||
377 | 199 | listgrp = listgroup.MultipleGroup(name, model, view, ids=None, domain= domain, parent_group=parent_group, group_level=group_level, groups=groups, context=context, **args) | 208 | listgrp = listgroup.MultipleGroup(name, model, view, ids=None, domain= domain, parent_group=parent_group, group_level=group_level, groups=groups, context=context, **args) |
378 | @@ -231,6 +240,15 @@ | |||
379 | 231 | def get(self, **kw): | 240 | def get(self, **kw): |
380 | 232 | params, data = TinyDict.split(kw) | 241 | params, data = TinyDict.split(kw) |
381 | 233 | 242 | ||
382 | 243 | if not params.model and params.o2m and params.view_params.model: | ||
383 | 244 | # Ok, no base model, copy infos from _terp_view_params. | ||
384 | 245 | # This is required to be able to correctly build the form view | ||
385 | 246 | # and to get the 'widget' related to the requested listgrid | ||
386 | 247 | view_params_base, x = TinyDict.split(params.view_params) | ||
387 | 248 | view_params_update = dict([(k[6:], v) for k, v in view_params_base.iteritems() | ||
388 | 249 | if k.startswith('_terp_') ]) | ||
389 | 250 | params.update(view_params_update) | ||
390 | 251 | |||
391 | 234 | groupby = params.get('_terp_group_by_ctx') | 252 | groupby = params.get('_terp_group_by_ctx') |
392 | 235 | if groupby and isinstance(groupby, basestring): | 253 | if groupby and isinstance(groupby, basestring): |
393 | 236 | groupby = groupby.split(',') | 254 | groupby = groupby.split(',') |
394 | @@ -283,6 +301,8 @@ | |||
395 | 283 | if params.wiz_id: | 301 | if params.wiz_id: |
396 | 284 | res = wizard.Wizard().execute(params) | 302 | res = wizard.Wizard().execute(params) |
397 | 285 | frm = res['form'] | 303 | frm = res['form'] |
398 | 304 | elif params.o2m and len(params.o2m.split('/')) > 1: | ||
399 | 305 | frm = openo2m.OpenO2M().create_form(params) | ||
400 | 286 | else: | 306 | else: |
401 | 287 | frm = form.Form().create_form(params) | 307 | frm = form.Form().create_form(params) |
402 | 288 | 308 | ||
403 | @@ -373,14 +393,27 @@ | |||
404 | 373 | return dict(error = ustr(e)) | 393 | return dict(error = ustr(e)) |
405 | 374 | 394 | ||
406 | 375 | @expose('json', methods=('POST',)) | 395 | @expose('json', methods=('POST',)) |
409 | 376 | def groupbyDrag(self, model, children, domain): | 396 | def groupbyDrag(self, model, children, domain, level='0'): |
410 | 377 | domain = ast.literal_eval(domain)[0] | 397 | """ update records represented by children domain based on groupby domain |
411 | 398 | |||
412 | 399 | :param model: model to update | ||
413 | 400 | :param children: children records domain or children record id | ||
414 | 401 | :param domain: group_by domain will be convert to values | ||
415 | 402 | """ | ||
416 | 403 | domain = ast.literal_eval(domain) | ||
417 | 378 | children = ast.literal_eval(children) | 404 | children = ast.literal_eval(children) |
418 | 405 | level = ast.literal_eval(level) | ||
419 | 379 | if isinstance(children, list): | 406 | if isinstance(children, list): |
420 | 380 | children = list(children) | 407 | children = list(children) |
421 | 381 | else: | 408 | else: |
424 | 382 | children = [children] | 409 | children = [('id','=',children)] |
425 | 383 | rpc.RPCProxy(model).write(children, {domain[0]: domain[2]}) | 410 | # convert domain to values |
426 | 411 | values = {} | ||
427 | 412 | for i, d in enumerate(domain): | ||
428 | 413 | if len(d) == 3 and i <= level: | ||
429 | 414 | values[d[0]] = d[2] | ||
430 | 415 | children_ids = rpc.RPCProxy(model).search(children) | ||
431 | 416 | rpc.RPCProxy(model).write(children_ids, values) | ||
432 | 384 | return {} | 417 | return {} |
433 | 385 | 418 | ||
434 | 386 | @expose('json', methods=('POST',)) | 419 | @expose('json', methods=('POST',)) |
435 | 387 | 420 | ||
436 | === modified file 'addons/openerp/controllers/openo2m.py' | |||
437 | --- addons/openerp/controllers/openo2m.py 2012-08-16 08:51:47 +0000 | |||
438 | +++ addons/openerp/controllers/openo2m.py 2012-11-15 08:05:25 +0000 | |||
439 | @@ -46,18 +46,29 @@ | |||
440 | 46 | # to get proper view, first generate form using the view_params | 46 | # to get proper view, first generate form using the view_params |
441 | 47 | vp = params.view_params | 47 | vp = params.view_params |
442 | 48 | 48 | ||
443 | 49 | widget_prefix, _sep, widget_name = (params.o2m or '').rpartition('/') | ||
444 | 50 | if widget_prefix: | ||
445 | 51 | prefix_vp = vp.chain_get(widget_prefix) | ||
446 | 52 | if prefix_vp: | ||
447 | 53 | vp = prefix_vp | ||
448 | 54 | |||
449 | 49 | form = tw.form_view.ViewForm(vp, name="view_form", action="/openerp/openo2m/save") | 55 | form = tw.form_view.ViewForm(vp, name="view_form", action="/openerp/openo2m/save") |
450 | 50 | cherrypy.request.terp_validators = {} | 56 | cherrypy.request.terp_validators = {} |
451 | 51 | 57 | ||
454 | 52 | if '/' in params.o2m: | 58 | wid = form.screen.widget.get_widgets_by_name(widget_name)[0] |
453 | 53 | params.o2m = '.'.join(params.o2m.split('/')[-1:]) | ||
455 | 54 | 59 | ||
457 | 55 | wid = form.screen.widget.get_widgets_by_name(params.o2m)[0] | 60 | if widget_prefix and params.o2m: |
458 | 61 | prefix_params = params.chain_get(params.o2m) | ||
459 | 62 | if prefix_params: | ||
460 | 63 | params.update(prefix_params) | ||
461 | 56 | 64 | ||
462 | 57 | # save view_params for later phazes | 65 | # save view_params for later phazes |
463 | 58 | vp = vp.make_plain('_terp_view_params/') | 66 | vp = vp.make_plain('_terp_view_params/') |
464 | 59 | hiddens = map(lambda x: tw.form.Hidden(name=x, default=ustr(vp[x])), vp) | 67 | hiddens = map(lambda x: tw.form.Hidden(name=x, default=ustr(vp[x])), vp) |
465 | 60 | 68 | ||
466 | 69 | if params.m2o: | ||
467 | 70 | hiddens += [tw.form.Hidden(name='_terp_m2o', default=params.m2o)] | ||
468 | 71 | |||
469 | 61 | params.prefix = params.o2m | 72 | params.prefix = params.o2m |
470 | 62 | params.views = wid.view | 73 | params.views = wid.view |
471 | 63 | 74 | ||
472 | 64 | 75 | ||
473 | === modified file 'addons/openerp/controllers/root.py' | |||
474 | --- addons/openerp/controllers/root.py 2011-09-26 09:06:26 +0000 | |||
475 | +++ addons/openerp/controllers/root.py 2012-11-15 08:05:25 +0000 | |||
476 | @@ -19,6 +19,7 @@ | |||
477 | 19 | # | 19 | # |
478 | 20 | ############################################################################### | 20 | ############################################################################### |
479 | 21 | import cherrypy | 21 | import cherrypy |
480 | 22 | import re | ||
481 | 22 | 23 | ||
482 | 23 | import openobject | 24 | import openobject |
483 | 24 | from openerp.controllers import SecuredController, unsecured, actions, login as tiny_login, form, widgets | 25 | from openerp.controllers import SecuredController, unsecured, actions, login as tiny_login, form, widgets |
484 | @@ -29,12 +30,26 @@ | |||
485 | 29 | 30 | ||
486 | 30 | _MAXIMUM_NUMBER_WELCOME_MESSAGES = 3 | 31 | _MAXIMUM_NUMBER_WELCOME_MESSAGES = 3 |
487 | 31 | 32 | ||
488 | 33 | def insert_xmlhttprequest_status_emulation(text, status=None): | ||
489 | 34 | """ insert http reponse status on document body, | ||
490 | 35 | so that XMLHttpRequest using <iframe/> hack when form | ||
491 | 36 | contains binary data, can work correctly """ | ||
492 | 37 | if status is None: | ||
493 | 38 | status = cherrypy.response.status | ||
494 | 39 | body_starttag = re.search('<body.*?>', text) | ||
495 | 40 | if body_starttag: | ||
496 | 41 | # insert status attribute | ||
497 | 42 | insert_pos = body_starttag.end() - 1 | ||
498 | 43 | return text[:insert_pos] + ' status="%d"' % (status) + text[insert_pos:] | ||
499 | 44 | return text | ||
500 | 45 | |||
501 | 32 | def _cp_on_error(): | 46 | def _cp_on_error(): |
502 | 33 | cherrypy.request.pool = openobject.pooler.get_pool() | 47 | cherrypy.request.pool = openobject.pooler.get_pool() |
503 | 34 | 48 | ||
504 | 35 | errorpage = cherrypy.request.pool.get_controller("/openerp/errorpage") | 49 | errorpage = cherrypy.request.pool.get_controller("/openerp/errorpage") |
505 | 36 | message = errorpage.render() | 50 | message = errorpage.render() |
506 | 37 | cherrypy.response.status = 500 | 51 | cherrypy.response.status = 500 |
507 | 52 | message = insert_xmlhttprequest_status_emulation(message, 500) | ||
508 | 38 | cherrypy.response.body = [message] | 53 | cherrypy.response.body = [message] |
509 | 39 | 54 | ||
510 | 40 | cherrypy.config.update({'request.error_response': _cp_on_error}) | 55 | cherrypy.config.update({'request.error_response': _cp_on_error}) |
511 | @@ -127,7 +142,9 @@ | |||
512 | 127 | id = ids[0] | 142 | id = ids[0] |
513 | 128 | ids = menus.search([('parent_id', '=', id)], 0, 0, 0, ctx) | 143 | ids = menus.search([('parent_id', '=', id)], 0, 0, 0, ctx) |
514 | 129 | tools = menus.read(ids, ['name', 'action'], ctx) | 144 | tools = menus.read(ids, ['name', 'action'], ctx) |
516 | 130 | view = cache.fields_view_get('ir.ui.menu', 1, 'tree', {}) | 145 | #searching id for the hierarchycal tree view of ir.ui.menu |
517 | 146 | view_id = rpc.RPCProxy('ir.ui.view').search([('model','=','ir.ui.menu'),('type','=','tree')],0,0,'id')[0] | ||
518 | 147 | view = cache.fields_view_get('ir.ui.menu', view_id, 'tree', {}) | ||
519 | 131 | fields = cache.fields_get(view['model'], False, ctx) | 148 | fields = cache.fields_get(view['model'], False, ctx) |
520 | 132 | 149 | ||
521 | 133 | for tool in tools: | 150 | for tool in tools: |
522 | 134 | 151 | ||
523 | === modified file 'addons/openerp/controllers/search.py' | |||
524 | --- addons/openerp/controllers/search.py 2012-07-03 15:21:33 +0000 | |||
525 | +++ addons/openerp/controllers/search.py 2012-11-15 08:05:25 +0000 | |||
526 | @@ -91,10 +91,16 @@ | |||
527 | 91 | proxy = rpc.RPCProxy(model) | 91 | proxy = rpc.RPCProxy(model) |
528 | 92 | params.search_text = False | 92 | params.search_text = False |
529 | 93 | 93 | ||
530 | 94 | <<<<<<< TREE | ||
531 | 94 | # parent's search_view has no business being in m2o or m2m | 95 | # parent's search_view has no business being in m2o or m2m |
532 | 95 | if '_terp_context' in params and 'search_view' in params['_terp_context']: | 96 | if '_terp_context' in params and 'search_view' in params['_terp_context']: |
533 | 96 | params.get('_terp_context').pop('search_view', None) | 97 | params.get('_terp_context').pop('search_view', None) |
534 | 97 | 98 | ||
535 | 99 | ======= | ||
536 | 100 | # parent's search_view has no business being in m2o or m2m | ||
537 | 101 | if '_terp_context' in params and 'search_view' in params['_terp_context']: | ||
538 | 102 | params.get('_terp_context').pop('search_view', None) | ||
539 | 103 | >>>>>>> MERGE-SOURCE | ||
540 | 98 | if text: | 104 | if text: |
541 | 99 | params.search_text = True | 105 | params.search_text = True |
542 | 100 | ids = proxy.name_search(text, params.domain or [], 'ilike', ctx, False) | 106 | ids = proxy.name_search(text, params.domain or [], 'ilike', ctx, False) |
543 | @@ -186,6 +192,10 @@ | |||
544 | 186 | if val is None: | 192 | if val is None: |
545 | 187 | context[key] = False | 193 | context[key] = False |
546 | 188 | 194 | ||
547 | 195 | for key, val in context.items(): | ||
548 | 196 | if key in ctx: | ||
549 | 197 | context[key] = ctx[key] | ||
550 | 198 | |||
551 | 189 | if isinstance(context, dict): | 199 | if isinstance(context, dict): |
552 | 190 | context = expr_eval(context, ctx) | 200 | context = expr_eval(context, ctx) |
553 | 191 | parent_context.update(context) | 201 | parent_context.update(context) |
554 | @@ -262,7 +272,15 @@ | |||
555 | 262 | 272 | ||
556 | 263 | group_by_ctx = kw.get('group_by_ctx', []) | 273 | group_by_ctx = kw.get('group_by_ctx', []) |
557 | 264 | if isinstance(group_by_ctx, str): | 274 | if isinstance(group_by_ctx, str): |
559 | 265 | group_by_ctx = cleanup_group_by(group_by_ctx).split(',') | 275 | <<<<<<< TREE |
560 | 276 | group_by_ctx = cleanup_group_by(group_by_ctx).split(',') | ||
561 | 277 | ======= | ||
562 | 278 | group_by_ctx = cleanup_group_by(group_by_ctx).split(',') | ||
563 | 279 | |||
564 | 280 | filter_status = all_domains.get('filter_status') | ||
565 | 281 | if isinstance(filter_status, str): | ||
566 | 282 | filter_status = ast.literal_eval(filter_status) | ||
567 | 283 | >>>>>>> MERGE-SOURCE | ||
568 | 266 | 284 | ||
569 | 267 | if domains: | 285 | if domains: |
570 | 268 | domains = eval(domains) | 286 | domains = eval(domains) |
571 | @@ -283,7 +301,9 @@ | |||
572 | 283 | 301 | ||
573 | 284 | if check_domain and isinstance(check_domain, basestring): | 302 | if check_domain and isinstance(check_domain, basestring): |
574 | 285 | domain = expr_eval(check_domain, context) or [] | 303 | domain = expr_eval(check_domain, context) or [] |
576 | 286 | 304 | m2o_filter_domain = all_domains.get('m2o_filter_domain', []) | |
577 | 305 | for dom in m2o_filter_domain: | ||
578 | 306 | domain += expr_eval(dom['domain'], {'self': dom['self']}) or [] | ||
579 | 287 | search_data = {} | 307 | search_data = {} |
580 | 288 | model = kw.get('model') | 308 | model = kw.get('model') |
581 | 289 | proxy = rpc.RPCProxy(model) | 309 | proxy = rpc.RPCProxy(model) |
582 | @@ -376,12 +396,42 @@ | |||
583 | 376 | if selection_domain: | 396 | if selection_domain: |
584 | 377 | domain.extend(selection_domain) | 397 | domain.extend(selection_domain) |
585 | 378 | 398 | ||
586 | 399 | for i,flt in enumerate(ncustom_domain): | ||
587 | 400 | if len(flt) > 1: | ||
588 | 401 | |||
589 | 402 | left_field = flt[0] | ||
590 | 403 | operator = flt[1] | ||
591 | 404 | right_val = flt[2] | ||
592 | 405 | |||
593 | 406 | if res[left_field]['type'] == 'selection' and right_val: | ||
594 | 407 | |||
595 | 408 | if operator in ['ilike','=','in']: | ||
596 | 409 | operator = 'in' | ||
597 | 410 | else: | ||
598 | 411 | operator = 'not in' | ||
599 | 412 | |||
600 | 413 | keys = [] | ||
601 | 414 | if isinstance(right_val, list): | ||
602 | 415 | for sel_val in res[left_field]['selection']: | ||
603 | 416 | for rgt_val in right_val: | ||
604 | 417 | if sel_val[1].lower().find(rgt_val.lower()) != -1 and sel_val[0] not in keys: | ||
605 | 418 | keys.append(sel_val[0]) | ||
606 | 419 | else: | ||
607 | 420 | for sel_val in res[left_field]['selection']: | ||
608 | 421 | if sel_val[1].lower().find(right_val.lower()) != -1: | ||
609 | 422 | keys.append(sel_val[0]) | ||
610 | 423 | |||
611 | 424 | if keys: | ||
612 | 425 | ncustom_domain[i] = (left_field, operator, keys) | ||
613 | 426 | |||
614 | 379 | if not domain: | 427 | if not domain: |
615 | 380 | domain = None | 428 | domain = None |
616 | 381 | if not isinstance(group_by_ctx, list): | 429 | if not isinstance(group_by_ctx, list): |
617 | 382 | group_by_ctx = [group_by_ctx] | 430 | group_by_ctx = [group_by_ctx] |
618 | 383 | if group_by_ctx: | 431 | if group_by_ctx: |
619 | 384 | search_data['group_by_ctx'] = group_by_ctx | 432 | search_data['group_by_ctx'] = group_by_ctx |
620 | 433 | if filter_status: | ||
621 | 434 | search_data['filter_status'] = filter_status | ||
622 | 385 | ncustom_domain = openobject.i18n.format.convert_date_format_in_domain(ncustom_domain, res, context) | 435 | ncustom_domain = openobject.i18n.format.convert_date_format_in_domain(ncustom_domain, res, context) |
623 | 386 | return dict(domain=ustr(domain), context=ustr(ctx), search_data=ustr(search_data), filter_domain=ustr(ncustom_domain)) | 436 | return dict(domain=ustr(domain), context=ustr(ctx), search_data=ustr(search_data), filter_domain=ustr(ncustom_domain)) |
624 | 387 | 437 | ||
625 | @@ -427,7 +477,9 @@ | |||
626 | 427 | name = kw.get('name') | 477 | name = kw.get('name') |
627 | 428 | model = kw.get('model') | 478 | model = kw.get('model') |
628 | 429 | domain = kw.get('domain') | 479 | domain = kw.get('domain') |
630 | 430 | group_by = kw.get('group_by', '[]') | 480 | group_by = kw.get('group_by', []) |
631 | 481 | if isinstance(group_by, str): | ||
632 | 482 | group_by = expr_eval(group_by) | ||
633 | 431 | if group_by: | 483 | if group_by: |
634 | 432 | context = {'group_by': group_by} | 484 | context = {'group_by': group_by} |
635 | 433 | else: | 485 | else: |
636 | 434 | 486 | ||
637 | === modified file 'addons/openerp/controllers/templates/base.mako' | |||
638 | --- addons/openerp/controllers/templates/base.mako 2010-11-08 14:50:06 +0000 | |||
639 | +++ addons/openerp/controllers/templates/base.mako 2012-11-15 08:05:25 +0000 | |||
640 | @@ -34,7 +34,7 @@ | |||
641 | 34 | <link rel="stylesheet" type="text/css" href="/openerp/static/css/listgrid.css"/> | 34 | <link rel="stylesheet" type="text/css" href="/openerp/static/css/listgrid.css"/> |
642 | 35 | <link rel="stylesheet" type="text/css" href="/openerp/static/css/autocomplete.css"/> | 35 | <link rel="stylesheet" type="text/css" href="/openerp/static/css/autocomplete.css"/> |
643 | 36 | 36 | ||
645 | 37 | <!--[if lt IE 9]> | 37 | <!--[if lte IE 9]> |
646 | 38 | <link rel="stylesheet" type="text/css" href="/openerp/static/css/style-ie.css"/> | 38 | <link rel="stylesheet" type="text/css" href="/openerp/static/css/style-ie.css"/> |
647 | 39 | <![endif]--> | 39 | <![endif]--> |
648 | 40 | ${self.header()} | 40 | ${self.header()} |
649 | 41 | 41 | ||
650 | === added file 'addons/openerp/controllers/templates/database_restore.mako' | |||
651 | --- addons/openerp/controllers/templates/database_restore.mako 1970-01-01 00:00:00 +0000 | |||
652 | +++ addons/openerp/controllers/templates/database_restore.mako 2012-11-15 08:05:25 +0000 | |||
653 | @@ -0,0 +1,86 @@ | |||
654 | 1 | <%inherit file="/openerp/controllers/templates/base_dispatch.mako"/> | ||
655 | 2 | <%def name="current_for(name)"><% | ||
656 | 3 | if form.name == name: context.write('current') | ||
657 | 4 | %></%def> | ||
658 | 5 | <%def name="header()"> | ||
659 | 6 | <title>${form.string}</title> | ||
660 | 7 | |||
661 | 8 | <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.waitbox.js"></script> | ||
662 | 9 | |||
663 | 10 | <link rel="stylesheet" type="text/css" href="/openerp/static/css/waitbox.css"/> | ||
664 | 11 | <link rel="stylesheet" type="text/css" href="/openerp/static/css/database.css"/> | ||
665 | 12 | |||
666 | 13 | <script type="text/javascript"> | ||
667 | 14 | function on_create() { | ||
668 | 15 | new openerp.ui.WaitBox().showAfter(2000); | ||
669 | 16 | return true; | ||
670 | 17 | } | ||
671 | 18 | </script> | ||
672 | 19 | % if error: | ||
673 | 20 | <script type="text/javascript"> | ||
674 | 21 | var $error_tbl = jQuery('<table class="errorbox">'); | ||
675 | 22 | $error_tbl.append('<tr><td style="padding: 4px 2px;" width="10%"><img src="/openerp/static/images/warning.png"></td><td class="error_message_content">${error["message"]}</td></tr>'); | ||
676 | 23 | $error_tbl.append('<tr><td style="padding: 0 8px 5px 0; vertical-align:top;" align="right" colspan="2"><a class="button-a" id="error_btn" onclick="$error_tbl.dialog(\'close\');">OK</a></td></tr>'); | ||
677 | 24 | |||
678 | 25 | jQuery(document).ready(function () { | ||
679 | 26 | jQuery(document.body).append($error_tbl); | ||
680 | 27 | $error_tbl.dialog({ | ||
681 | 28 | modal: true, | ||
682 | 29 | resizable: false, | ||
683 | 30 | title: '<div class="error_message_header">${error.get("title", "Warning")}</div>' | ||
684 | 31 | }); | ||
685 | 32 | }) | ||
686 | 33 | </script> | ||
687 | 34 | % endif | ||
688 | 35 | </%def> | ||
689 | 36 | |||
690 | 37 | <%def name="content()"> | ||
691 | 38 | <table width="100%"> | ||
692 | 39 | <tr><%include file="header.mako"/></tr> | ||
693 | 40 | </table> | ||
694 | 41 | <div class="db-form"> | ||
695 | 42 | <div> | ||
696 | 43 | <table width="100%" class="titlebar"> | ||
697 | 44 | <tr> | ||
698 | 45 | <td width="32px" align="center"> | ||
699 | 46 | <img alt="" src="/openerp/static/images/stock/stock_person.png"> | ||
700 | 47 | </td> | ||
701 | 48 | <td class="action">${form.string}</td> | ||
702 | 49 | <td class="links"> | ||
703 | 50 | <a class="button static_boxes" href="${py.url('/')}">${_("Login")}</a> | ||
704 | 51 | <a class="button static_boxes ${current_for('create')}" | ||
705 | 52 | href="${py.url('/openerp/database/create')}">${_("Create")}</a> | ||
706 | 53 | <a class="button static_boxes ${current_for('drop')}" | ||
707 | 54 | href="${py.url('/openerp/database/drop')}">${_("Drop")}</a> | ||
708 | 55 | <a class="button static_boxes ${current_for('backup')}" | ||
709 | 56 | href="${py.url('/openerp/database/backup')}">${_("Backup")}</a> | ||
710 | 57 | <a class="button static_boxes ${current_for('restore')}" | ||
711 | 58 | href="${py.url('/openerp/database/restore')}">${_("Restore")}</a> | ||
712 | 59 | <a class="button static_boxes ${current_for('password')}" | ||
713 | 60 | href="${py.url('/openerp/database/password')}">${_("Password")}</a> | ||
714 | 61 | </td> | ||
715 | 62 | </tr> | ||
716 | 63 | </table> | ||
717 | 64 | </div> | ||
718 | 65 | <hr style="margin: 0 0 !important; background-color: #5A5858;"> | ||
719 | 66 | % if form.name == 'create': | ||
720 | 67 | <div>${form.display(value=dict(password = "admin"))}</div> | ||
721 | 68 | % else: | ||
722 | 69 | <div>${form.display()}</div> | ||
723 | 70 | % endif | ||
724 | 71 | |||
725 | 72 | <script type="text/javascript"> | ||
726 | 73 | jQuery('#filename').change(function() { | ||
727 | 74 | var choosen_filename = jQuery(this).val(); | ||
728 | 75 | var matches = /^(.*)-[0-9]{8}-[0-9]{6}.dump$/.exec(choosen_filename); | ||
729 | 76 | if (!matches) { | ||
730 | 77 | // show jquery alert | ||
731 | 78 | alert('${_('The choosen file in not a valid database file')}'); | ||
732 | 79 | } else { | ||
733 | 80 | jQuery('#dbname').val(matches[1]); | ||
734 | 81 | } | ||
735 | 82 | }); | ||
736 | 83 | </script> | ||
737 | 84 | </div> | ||
738 | 85 | <%include file="footer.mako"/> | ||
739 | 86 | </%def> | ||
740 | 0 | 87 | ||
741 | === modified file 'addons/openerp/controllers/templates/error_page.mako' | |||
742 | --- addons/openerp/controllers/templates/error_page.mako 2011-12-23 10:27:14 +0000 | |||
743 | +++ addons/openerp/controllers/templates/error_page.mako 2012-11-15 08:05:25 +0000 | |||
744 | @@ -2,6 +2,10 @@ | |||
745 | 2 | <%! | 2 | <%! |
746 | 3 | MAINTENANCE_CONTRACTS_URL = 'http://www.openerp.com/support-or-publisher-warranty-contract' | 3 | MAINTENANCE_CONTRACTS_URL = 'http://www.openerp.com/support-or-publisher-warranty-contract' |
747 | 4 | %> | 4 | %> |
748 | 5 | <%! import cherrypy | ||
749 | 6 | def is_xmlhttprequest(): | ||
750 | 7 | return cherrypy.request.headers.get('X-Requested-With') == 'XMLHttpRequest' and True or False | ||
751 | 8 | %> | ||
752 | 5 | <%def name="header()"> | 9 | <%def name="header()"> |
753 | 6 | <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.textarea.js"></script> | 10 | <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.textarea.js"></script> |
754 | 7 | 11 | ||
755 | @@ -83,7 +87,9 @@ | |||
756 | 83 | </%def> | 87 | </%def> |
757 | 84 | 88 | ||
758 | 85 | <%def name="content()"> | 89 | <%def name="content()"> |
760 | 86 | 90 | % if is_xmlhttprequest(): | |
761 | 91 | <body> | ||
762 | 92 | % endif | ||
763 | 87 | <table class="view" border="0" width="100%"> | 93 | <table class="view" border="0" width="100%"> |
764 | 88 | <tr> | 94 | <tr> |
765 | 89 | % if maintenance: | 95 | % if maintenance: |
766 | @@ -225,5 +231,8 @@ | |||
767 | 225 | % endif | 231 | % endif |
768 | 226 | </tr> | 232 | </tr> |
769 | 227 | </table> | 233 | </table> |
770 | 234 | % if is_xmlhttprequest(): | ||
771 | 235 | </body> | ||
772 | 236 | % endif | ||
773 | 228 | 237 | ||
774 | 229 | </%def> | 238 | </%def> |
775 | 230 | 239 | ||
776 | === modified file 'addons/openerp/controllers/templates/form.mako' | |||
777 | --- addons/openerp/controllers/templates/form.mako 2012-06-29 09:38:15 +0000 | |||
778 | +++ addons/openerp/controllers/templates/form.mako 2012-11-15 08:05:25 +0000 | |||
779 | @@ -25,6 +25,7 @@ | |||
780 | 25 | /* | 25 | /* |
781 | 26 | % endif | 26 | % endif |
782 | 27 | */ | 27 | */ |
783 | 28 | jQuery('[autofocus="autofocus"]').focus(); | ||
784 | 28 | }); | 29 | }); |
785 | 29 | </script> | 30 | </script> |
786 | 30 | 31 | ||
787 | 31 | 32 | ||
788 | === modified file 'addons/openerp/controllers/templates/search.mako' | |||
789 | === modified file 'addons/openerp/controllers/templates/translator.mako' | |||
790 | --- addons/openerp/controllers/templates/translator.mako 2010-12-22 16:40:40 +0000 | |||
791 | +++ addons/openerp/controllers/templates/translator.mako 2012-11-15 08:05:25 +0000 | |||
792 | @@ -56,7 +56,7 @@ | |||
793 | 56 | <td class="grid-cell" width="${100 / len(langs)}%">${lang['name']}</td> | 56 | <td class="grid-cell" width="${100 / len(langs)}%">${lang['name']}</td> |
794 | 57 | % endfor | 57 | % endfor |
795 | 58 | </tr> | 58 | </tr> |
797 | 59 | % for n, v, x, s in data: | 59 | % for n, v, x, s, t in data: |
798 | 60 | <tr class="grid-row"> | 60 | <tr class="grid-row"> |
799 | 61 | % if x: | 61 | % if x: |
800 | 62 | <input type="hidden" name="_terp_models/${n}" value="${x}"/> | 62 | <input type="hidden" name="_terp_models/${n}" value="${x}"/> |
801 | @@ -64,11 +64,19 @@ | |||
802 | 64 | % if translate=='fields': | 64 | % if translate=='fields': |
803 | 65 | <td class="grid-cell label" align="right">${s}: </td> | 65 | <td class="grid-cell label" align="right">${s}: </td> |
804 | 66 | % endif | 66 | % endif |
810 | 67 | % for lang in langs: | 67 | % if t == 'text': |
811 | 68 | <td class="grid-cell item"> | 68 | % for lang in langs: |
812 | 69 | <input type="text" name="${lang['code']}/${n}" value="${v[lang['code']]}" style="width: 100%;"/> | 69 | <td class="grid-cell item"> |
813 | 70 | </td> | 70 | <textarea name="${lang['code']}/${n}" style="width: 100%;">${v[lang['code']]}</textarea> |
814 | 71 | % endfor | 71 | </td> |
815 | 72 | % endfor | ||
816 | 73 | % else: | ||
817 | 74 | % for lang in langs: | ||
818 | 75 | <td class="grid-cell item"> | ||
819 | 76 | <input type="text" name="${lang['code']}/${n}" value="${v[lang['code']]}" style="width: 100%;"/> | ||
820 | 77 | </td> | ||
821 | 78 | % endfor | ||
822 | 79 | % endif | ||
823 | 72 | </tr> | 80 | </tr> |
824 | 73 | % endfor | 81 | % endfor |
825 | 74 | </table> | 82 | </table> |
826 | 75 | 83 | ||
827 | === modified file 'addons/openerp/controllers/translator.py' | |||
828 | --- addons/openerp/controllers/translator.py 2011-02-01 18:02:11 +0000 | |||
829 | +++ addons/openerp/controllers/translator.py 2012-11-15 08:05:25 +0000 | |||
830 | @@ -66,6 +66,7 @@ | |||
831 | 66 | for name in names: | 66 | for name in names: |
832 | 67 | attrs = view_fields[name] | 67 | attrs = view_fields[name] |
833 | 68 | if attrs.get('translate'): | 68 | if attrs.get('translate'): |
834 | 69 | type = attrs.get('type') | ||
835 | 69 | value = {} | 70 | value = {} |
836 | 70 | for lang in langs: | 71 | for lang in langs: |
837 | 71 | context = copy.copy(ctx) | 72 | context = copy.copy(ctx) |
838 | @@ -73,11 +74,12 @@ | |||
839 | 73 | 74 | ||
840 | 74 | val = proxy.read([params.id], [name], context) | 75 | val = proxy.read([params.id], [name], context) |
841 | 75 | val = val[0] if isinstance(val,list) and len(val) > 0 else None | 76 | val = val[0] if isinstance(val,list) and len(val) > 0 else None |
843 | 76 | 77 | if val[name] is False: | |
844 | 78 | val[name] = "" | ||
845 | 77 | value[lang['code']] = val[name] if isinstance(val,dict) \ | 79 | value[lang['code']] = val[name] if isinstance(val,dict) \ |
846 | 78 | and name in val else None | 80 | and name in val else None |
847 | 79 | 81 | ||
849 | 80 | data += [(name, value, None, attrs.get('string'))] | 82 | data += [(name, value, None, attrs.get('string'), type)] |
850 | 81 | 83 | ||
851 | 82 | if translate == 'labels': | 84 | if translate == 'labels': |
852 | 83 | for name in names: | 85 | for name in names: |
853 | @@ -91,7 +93,7 @@ | |||
854 | 91 | if name in val[code]: | 93 | if name in val[code]: |
855 | 92 | value[code] = val[code][name] or None | 94 | value[code] = val[code][name] or None |
856 | 93 | 95 | ||
858 | 94 | if value: data += [(name, value, None, None)] | 96 | if value: data += [(name, value, None, None, None)] |
859 | 95 | 97 | ||
860 | 96 | if translate == 'relates' and view_relates: | 98 | if translate == 'relates' and view_relates: |
861 | 97 | for bar, tools in view_relates.items(): | 99 | for bar, tools in view_relates.items(): |
862 | @@ -104,7 +106,7 @@ | |||
863 | 104 | 106 | ||
864 | 105 | value[code] = val[0]['name'] or None | 107 | value[code] = val[0]['name'] or None |
865 | 106 | 108 | ||
867 | 107 | data += [(tool['id'], value, tool['type'], None)] | 109 | data += [(tool['id'], value, tool['type'], None, None)] |
868 | 108 | 110 | ||
869 | 109 | if translate == 'view': | 111 | if translate == 'view': |
870 | 110 | for lang in langs: | 112 | for lang in langs: |
871 | 111 | 113 | ||
872 | === modified file 'addons/openerp/controllers/tree.py' | |||
873 | --- addons/openerp/controllers/tree.py 2012-05-22 12:06:35 +0000 | |||
874 | +++ addons/openerp/controllers/tree.py 2012-11-15 08:05:25 +0000 | |||
875 | @@ -29,8 +29,12 @@ | |||
876 | 29 | 29 | ||
877 | 30 | import actions | 30 | import actions |
878 | 31 | 31 | ||
879 | 32 | <<<<<<< TREE | ||
880 | 32 | from openobject.i18n.format import format_datetime | 33 | from openobject.i18n.format import format_datetime |
881 | 33 | from openobject.i18n.format import format_decimal | 34 | from openobject.i18n.format import format_decimal |
882 | 35 | ======= | ||
883 | 36 | from openobject.i18n.format import format_datetime | ||
884 | 37 | >>>>>>> MERGE-SOURCE | ||
885 | 34 | from openobject.tools import url, expose | 38 | from openobject.tools import url, expose |
886 | 35 | 39 | ||
887 | 36 | from openerp.controllers import SecuredController | 40 | from openerp.controllers import SecuredController |
888 | @@ -45,10 +49,17 @@ | |||
889 | 45 | return format_decimal(value, digit) | 49 | return format_decimal(value, digit) |
890 | 46 | 50 | ||
891 | 47 | FORMATTERS = { | 51 | FORMATTERS = { |
892 | 52 | <<<<<<< TREE | ||
893 | 48 | 'integer': lambda value, _i: '%s' % int(value), | 53 | 'integer': lambda value, _i: '%s' % int(value), |
894 | 49 | 'float': decimal_formatter, | 54 | 'float': decimal_formatter, |
895 | 50 | 'date': lambda value, _i: format_datetime(value, 'date'), | 55 | 'date': lambda value, _i: format_datetime(value, 'date'), |
896 | 51 | 'datetime': lambda value, _i: format_datetime(value, 'datetime'), | 56 | 'datetime': lambda value, _i: format_datetime(value, 'datetime'), |
897 | 57 | ======= | ||
898 | 58 | 'integer': lambda value, _i: '%s' % int(value), | ||
899 | 59 | 'float': lambda value, _i: '%.02f' % (value), | ||
900 | 60 | 'date': lambda value, _i: format_datetime(value, 'date'), | ||
901 | 61 | 'datetime': lambda value, _i: format_datetime(value, 'datetime'), | ||
902 | 62 | >>>>>>> MERGE-SOURCE | ||
903 | 52 | 'one2one': lambda value, _i: value[1], | 63 | 'one2one': lambda value, _i: value[1], |
904 | 53 | 'many2one': lambda value, _i: value[1], | 64 | 'many2one': lambda value, _i: value[1], |
905 | 54 | 'selection': lambda value, info: dict(info['selection']).get(value, ''), | 65 | 'selection': lambda value, info: dict(info['selection']).get(value, ''), |
906 | 55 | 66 | ||
907 | === modified file 'addons/openerp/po/javascript/ar.po' | |||
908 | --- addons/openerp/po/javascript/ar.po 2011-08-04 05:14:27 +0000 | |||
909 | +++ addons/openerp/po/javascript/ar.po 2012-11-15 08:05:25 +0000 | |||
910 | @@ -9,13 +9,18 @@ | |||
911 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
912 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
913 | 11 | "PO-Revision-Date: 2011-03-18 23:56+0000\n" | 11 | "PO-Revision-Date: 2011-03-18 23:56+0000\n" |
915 | 12 | "Last-Translator: kifcaliph <kifcaliph@hotmail.com>\n" | 12 | "Last-Translator: kifcaliph <Unknown>\n" |
916 | 13 | "Language-Team: Arabic <ar@li.org>\n" | 13 | "Language-Team: Arabic <ar@li.org>\n" |
917 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
918 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
919 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
920 | 17 | <<<<<<< TREE | ||
921 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" |
922 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
923 | 20 | ======= | ||
924 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
925 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
926 | 23 | >>>>>>> MERGE-SOURCE | ||
927 | 19 | 24 | ||
928 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
929 | 21 | #, python-format | 26 | #, python-format |
930 | 22 | 27 | ||
931 | === modified file 'addons/openerp/po/javascript/bg.po' | |||
932 | --- addons/openerp/po/javascript/bg.po 2011-08-04 05:14:27 +0000 | |||
933 | +++ addons/openerp/po/javascript/bg.po 2012-11-15 08:05:25 +0000 | |||
934 | @@ -14,8 +14,13 @@ | |||
935 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
936 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
937 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
938 | 17 | <<<<<<< TREE | ||
939 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" |
940 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
941 | 20 | ======= | ||
942 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
943 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
944 | 23 | >>>>>>> MERGE-SOURCE | ||
945 | 19 | 24 | ||
946 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
947 | 21 | #, python-format | 26 | #, python-format |
948 | 22 | 27 | ||
949 | === modified file 'addons/openerp/po/javascript/ca.po' | |||
950 | --- addons/openerp/po/javascript/ca.po 2011-08-04 05:14:27 +0000 | |||
951 | +++ addons/openerp/po/javascript/ca.po 2012-11-15 08:05:25 +0000 | |||
952 | @@ -8,15 +8,20 @@ | |||
953 | 8 | "Project-Id-Version: openobject-client-web\n" | 8 | "Project-Id-Version: openobject-client-web\n" |
954 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
955 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
957 | 11 | "PO-Revision-Date: 2011-02-24 17:35+0000\n" | 11 | "PO-Revision-Date: 2011-08-18 19:01+0000\n" |
958 | 12 | "Last-Translator: Jordi Esteve (www.zikzakmedia.com) " | 12 | "Last-Translator: Jordi Esteve (www.zikzakmedia.com) " |
959 | 13 | "<jesteve@zikzakmedia.com>\n" | 13 | "<jesteve@zikzakmedia.com>\n" |
960 | 14 | "Language-Team: Catalan <ca@li.org>\n" | 14 | "Language-Team: Catalan <ca@li.org>\n" |
961 | 15 | "MIME-Version: 1.0\n" | 15 | "MIME-Version: 1.0\n" |
962 | 16 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
963 | 17 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
964 | 18 | <<<<<<< TREE | ||
965 | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" | 19 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" |
966 | 19 | "X-Generator: Launchpad (build 13573)\n" | 20 | "X-Generator: Launchpad (build 13573)\n" |
967 | 21 | ======= | ||
968 | 22 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
969 | 23 | "X-Generator: Launchpad (build 16179)\n" | ||
970 | 24 | >>>>>>> MERGE-SOURCE | ||
971 | 20 | 25 | ||
972 | 21 | #: static/javascript/form.js:92 | 26 | #: static/javascript/form.js:92 |
973 | 22 | #, python-format | 27 | #, python-format |
974 | @@ -37,7 +42,7 @@ | |||
975 | 37 | 42 | ||
976 | 38 | #: static/javascript/form.js:995 | 43 | #: static/javascript/form.js:995 |
977 | 39 | msgid "You must save this record to perform the action !" | 44 | msgid "You must save this record to perform the action !" |
979 | 40 | msgstr "" | 45 | msgstr "Heu de desar aquest registre per realitzar l'acció!" |
980 | 41 | 46 | ||
981 | 42 | #: static/javascript/form.js:1127 | 47 | #: static/javascript/form.js:1127 |
982 | 43 | msgid "Do you really want to delete the attachment" | 48 | msgid "Do you really want to delete the attachment" |
983 | @@ -79,7 +84,7 @@ | |||
984 | 79 | 84 | ||
985 | 80 | #: static/javascript/search.js:285 | 85 | #: static/javascript/search.js:285 |
986 | 81 | msgid "Invalid Value" | 86 | msgid "Invalid Value" |
988 | 82 | msgstr "" | 87 | msgstr "Valor no vàlid" |
989 | 83 | 88 | ||
990 | 84 | #: static/javascript/viewed.js:63 | 89 | #: static/javascript/viewed.js:63 |
991 | 85 | msgid "Do you really want to remove this node?" | 90 | msgid "Do you really want to remove this node?" |
992 | 86 | 91 | ||
993 | === added file 'addons/openerp/po/javascript/cs.po' | |||
994 | --- addons/openerp/po/javascript/cs.po 1970-01-01 00:00:00 +0000 | |||
995 | +++ addons/openerp/po/javascript/cs.po 2012-11-15 08:05:25 +0000 | |||
996 | @@ -0,0 +1,106 @@ | |||
997 | 1 | # Translations template for PROJECT. | ||
998 | 2 | # Copyright (C) 2011 ORGANIZATION | ||
999 | 3 | # This file is distributed under the same license as the PROJECT project. | ||
1000 | 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, 2011. | ||
1001 | 5 | # | ||
1002 | 6 | msgid "" | ||
1003 | 7 | msgstr "" | ||
1004 | 8 | "Project-Id-Version: openobject-client-web\n" | ||
1005 | 9 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | ||
1006 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | ||
1007 | 11 | "PO-Revision-Date: 2011-08-08 08:08+0000\n" | ||
1008 | 12 | "Last-Translator: Jiří Hajda <robie@centrum.cz>\n" | ||
1009 | 13 | "Language-Team: Czech\n" | ||
1010 | 14 | "MIME-Version: 1.0\n" | ||
1011 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | ||
1012 | 16 | "Content-Transfer-Encoding: 8bit\n" | ||
1013 | 17 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1014 | 18 | "X-Generator: Launchpad (build 16179)\n" | ||
1015 | 19 | "Language: \n" | ||
1016 | 20 | "X-Poedit-Language: Czech\n" | ||
1017 | 21 | "Generated-By: Babel 0.9.5\n" | ||
1018 | 22 | |||
1019 | 23 | #: static/javascript/form.js:92 | ||
1020 | 24 | #, python-format | ||
1021 | 25 | msgid "You selected to open %(tabs)s tabs - do you want to continue?" | ||
1022 | 26 | msgstr "Vybrali jste k otevření %(tabs)s záložky - opravdu chcete otevřít?" | ||
1023 | 27 | |||
1024 | 28 | #: static/javascript/form.js:169 | ||
1025 | 29 | msgid "Invalid form, correct red fields." | ||
1026 | 30 | msgstr "Neplatný formulář, opravte červená pole." | ||
1027 | 31 | |||
1028 | 32 | #: static/javascript/form.js:204 | ||
1029 | 33 | msgid "Do you really want to delete this record?" | ||
1030 | 34 | msgstr "Opravdu chcete smazat tento záznam?" | ||
1031 | 35 | |||
1032 | 36 | #: static/javascript/form.js:960 | ||
1033 | 37 | msgid "You must select one or several records !" | ||
1034 | 38 | msgstr "Musíte vybrat jeden nebo více záznamů !" | ||
1035 | 39 | |||
1036 | 40 | #: static/javascript/form.js:995 | ||
1037 | 41 | msgid "You must save this record to perform the action !" | ||
1038 | 42 | msgstr "Musíte tento záznam uložit pro vykonání akce !" | ||
1039 | 43 | |||
1040 | 44 | #: static/javascript/form.js:1127 | ||
1041 | 45 | msgid "Do you really want to delete the attachment" | ||
1042 | 46 | msgstr "Opravdu chcete smazat přílohu?" | ||
1043 | 47 | |||
1044 | 48 | #: static/javascript/form.js:1161 | ||
1045 | 49 | msgid "No record selected ! You can only attach to existing record." | ||
1046 | 50 | msgstr "Nevybrán žádný záznam ! Můžete přiložit pouze existující záznam." | ||
1047 | 51 | |||
1048 | 52 | #: static/javascript/form.js:1220 | ||
1049 | 53 | msgid "OpenERP - Error" | ||
1050 | 54 | msgstr "OpenERP - Chyba" | ||
1051 | 55 | |||
1052 | 56 | #: static/javascript/form.js:1291 | ||
1053 | 57 | msgid "" | ||
1054 | 58 | "Warning, the record has been modified,\n" | ||
1055 | 59 | "your changes will be discarded." | ||
1056 | 60 | msgstr "" | ||
1057 | 61 | "Varování, záznam byl upraven,\n" | ||
1058 | 62 | "vaše změny budou zahozeny." | ||
1059 | 63 | |||
1060 | 64 | #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123 | ||
1061 | 65 | msgid "To edit Record, please first save it." | ||
1062 | 66 | msgstr "Pro úpravu Záznamu jej prosíme nejdříve uložte." | ||
1063 | 67 | |||
1064 | 68 | #: static/javascript/listgrid.js:650 | ||
1065 | 69 | msgid "Do you really want to delete selected record(s) ?" | ||
1066 | 70 | msgstr "Opravdu chcete smazat vybrané záznam(y) ?" | ||
1067 | 71 | |||
1068 | 72 | #: static/javascript/m2o.js:526 | ||
1069 | 73 | msgid "error in display::" | ||
1070 | 74 | msgstr "chyba ve zobrazení::" | ||
1071 | 75 | |||
1072 | 76 | #: static/javascript/o2m.js:67 | ||
1073 | 77 | msgid "Do you really want to delete record ?" | ||
1074 | 78 | msgstr "Opravdu chcete smazat záznam ?" | ||
1075 | 79 | |||
1076 | 80 | #: static/javascript/search.js:285 | ||
1077 | 81 | msgid "Invalid Value" | ||
1078 | 82 | msgstr "Neplatná hodnota" | ||
1079 | 83 | |||
1080 | 84 | #: static/javascript/viewed.js:63 | ||
1081 | 85 | msgid "Do you really want to remove this node?" | ||
1082 | 86 | msgstr "Opravdu chcete odstranit tento uzel?" | ||
1083 | 87 | |||
1084 | 88 | #: static/javascript/viewed.js:329 | ||
1085 | 89 | msgid "Do you really wants to create an inherited view here?" | ||
1086 | 90 | msgstr "Opravdu zde chcete vytvořit zděděný pohled?" | ||
1087 | 91 | |||
1088 | 92 | #: static/javascript/openerp/openerp.base.js:127 | ||
1089 | 93 | msgid "doLoadingSuccess: Cannot parse JSON" | ||
1090 | 94 | msgstr "doLoadingSuccess: Nelze parsovat JSON" | ||
1091 | 95 | |||
1092 | 96 | #: static/javascript/openerp/openerp.base.js:335 | ||
1093 | 97 | msgid "Loading" | ||
1094 | 98 | msgstr "Načítání" | ||
1095 | 99 | |||
1096 | 100 | #: static/javascript/openerp/openerp.ui.tips.js:51 | ||
1097 | 101 | msgid "Object" | ||
1098 | 102 | msgstr "Objekt" | ||
1099 | 103 | |||
1100 | 104 | #: static/javascript/openerp/openerp.ui.tips.js:52 | ||
1101 | 105 | msgid "Field" | ||
1102 | 106 | msgstr "Pole" | ||
1103 | 0 | 107 | ||
1104 | === modified file 'addons/openerp/po/javascript/da.po' | |||
1105 | --- addons/openerp/po/javascript/da.po 2011-08-04 05:14:27 +0000 | |||
1106 | +++ addons/openerp/po/javascript/da.po 2012-11-15 08:05:25 +0000 | |||
1107 | @@ -14,8 +14,13 @@ | |||
1108 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1109 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1110 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1111 | 17 | <<<<<<< TREE | ||
1112 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" |
1113 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1114 | 20 | ======= | ||
1115 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1116 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1117 | 23 | >>>>>>> MERGE-SOURCE | ||
1118 | 19 | 24 | ||
1119 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1120 | 21 | #, python-format | 26 | #, python-format |
1121 | 22 | 27 | ||
1122 | === modified file 'addons/openerp/po/javascript/de.po' | |||
1123 | --- addons/openerp/po/javascript/de.po 2011-08-04 05:14:27 +0000 | |||
1124 | +++ addons/openerp/po/javascript/de.po 2012-11-15 08:05:25 +0000 | |||
1125 | @@ -14,8 +14,13 @@ | |||
1126 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1127 | 15 | "Content-Type: text/plain; charset=utf-8\n" | 15 | "Content-Type: text/plain; charset=utf-8\n" |
1128 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1129 | 17 | <<<<<<< TREE | ||
1130 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1131 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1132 | 20 | ======= | ||
1133 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1134 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1135 | 23 | >>>>>>> MERGE-SOURCE | ||
1136 | 19 | "Generated-By: Babel None\n" | 24 | "Generated-By: Babel None\n" |
1137 | 20 | 25 | ||
1138 | 21 | #: static/javascript/form.js:92 | 26 | #: static/javascript/form.js:92 |
1139 | 22 | 27 | ||
1140 | === modified file 'addons/openerp/po/javascript/en_AU.po' | |||
1141 | --- addons/openerp/po/javascript/en_AU.po 2011-08-04 05:14:27 +0000 | |||
1142 | +++ addons/openerp/po/javascript/en_AU.po 2012-11-15 08:05:25 +0000 | |||
1143 | @@ -14,8 +14,13 @@ | |||
1144 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1145 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1146 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1147 | 17 | <<<<<<< TREE | ||
1148 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1149 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1150 | 20 | ======= | ||
1151 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1152 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1153 | 23 | >>>>>>> MERGE-SOURCE | ||
1154 | 19 | 24 | ||
1155 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1156 | 21 | #, python-format | 26 | #, python-format |
1157 | 22 | 27 | ||
1158 | === modified file 'addons/openerp/po/javascript/en_CA.po' | |||
1159 | --- addons/openerp/po/javascript/en_CA.po 2011-08-04 05:14:27 +0000 | |||
1160 | +++ addons/openerp/po/javascript/en_CA.po 2012-11-15 08:05:25 +0000 | |||
1161 | @@ -14,8 +14,13 @@ | |||
1162 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1163 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1164 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1165 | 17 | <<<<<<< TREE | ||
1166 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1167 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1168 | 20 | ======= | ||
1169 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1170 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1171 | 23 | >>>>>>> MERGE-SOURCE | ||
1172 | 19 | 24 | ||
1173 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1174 | 21 | #, python-format | 26 | #, python-format |
1175 | 22 | 27 | ||
1176 | === modified file 'addons/openerp/po/javascript/en_GB.po' | |||
1177 | --- addons/openerp/po/javascript/en_GB.po 2011-08-04 05:14:27 +0000 | |||
1178 | +++ addons/openerp/po/javascript/en_GB.po 2012-11-15 08:05:25 +0000 | |||
1179 | @@ -14,8 +14,13 @@ | |||
1180 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1181 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1182 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1183 | 17 | <<<<<<< TREE | ||
1184 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1185 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1186 | 20 | ======= | ||
1187 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1188 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1189 | 23 | >>>>>>> MERGE-SOURCE | ||
1190 | 19 | 24 | ||
1191 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1192 | 21 | #, python-format | 26 | #, python-format |
1193 | 22 | 27 | ||
1194 | === modified file 'addons/openerp/po/javascript/es.po' | |||
1195 | --- addons/openerp/po/javascript/es.po 2011-08-04 05:14:27 +0000 | |||
1196 | +++ addons/openerp/po/javascript/es.po 2012-11-15 08:05:25 +0000 | |||
1197 | @@ -14,8 +14,13 @@ | |||
1198 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1199 | 15 | "Content-Type: text/plain; charset=utf-8\n" | 15 | "Content-Type: text/plain; charset=utf-8\n" |
1200 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1201 | 17 | <<<<<<< TREE | ||
1202 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1203 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1204 | 20 | ======= | ||
1205 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1206 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1207 | 23 | >>>>>>> MERGE-SOURCE | ||
1208 | 19 | "Generated-By: Babel None\n" | 24 | "Generated-By: Babel None\n" |
1209 | 20 | 25 | ||
1210 | 21 | #: static/javascript/form.js:92 | 26 | #: static/javascript/form.js:92 |
1211 | 22 | 27 | ||
1212 | === modified file 'addons/openerp/po/javascript/es_CL.po' | |||
1213 | --- addons/openerp/po/javascript/es_CL.po 2011-08-04 05:14:27 +0000 | |||
1214 | +++ addons/openerp/po/javascript/es_CL.po 2012-11-15 08:05:25 +0000 | |||
1215 | @@ -14,8 +14,13 @@ | |||
1216 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1217 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1218 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1219 | 17 | <<<<<<< TREE | ||
1220 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1221 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1222 | 20 | ======= | ||
1223 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1224 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1225 | 23 | >>>>>>> MERGE-SOURCE | ||
1226 | 19 | 24 | ||
1227 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1228 | 21 | #, python-format | 26 | #, python-format |
1229 | @@ -36,7 +41,7 @@ | |||
1230 | 36 | 41 | ||
1231 | 37 | #: static/javascript/form.js:995 | 42 | #: static/javascript/form.js:995 |
1232 | 38 | msgid "You must save this record to perform the action !" | 43 | msgid "You must save this record to perform the action !" |
1234 | 39 | msgstr "" | 44 | msgstr "Debe guardar este registro para ejecutar la acción" |
1235 | 40 | 45 | ||
1236 | 41 | #: static/javascript/form.js:1127 | 46 | #: static/javascript/form.js:1127 |
1237 | 42 | msgid "Do you really want to delete the attachment" | 47 | msgid "Do you really want to delete the attachment" |
1238 | @@ -74,7 +79,7 @@ | |||
1239 | 74 | 79 | ||
1240 | 75 | #: static/javascript/search.js:285 | 80 | #: static/javascript/search.js:285 |
1241 | 76 | msgid "Invalid Value" | 81 | msgid "Invalid Value" |
1243 | 77 | msgstr "" | 82 | msgstr "Valor inválido" |
1244 | 78 | 83 | ||
1245 | 79 | #: static/javascript/viewed.js:63 | 84 | #: static/javascript/viewed.js:63 |
1246 | 80 | msgid "Do you really want to remove this node?" | 85 | msgid "Do you really want to remove this node?" |
1247 | 81 | 86 | ||
1248 | === modified file 'addons/openerp/po/javascript/eu.po' | |||
1249 | --- addons/openerp/po/javascript/eu.po 2011-08-04 05:14:27 +0000 | |||
1250 | +++ addons/openerp/po/javascript/eu.po 2012-11-15 08:05:25 +0000 | |||
1251 | @@ -9,13 +9,18 @@ | |||
1252 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1253 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
1254 | 11 | "PO-Revision-Date: 2011-02-15 19:35+0000\n" | 11 | "PO-Revision-Date: 2011-02-15 19:35+0000\n" |
1256 | 12 | "Last-Translator: Antony Lesuisse <al@openerp.com>\n" | 12 | "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n" |
1257 | 13 | "Language-Team: Basque <eu@li.org>\n" | 13 | "Language-Team: Basque <eu@li.org>\n" |
1258 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1259 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1260 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1261 | 17 | <<<<<<< TREE | ||
1262 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" |
1263 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1264 | 20 | ======= | ||
1265 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1266 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1267 | 23 | >>>>>>> MERGE-SOURCE | ||
1268 | 19 | 24 | ||
1269 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1270 | 21 | #, python-format | 26 | #, python-format |
1271 | 22 | 27 | ||
1272 | === added file 'addons/openerp/po/javascript/fa.po' | |||
1273 | --- addons/openerp/po/javascript/fa.po 1970-01-01 00:00:00 +0000 | |||
1274 | +++ addons/openerp/po/javascript/fa.po 2012-11-15 08:05:25 +0000 | |||
1275 | @@ -0,0 +1,101 @@ | |||
1276 | 1 | # Persian translation for openobject-client-web | ||
1277 | 2 | # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 | ||
1278 | 3 | # This file is distributed under the same license as the openobject-client-web package. | ||
1279 | 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, 2011. | ||
1280 | 5 | # | ||
1281 | 6 | msgid "" | ||
1282 | 7 | msgstr "" | ||
1283 | 8 | "Project-Id-Version: openobject-client-web\n" | ||
1284 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
1285 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | ||
1286 | 11 | "PO-Revision-Date: 2011-12-18 16:39+0000\n" | ||
1287 | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
1288 | 13 | "Language-Team: Persian <fa@li.org>\n" | ||
1289 | 14 | "MIME-Version: 1.0\n" | ||
1290 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | ||
1291 | 16 | "Content-Transfer-Encoding: 8bit\n" | ||
1292 | 17 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1293 | 18 | "X-Generator: Launchpad (build 16179)\n" | ||
1294 | 19 | |||
1295 | 20 | #: static/javascript/form.js:92 | ||
1296 | 21 | #, python-format | ||
1297 | 22 | msgid "You selected to open %(tabs)s tabs - do you want to continue?" | ||
1298 | 23 | msgstr "" | ||
1299 | 24 | |||
1300 | 25 | #: static/javascript/form.js:169 | ||
1301 | 26 | msgid "Invalid form, correct red fields." | ||
1302 | 27 | msgstr "" | ||
1303 | 28 | |||
1304 | 29 | #: static/javascript/form.js:204 | ||
1305 | 30 | msgid "Do you really want to delete this record?" | ||
1306 | 31 | msgstr "" | ||
1307 | 32 | |||
1308 | 33 | #: static/javascript/form.js:960 | ||
1309 | 34 | msgid "You must select one or several records !" | ||
1310 | 35 | msgstr "" | ||
1311 | 36 | |||
1312 | 37 | #: static/javascript/form.js:995 | ||
1313 | 38 | msgid "You must save this record to perform the action !" | ||
1314 | 39 | msgstr "" | ||
1315 | 40 | |||
1316 | 41 | #: static/javascript/form.js:1127 | ||
1317 | 42 | msgid "Do you really want to delete the attachment" | ||
1318 | 43 | msgstr "" | ||
1319 | 44 | |||
1320 | 45 | #: static/javascript/form.js:1161 | ||
1321 | 46 | msgid "No record selected ! You can only attach to existing record." | ||
1322 | 47 | msgstr "" | ||
1323 | 48 | |||
1324 | 49 | #: static/javascript/form.js:1220 | ||
1325 | 50 | msgid "OpenERP - Error" | ||
1326 | 51 | msgstr "" | ||
1327 | 52 | |||
1328 | 53 | #: static/javascript/form.js:1291 | ||
1329 | 54 | msgid "" | ||
1330 | 55 | "Warning, the record has been modified,\n" | ||
1331 | 56 | "your changes will be discarded." | ||
1332 | 57 | msgstr "" | ||
1333 | 58 | |||
1334 | 59 | #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123 | ||
1335 | 60 | msgid "To edit Record, please first save it." | ||
1336 | 61 | msgstr "" | ||
1337 | 62 | |||
1338 | 63 | #: static/javascript/listgrid.js:650 | ||
1339 | 64 | msgid "Do you really want to delete selected record(s) ?" | ||
1340 | 65 | msgstr "" | ||
1341 | 66 | |||
1342 | 67 | #: static/javascript/m2o.js:526 | ||
1343 | 68 | msgid "error in display::" | ||
1344 | 69 | msgstr "" | ||
1345 | 70 | |||
1346 | 71 | #: static/javascript/o2m.js:67 | ||
1347 | 72 | msgid "Do you really want to delete record ?" | ||
1348 | 73 | msgstr "" | ||
1349 | 74 | |||
1350 | 75 | #: static/javascript/search.js:285 | ||
1351 | 76 | msgid "Invalid Value" | ||
1352 | 77 | msgstr "" | ||
1353 | 78 | |||
1354 | 79 | #: static/javascript/viewed.js:63 | ||
1355 | 80 | msgid "Do you really want to remove this node?" | ||
1356 | 81 | msgstr "" | ||
1357 | 82 | |||
1358 | 83 | #: static/javascript/viewed.js:329 | ||
1359 | 84 | msgid "Do you really wants to create an inherited view here?" | ||
1360 | 85 | msgstr "" | ||
1361 | 86 | |||
1362 | 87 | #: static/javascript/openerp/openerp.base.js:127 | ||
1363 | 88 | msgid "doLoadingSuccess: Cannot parse JSON" | ||
1364 | 89 | msgstr "" | ||
1365 | 90 | |||
1366 | 91 | #: static/javascript/openerp/openerp.base.js:335 | ||
1367 | 92 | msgid "Loading" | ||
1368 | 93 | msgstr "" | ||
1369 | 94 | |||
1370 | 95 | #: static/javascript/openerp/openerp.ui.tips.js:51 | ||
1371 | 96 | msgid "Object" | ||
1372 | 97 | msgstr "" | ||
1373 | 98 | |||
1374 | 99 | #: static/javascript/openerp/openerp.ui.tips.js:52 | ||
1375 | 100 | msgid "Field" | ||
1376 | 101 | msgstr "" | ||
1377 | 0 | 102 | ||
1378 | === modified file 'addons/openerp/po/javascript/fi.po' | |||
1379 | --- addons/openerp/po/javascript/fi.po 2011-08-04 05:14:27 +0000 | |||
1380 | +++ addons/openerp/po/javascript/fi.po 2012-11-15 08:05:25 +0000 | |||
1381 | @@ -14,8 +14,13 @@ | |||
1382 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1383 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1384 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1385 | 17 | <<<<<<< TREE | ||
1386 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" |
1387 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1388 | 20 | ======= | ||
1389 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1390 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1391 | 23 | >>>>>>> MERGE-SOURCE | ||
1392 | 19 | 24 | ||
1393 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1394 | 21 | #, python-format | 26 | #, python-format |
1395 | 22 | 27 | ||
1396 | === modified file 'addons/openerp/po/javascript/fr.po' | |||
1397 | --- addons/openerp/po/javascript/fr.po 2011-08-04 05:14:27 +0000 | |||
1398 | +++ addons/openerp/po/javascript/fr.po 2012-11-15 08:05:25 +0000 | |||
1399 | @@ -8,26 +8,30 @@ | |||
1400 | 8 | "Project-Id-Version: PROJECT VERSION\n" | 8 | "Project-Id-Version: PROJECT VERSION\n" |
1401 | 9 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 9 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
1402 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
1405 | 11 | "PO-Revision-Date: 2011-05-16 16:57+0000\n" | 11 | "PO-Revision-Date: 2011-09-20 09:43+0000\n" |
1406 | 12 | "Last-Translator: lolivier <olivier.lenoir@free.fr>\n" | 12 | "Last-Translator: Quentin THEURET <Unknown>\n" |
1407 | 13 | "Language-Team: fr <LL@li.org>\n" | 13 | "Language-Team: fr <LL@li.org>\n" |
1408 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1409 | 15 | "Content-Type: text/plain; charset=utf-8\n" | 15 | "Content-Type: text/plain; charset=utf-8\n" |
1410 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1411 | 17 | <<<<<<< TREE | ||
1412 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" |
1413 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1414 | 20 | ======= | ||
1415 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1416 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1417 | 23 | >>>>>>> MERGE-SOURCE | ||
1418 | 19 | "Generated-By: Babel None\n" | 24 | "Generated-By: Babel None\n" |
1419 | 20 | 25 | ||
1420 | 21 | #: static/javascript/form.js:92 | 26 | #: static/javascript/form.js:92 |
1421 | 22 | #, python-format | 27 | #, python-format |
1422 | 23 | msgid "You selected to open %(tabs)s tabs - do you want to continue?" | 28 | msgid "You selected to open %(tabs)s tabs - do you want to continue?" |
1424 | 24 | msgstr "Vous avez choisi d'ouvrir %(tabs)s onglets - voulez-vous continuer?" | 29 | msgstr "Vous avez choisi d'ouvrir %(tabs)s onglets. Voulez-vous continuer ?" |
1425 | 25 | 30 | ||
1426 | 26 | #: static/javascript/form.js:169 | 31 | #: static/javascript/form.js:169 |
1427 | 27 | msgid "Invalid form, correct red fields." | 32 | msgid "Invalid form, correct red fields." |
1428 | 28 | msgstr "" | 33 | msgstr "" |
1431 | 29 | "Le formulaire est incorrectement rempli, veuillez vérifier les champs " | 34 | "Formulaire incomplet, veuillez mettre à jour les champs surlignés en rouge." |
1430 | 30 | "surlignés en rouge" | ||
1432 | 31 | 35 | ||
1433 | 32 | #: static/javascript/form.js:204 | 36 | #: static/javascript/form.js:204 |
1434 | 33 | msgid "Do you really want to delete this record?" | 37 | msgid "Do you really want to delete this record?" |
1435 | @@ -43,7 +47,7 @@ | |||
1436 | 43 | 47 | ||
1437 | 44 | #: static/javascript/form.js:1127 | 48 | #: static/javascript/form.js:1127 |
1438 | 45 | msgid "Do you really want to delete the attachment" | 49 | msgid "Do you really want to delete the attachment" |
1440 | 46 | msgstr "Voulez-vous réellement supprimer ce fichier attaché?" | 50 | msgstr "Voulez-vous réellement supprimer cette pièce jointe ?" |
1441 | 47 | 51 | ||
1442 | 48 | #: static/javascript/form.js:1161 | 52 | #: static/javascript/form.js:1161 |
1443 | 49 | msgid "No record selected ! You can only attach to existing record." | 53 | msgid "No record selected ! You can only attach to existing record." |
1444 | @@ -69,7 +73,7 @@ | |||
1445 | 69 | 73 | ||
1446 | 70 | #: static/javascript/listgrid.js:650 | 74 | #: static/javascript/listgrid.js:650 |
1447 | 71 | msgid "Do you really want to delete selected record(s) ?" | 75 | msgid "Do you really want to delete selected record(s) ?" |
1449 | 72 | msgstr "Voulez-vous réellement supprimer les enregistrements sélectionnés?" | 76 | msgstr "Voulez-vous réellement supprimer les enregistrements sélectionnés ?" |
1450 | 73 | 77 | ||
1451 | 74 | #: static/javascript/m2o.js:526 | 78 | #: static/javascript/m2o.js:526 |
1452 | 75 | msgid "error in display::" | 79 | msgid "error in display::" |
1453 | @@ -77,7 +81,7 @@ | |||
1454 | 77 | 81 | ||
1455 | 78 | #: static/javascript/o2m.js:67 | 82 | #: static/javascript/o2m.js:67 |
1456 | 79 | msgid "Do you really want to delete record ?" | 83 | msgid "Do you really want to delete record ?" |
1458 | 80 | msgstr "Voulez-vous réellement supprimer cet enregistrement?" | 84 | msgstr "Voulez-vous réellement supprimer cet enregistrement ?" |
1459 | 81 | 85 | ||
1460 | 82 | #: static/javascript/search.js:285 | 86 | #: static/javascript/search.js:285 |
1461 | 83 | msgid "Invalid Value" | 87 | msgid "Invalid Value" |
1462 | @@ -85,11 +89,11 @@ | |||
1463 | 85 | 89 | ||
1464 | 86 | #: static/javascript/viewed.js:63 | 90 | #: static/javascript/viewed.js:63 |
1465 | 87 | msgid "Do you really want to remove this node?" | 91 | msgid "Do you really want to remove this node?" |
1467 | 88 | msgstr "Voulez-vous réellement supprimer ce noeud?" | 92 | msgstr "Voulez-vous réellement supprimer ce noeud ?" |
1468 | 89 | 93 | ||
1469 | 90 | #: static/javascript/viewed.js:329 | 94 | #: static/javascript/viewed.js:329 |
1470 | 91 | msgid "Do you really wants to create an inherited view here?" | 95 | msgid "Do you really wants to create an inherited view here?" |
1472 | 92 | msgstr "Voulez-vous réellement créer une vue héritée à cet emplacement?" | 96 | msgstr "Voulez-vous réellement créer une vue héritée à cet emplacement ?" |
1473 | 93 | 97 | ||
1474 | 94 | #: static/javascript/openerp/openerp.base.js:127 | 98 | #: static/javascript/openerp/openerp.base.js:127 |
1475 | 95 | msgid "doLoadingSuccess: Cannot parse JSON" | 99 | msgid "doLoadingSuccess: Cannot parse JSON" |
1476 | 96 | 100 | ||
1477 | === modified file 'addons/openerp/po/javascript/gl.po' | |||
1478 | --- addons/openerp/po/javascript/gl.po 2011-08-04 05:14:27 +0000 | |||
1479 | +++ addons/openerp/po/javascript/gl.po 2012-11-15 08:05:25 +0000 | |||
1480 | @@ -14,8 +14,13 @@ | |||
1481 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1482 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1483 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1484 | 17 | <<<<<<< TREE | ||
1485 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1486 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1487 | 20 | ======= | ||
1488 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1489 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1490 | 23 | >>>>>>> MERGE-SOURCE | ||
1491 | 19 | 24 | ||
1492 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1493 | 21 | #, python-format | 26 | #, python-format |
1494 | 22 | 27 | ||
1495 | === modified file 'addons/openerp/po/javascript/he.po' | |||
1496 | --- addons/openerp/po/javascript/he.po 2011-08-04 05:14:27 +0000 | |||
1497 | +++ addons/openerp/po/javascript/he.po 2012-11-15 08:05:25 +0000 | |||
1498 | @@ -14,8 +14,13 @@ | |||
1499 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1500 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1501 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1502 | 17 | <<<<<<< TREE | ||
1503 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1504 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1505 | 20 | ======= | ||
1506 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1507 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1508 | 23 | >>>>>>> MERGE-SOURCE | ||
1509 | 19 | 24 | ||
1510 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1511 | 21 | #, python-format | 26 | #, python-format |
1512 | 22 | 27 | ||
1513 | === modified file 'addons/openerp/po/javascript/hr.po' | |||
1514 | --- addons/openerp/po/javascript/hr.po 2011-08-04 05:14:27 +0000 | |||
1515 | +++ addons/openerp/po/javascript/hr.po 2012-11-15 08:05:25 +0000 | |||
1516 | @@ -8,19 +8,24 @@ | |||
1517 | 8 | "Project-Id-Version: openobject-client-web\n" | 8 | "Project-Id-Version: openobject-client-web\n" |
1518 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1519 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
1522 | 11 | "PO-Revision-Date: 2011-02-15 19:35+0000\n" | 11 | "PO-Revision-Date: 2011-10-04 18:19+0000\n" |
1523 | 12 | "Last-Translator: Goran Kliska <gkliska@gmail.com>\n" | 12 | "Last-Translator: Goran Cvijanović <goranc@gmail.com>\n" |
1524 | 13 | "Language-Team: Croatian <hr@li.org>\n" | 13 | "Language-Team: Croatian <hr@li.org>\n" |
1525 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1526 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1527 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1528 | 17 | <<<<<<< TREE | ||
1529 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1530 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1531 | 20 | ======= | ||
1532 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1533 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1534 | 23 | >>>>>>> MERGE-SOURCE | ||
1535 | 19 | 24 | ||
1536 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1537 | 21 | #, python-format | 26 | #, python-format |
1538 | 22 | msgid "You selected to open %(tabs)s tabs - do you want to continue?" | 27 | msgid "You selected to open %(tabs)s tabs - do you want to continue?" |
1540 | 23 | msgstr "" | 28 | msgstr "Odabrali ste otvaranje %(tabs)s jezičke - želite li nastaviti?" |
1541 | 24 | 29 | ||
1542 | 25 | #: static/javascript/form.js:169 | 30 | #: static/javascript/form.js:169 |
1543 | 26 | msgid "Invalid form, correct red fields." | 31 | msgid "Invalid form, correct red fields." |
1544 | @@ -36,7 +41,7 @@ | |||
1545 | 36 | 41 | ||
1546 | 37 | #: static/javascript/form.js:995 | 42 | #: static/javascript/form.js:995 |
1547 | 38 | msgid "You must save this record to perform the action !" | 43 | msgid "You must save this record to perform the action !" |
1549 | 39 | msgstr "" | 44 | msgstr "Morate spremiti zapis prije izvršenja akcije" |
1550 | 40 | 45 | ||
1551 | 41 | #: static/javascript/form.js:1127 | 46 | #: static/javascript/form.js:1127 |
1552 | 42 | msgid "Do you really want to delete the attachment" | 47 | msgid "Do you really want to delete the attachment" |
1553 | @@ -68,7 +73,7 @@ | |||
1554 | 68 | 73 | ||
1555 | 69 | #: static/javascript/m2o.js:526 | 74 | #: static/javascript/m2o.js:526 |
1556 | 70 | msgid "error in display::" | 75 | msgid "error in display::" |
1558 | 71 | msgstr "" | 76 | msgstr "greška u prikazu::" |
1559 | 72 | 77 | ||
1560 | 73 | #: static/javascript/o2m.js:67 | 78 | #: static/javascript/o2m.js:67 |
1561 | 74 | msgid "Do you really want to delete record ?" | 79 | msgid "Do you really want to delete record ?" |
1562 | @@ -76,7 +81,7 @@ | |||
1563 | 76 | 81 | ||
1564 | 77 | #: static/javascript/search.js:285 | 82 | #: static/javascript/search.js:285 |
1565 | 78 | msgid "Invalid Value" | 83 | msgid "Invalid Value" |
1567 | 79 | msgstr "" | 84 | msgstr "Pogrešna vrijednost" |
1568 | 80 | 85 | ||
1569 | 81 | #: static/javascript/viewed.js:63 | 86 | #: static/javascript/viewed.js:63 |
1570 | 82 | msgid "Do you really want to remove this node?" | 87 | msgid "Do you really want to remove this node?" |
1571 | @@ -88,7 +93,7 @@ | |||
1572 | 88 | 93 | ||
1573 | 89 | #: static/javascript/openerp/openerp.base.js:127 | 94 | #: static/javascript/openerp/openerp.base.js:127 |
1574 | 90 | msgid "doLoadingSuccess: Cannot parse JSON" | 95 | msgid "doLoadingSuccess: Cannot parse JSON" |
1576 | 91 | msgstr "" | 96 | msgstr "doLoadingSuccess: Nije moguće parsirati JSON" |
1577 | 92 | 97 | ||
1578 | 93 | #: static/javascript/openerp/openerp.base.js:335 | 98 | #: static/javascript/openerp/openerp.base.js:335 |
1579 | 94 | msgid "Loading" | 99 | msgid "Loading" |
1580 | 95 | 100 | ||
1581 | === modified file 'addons/openerp/po/javascript/hu.po' | |||
1582 | --- addons/openerp/po/javascript/hu.po 2011-08-04 05:14:27 +0000 | |||
1583 | +++ addons/openerp/po/javascript/hu.po 2012-11-15 08:05:25 +0000 | |||
1584 | @@ -9,13 +9,19 @@ | |||
1585 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1586 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
1587 | 11 | "PO-Revision-Date: 2011-02-15 19:34+0000\n" | 11 | "PO-Revision-Date: 2011-02-15 19:34+0000\n" |
1589 | 12 | "Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n" | 12 | "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) " |
1590 | 13 | "<openerp@novotrade.hu>\n" | ||
1591 | 13 | "Language-Team: Hungarian <hu@li.org>\n" | 14 | "Language-Team: Hungarian <hu@li.org>\n" |
1592 | 14 | "MIME-Version: 1.0\n" | 15 | "MIME-Version: 1.0\n" |
1593 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
1594 | 16 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
1595 | 18 | <<<<<<< TREE | ||
1596 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 19 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1597 | 18 | "X-Generator: Launchpad (build 13573)\n" | 20 | "X-Generator: Launchpad (build 13573)\n" |
1598 | 21 | ======= | ||
1599 | 22 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1600 | 23 | "X-Generator: Launchpad (build 16179)\n" | ||
1601 | 24 | >>>>>>> MERGE-SOURCE | ||
1602 | 19 | 25 | ||
1603 | 20 | #: static/javascript/form.js:92 | 26 | #: static/javascript/form.js:92 |
1604 | 21 | #, python-format | 27 | #, python-format |
1605 | 22 | 28 | ||
1606 | === modified file 'addons/openerp/po/javascript/id.po' | |||
1607 | --- addons/openerp/po/javascript/id.po 2011-08-04 05:14:27 +0000 | |||
1608 | +++ addons/openerp/po/javascript/id.po 2012-11-15 08:05:25 +0000 | |||
1609 | @@ -14,8 +14,13 @@ | |||
1610 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1611 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1612 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1613 | 17 | <<<<<<< TREE | ||
1614 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1615 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1616 | 20 | ======= | ||
1617 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1618 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1619 | 23 | >>>>>>> MERGE-SOURCE | ||
1620 | 19 | 24 | ||
1621 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1622 | 21 | #, python-format | 26 | #, python-format |
1623 | @@ -37,7 +42,7 @@ | |||
1624 | 37 | 42 | ||
1625 | 38 | #: static/javascript/form.js:995 | 43 | #: static/javascript/form.js:995 |
1626 | 39 | msgid "You must save this record to perform the action !" | 44 | msgid "You must save this record to perform the action !" |
1628 | 40 | msgstr "Anda harus menyimpan catatan ini untuk melakukan tindakan" | 45 | msgstr "Anda harus menyimpan data ini untuk melakukan tindakan!" |
1629 | 41 | 46 | ||
1630 | 42 | #: static/javascript/form.js:1127 | 47 | #: static/javascript/form.js:1127 |
1631 | 43 | msgid "Do you really want to delete the attachment" | 48 | msgid "Do you really want to delete the attachment" |
1632 | @@ -78,7 +83,7 @@ | |||
1633 | 78 | 83 | ||
1634 | 79 | #: static/javascript/search.js:285 | 84 | #: static/javascript/search.js:285 |
1635 | 80 | msgid "Invalid Value" | 85 | msgid "Invalid Value" |
1637 | 81 | msgstr "Nilai tidak valid" | 86 | msgstr "Nilai Tidak Valid" |
1638 | 82 | 87 | ||
1639 | 83 | #: static/javascript/viewed.js:63 | 88 | #: static/javascript/viewed.js:63 |
1640 | 84 | msgid "Do you really want to remove this node?" | 89 | msgid "Do you really want to remove this node?" |
1641 | 85 | 90 | ||
1642 | === modified file 'addons/openerp/po/javascript/it.po' | |||
1643 | --- addons/openerp/po/javascript/it.po 2011-08-04 05:14:27 +0000 | |||
1644 | +++ addons/openerp/po/javascript/it.po 2012-11-15 08:05:25 +0000 | |||
1645 | @@ -14,8 +14,13 @@ | |||
1646 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1647 | 15 | "Content-Type: text/plain; charset=utf-8\n" | 15 | "Content-Type: text/plain; charset=utf-8\n" |
1648 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1649 | 17 | <<<<<<< TREE | ||
1650 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1651 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1652 | 20 | ======= | ||
1653 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1654 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1655 | 23 | >>>>>>> MERGE-SOURCE | ||
1656 | 19 | "Generated-By: Babel None\n" | 24 | "Generated-By: Babel None\n" |
1657 | 20 | 25 | ||
1658 | 21 | #: static/javascript/form.js:92 | 26 | #: static/javascript/form.js:92 |
1659 | 22 | 27 | ||
1660 | === modified file 'addons/openerp/po/javascript/lt.po' | |||
1661 | --- addons/openerp/po/javascript/lt.po 2011-08-04 05:14:27 +0000 | |||
1662 | +++ addons/openerp/po/javascript/lt.po 2012-11-15 08:05:25 +0000 | |||
1663 | @@ -9,13 +9,18 @@ | |||
1664 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1665 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
1666 | 11 | "PO-Revision-Date: 2011-02-15 19:34+0000\n" | 11 | "PO-Revision-Date: 2011-02-15 19:34+0000\n" |
1668 | 12 | "Last-Translator: Antony Lesuisse <al@openerp.com>\n" | 12 | "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n" |
1669 | 13 | "Language-Team: Lithuanian <lt@li.org>\n" | 13 | "Language-Team: Lithuanian <lt@li.org>\n" |
1670 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1671 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1672 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1673 | 17 | <<<<<<< TREE | ||
1674 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1675 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1676 | 20 | ======= | ||
1677 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1678 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1679 | 23 | >>>>>>> MERGE-SOURCE | ||
1680 | 19 | 24 | ||
1681 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1682 | 21 | #, python-format | 26 | #, python-format |
1683 | 22 | 27 | ||
1684 | === modified file 'addons/openerp/po/javascript/lv.po' | |||
1685 | --- addons/openerp/po/javascript/lv.po 2011-08-04 05:14:27 +0000 | |||
1686 | +++ addons/openerp/po/javascript/lv.po 2012-11-15 08:05:25 +0000 | |||
1687 | @@ -9,13 +9,18 @@ | |||
1688 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1689 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
1690 | 11 | "PO-Revision-Date: 2011-02-15 19:34+0000\n" | 11 | "PO-Revision-Date: 2011-02-15 19:34+0000\n" |
1692 | 12 | "Last-Translator: Antony Lesuisse <al@openerp.com>\n" | 12 | "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n" |
1693 | 13 | "Language-Team: Latvian <lv@li.org>\n" | 13 | "Language-Team: Latvian <lv@li.org>\n" |
1694 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1695 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1696 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1697 | 17 | <<<<<<< TREE | ||
1698 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1699 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1700 | 20 | ======= | ||
1701 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1702 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1703 | 23 | >>>>>>> MERGE-SOURCE | ||
1704 | 19 | 24 | ||
1705 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1706 | 21 | #, python-format | 26 | #, python-format |
1707 | 22 | 27 | ||
1708 | === modified file 'addons/openerp/po/javascript/mk.po' | |||
1709 | --- addons/openerp/po/javascript/mk.po 2011-08-04 05:14:27 +0000 | |||
1710 | +++ addons/openerp/po/javascript/mk.po 2012-11-15 08:05:25 +0000 | |||
1711 | @@ -14,8 +14,13 @@ | |||
1712 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1713 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1714 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1715 | 17 | <<<<<<< TREE | ||
1716 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1717 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1718 | 20 | ======= | ||
1719 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1720 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1721 | 23 | >>>>>>> MERGE-SOURCE | ||
1722 | 19 | 24 | ||
1723 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1724 | 21 | #, python-format | 26 | #, python-format |
1725 | 22 | 27 | ||
1726 | === modified file 'addons/openerp/po/javascript/mn.po' | |||
1727 | --- addons/openerp/po/javascript/mn.po 2011-08-04 05:14:27 +0000 | |||
1728 | +++ addons/openerp/po/javascript/mn.po 2012-11-15 08:05:25 +0000 | |||
1729 | @@ -8,14 +8,19 @@ | |||
1730 | 8 | "Project-Id-Version: PROJECT VERSION\n" | 8 | "Project-Id-Version: PROJECT VERSION\n" |
1731 | 9 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 9 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
1732 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
1734 | 11 | "PO-Revision-Date: 2011-05-30 06:56+0000\n" | 11 | "PO-Revision-Date: 2011-10-02 19:01+0000\n" |
1735 | 12 | "Last-Translator: BAYARAA Sainbayar <Unknown>\n" | 12 | "Last-Translator: BAYARAA Sainbayar <Unknown>\n" |
1736 | 13 | "Language-Team: mn <LL@li.org>\n" | 13 | "Language-Team: mn <LL@li.org>\n" |
1737 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1738 | 15 | "Content-Type: text/plain; charset=utf-8\n" | 15 | "Content-Type: text/plain; charset=utf-8\n" |
1739 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1740 | 17 | <<<<<<< TREE | ||
1741 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1742 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1743 | 20 | ======= | ||
1744 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1745 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1746 | 23 | >>>>>>> MERGE-SOURCE | ||
1747 | 19 | "Generated-By: Babel None\n" | 24 | "Generated-By: Babel None\n" |
1748 | 20 | 25 | ||
1749 | 21 | #: static/javascript/form.js:92 | 26 | #: static/javascript/form.js:92 |
1750 | @@ -67,7 +72,7 @@ | |||
1751 | 67 | 72 | ||
1752 | 68 | #: static/javascript/m2o.js:526 | 73 | #: static/javascript/m2o.js:526 |
1753 | 69 | msgid "error in display::" | 74 | msgid "error in display::" |
1755 | 70 | msgstr "дэлгэцний алдаа::" | 75 | msgstr "алдаа" |
1756 | 71 | 76 | ||
1757 | 72 | #: static/javascript/o2m.js:67 | 77 | #: static/javascript/o2m.js:67 |
1758 | 73 | msgid "Do you really want to delete record ?" | 78 | msgid "Do you really want to delete record ?" |
1759 | 74 | 79 | ||
1760 | === modified file 'addons/openerp/po/javascript/nb.po' | |||
1761 | --- addons/openerp/po/javascript/nb.po 2011-08-04 05:14:27 +0000 | |||
1762 | +++ addons/openerp/po/javascript/nb.po 2012-11-15 08:05:25 +0000 | |||
1763 | @@ -8,14 +8,19 @@ | |||
1764 | 8 | "Project-Id-Version: openobject-client-web\n" | 8 | "Project-Id-Version: openobject-client-web\n" |
1765 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1766 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
1768 | 11 | "PO-Revision-Date: 2011-07-11 10:09+0000\n" | 11 | "PO-Revision-Date: 2012-07-02 19:25+0000\n" |
1769 | 12 | "Last-Translator: Ole Kristian Gaski <Unknown>\n" | 12 | "Last-Translator: Ole Kristian Gaski <Unknown>\n" |
1770 | 13 | "Language-Team: Norwegian Bokmal <nb@li.org>\n" | 13 | "Language-Team: Norwegian Bokmal <nb@li.org>\n" |
1771 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1772 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1773 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1774 | 17 | <<<<<<< TREE | ||
1775 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1776 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1777 | 20 | ======= | ||
1778 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1779 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1780 | 23 | >>>>>>> MERGE-SOURCE | ||
1781 | 19 | 24 | ||
1782 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1783 | 21 | #, python-format | 26 | #, python-format |
1784 | @@ -86,7 +91,7 @@ | |||
1785 | 86 | 91 | ||
1786 | 87 | #: static/javascript/viewed.js:329 | 92 | #: static/javascript/viewed.js:329 |
1787 | 88 | msgid "Do you really wants to create an inherited view here?" | 93 | msgid "Do you really wants to create an inherited view here?" |
1789 | 89 | msgstr "" | 94 | msgstr "Vil du virkelig opprette en underordnet visning her?" |
1790 | 90 | 95 | ||
1791 | 91 | #: static/javascript/openerp/openerp.base.js:127 | 96 | #: static/javascript/openerp/openerp.base.js:127 |
1792 | 92 | msgid "doLoadingSuccess: Cannot parse JSON" | 97 | msgid "doLoadingSuccess: Cannot parse JSON" |
1793 | 93 | 98 | ||
1794 | === modified file 'addons/openerp/po/javascript/nl.po' | |||
1795 | --- addons/openerp/po/javascript/nl.po 2011-08-04 05:14:27 +0000 | |||
1796 | +++ addons/openerp/po/javascript/nl.po 2012-11-15 08:05:25 +0000 | |||
1797 | @@ -9,13 +9,18 @@ | |||
1798 | 9 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 9 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
1799 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
1800 | 11 | "PO-Revision-Date: 2011-02-15 19:42+0000\n" | 11 | "PO-Revision-Date: 2011-02-15 19:42+0000\n" |
1802 | 12 | "Last-Translator: Nicolas Vanhoren (OpenERP) <Unknown>\n" | 12 | "Last-Translator: Nicolas (OpenERP) <Unknown>\n" |
1803 | 13 | "Language-Team: nl <LL@li.org>\n" | 13 | "Language-Team: nl <LL@li.org>\n" |
1804 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1805 | 15 | "Content-Type: text/plain; charset=utf-8\n" | 15 | "Content-Type: text/plain; charset=utf-8\n" |
1806 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1807 | 17 | <<<<<<< TREE | ||
1808 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n" |
1809 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1810 | 20 | ======= | ||
1811 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1812 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1813 | 23 | >>>>>>> MERGE-SOURCE | ||
1814 | 19 | "Generated-By: Babel None\n" | 24 | "Generated-By: Babel None\n" |
1815 | 20 | 25 | ||
1816 | 21 | #: static/javascript/form.js:92 | 26 | #: static/javascript/form.js:92 |
1817 | 22 | 27 | ||
1818 | === modified file 'addons/openerp/po/javascript/pl.po' | |||
1819 | --- addons/openerp/po/javascript/pl.po 2011-08-04 05:14:27 +0000 | |||
1820 | +++ addons/openerp/po/javascript/pl.po 2012-11-15 08:05:25 +0000 | |||
1821 | @@ -8,14 +8,19 @@ | |||
1822 | 8 | "Project-Id-Version: PROJECT VERSION\n" | 8 | "Project-Id-Version: PROJECT VERSION\n" |
1823 | 9 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 9 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
1824 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
1827 | 11 | "PO-Revision-Date: 2011-02-15 19:34+0000\n" | 11 | "PO-Revision-Date: 2012-11-04 13:05+0000\n" |
1828 | 12 | "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n" | 12 | "Last-Translator: Łukasz Cieśluk <lukaszciesluk@gmail.com>\n" |
1829 | 13 | "Language-Team: pl <LL@li.org>\n" | 13 | "Language-Team: pl <LL@li.org>\n" |
1830 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1831 | 15 | "Content-Type: text/plain; charset=utf-8\n" | 15 | "Content-Type: text/plain; charset=utf-8\n" |
1832 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1833 | 17 | <<<<<<< TREE | ||
1834 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1835 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1836 | 20 | ======= | ||
1837 | 21 | "X-Launchpad-Export-Date: 2012-11-05 04:49+0000\n" | ||
1838 | 22 | "X-Generator: Launchpad (build 16232)\n" | ||
1839 | 23 | >>>>>>> MERGE-SOURCE | ||
1840 | 19 | "Generated-By: Babel None\n" | 24 | "Generated-By: Babel None\n" |
1841 | 20 | 25 | ||
1842 | 21 | #: static/javascript/form.js:92 | 26 | #: static/javascript/form.js:92 |
1843 | @@ -78,7 +83,7 @@ | |||
1844 | 78 | 83 | ||
1845 | 79 | #: static/javascript/search.js:285 | 84 | #: static/javascript/search.js:285 |
1846 | 80 | msgid "Invalid Value" | 85 | msgid "Invalid Value" |
1848 | 81 | msgstr "" | 86 | msgstr "Niewłaściwa wartość" |
1849 | 82 | 87 | ||
1850 | 83 | #: static/javascript/viewed.js:63 | 88 | #: static/javascript/viewed.js:63 |
1851 | 84 | msgid "Do you really want to remove this node?" | 89 | msgid "Do you really want to remove this node?" |
1852 | @@ -90,7 +95,7 @@ | |||
1853 | 90 | 95 | ||
1854 | 91 | #: static/javascript/openerp/openerp.base.js:127 | 96 | #: static/javascript/openerp/openerp.base.js:127 |
1855 | 92 | msgid "doLoadingSuccess: Cannot parse JSON" | 97 | msgid "doLoadingSuccess: Cannot parse JSON" |
1857 | 93 | msgstr "" | 98 | msgstr "doLoadingSuccess: Nie można sparsować JSON" |
1858 | 94 | 99 | ||
1859 | 95 | #: static/javascript/openerp/openerp.base.js:335 | 100 | #: static/javascript/openerp/openerp.base.js:335 |
1860 | 96 | msgid "Loading" | 101 | msgid "Loading" |
1861 | 97 | 102 | ||
1862 | === modified file 'addons/openerp/po/javascript/pt.po' | |||
1863 | --- addons/openerp/po/javascript/pt.po 2011-08-04 05:14:27 +0000 | |||
1864 | +++ addons/openerp/po/javascript/pt.po 2012-11-15 08:05:25 +0000 | |||
1865 | @@ -8,14 +8,19 @@ | |||
1866 | 8 | "Project-Id-Version: openobject-client-web\n" | 8 | "Project-Id-Version: openobject-client-web\n" |
1867 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1868 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
1871 | 11 | "PO-Revision-Date: 2011-02-15 19:33+0000\n" | 11 | "PO-Revision-Date: 2012-06-21 12:54+0000\n" |
1872 | 12 | "Last-Translator: Antony Lesuisse <al@openerp.com>\n" | 12 | "Last-Translator: ThinkOpen Solutions <Unknown>\n" |
1873 | 13 | "Language-Team: Portuguese <pt@li.org>\n" | 13 | "Language-Team: Portuguese <pt@li.org>\n" |
1874 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1875 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
1876 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1877 | 17 | <<<<<<< TREE | ||
1878 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1879 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1880 | 20 | ======= | ||
1881 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1882 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1883 | 23 | >>>>>>> MERGE-SOURCE | ||
1884 | 19 | 24 | ||
1885 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
1886 | 21 | #, python-format | 26 | #, python-format |
1887 | @@ -36,7 +41,7 @@ | |||
1888 | 36 | 41 | ||
1889 | 37 | #: static/javascript/form.js:995 | 42 | #: static/javascript/form.js:995 |
1890 | 38 | msgid "You must save this record to perform the action !" | 43 | msgid "You must save this record to perform the action !" |
1892 | 39 | msgstr "" | 44 | msgstr "Precisa gravar este registo para executar a acção !" |
1893 | 40 | 45 | ||
1894 | 41 | #: static/javascript/form.js:1127 | 46 | #: static/javascript/form.js:1127 |
1895 | 42 | msgid "Do you really want to delete the attachment" | 47 | msgid "Do you really want to delete the attachment" |
1896 | @@ -77,7 +82,7 @@ | |||
1897 | 77 | 82 | ||
1898 | 78 | #: static/javascript/search.js:285 | 83 | #: static/javascript/search.js:285 |
1899 | 79 | msgid "Invalid Value" | 84 | msgid "Invalid Value" |
1901 | 80 | msgstr "" | 85 | msgstr "Valor Inválido" |
1902 | 81 | 86 | ||
1903 | 82 | #: static/javascript/viewed.js:63 | 87 | #: static/javascript/viewed.js:63 |
1904 | 83 | msgid "Do you really want to remove this node?" | 88 | msgid "Do you really want to remove this node?" |
1905 | 84 | 89 | ||
1906 | === modified file 'addons/openerp/po/javascript/pt_BR.po' | |||
1907 | --- addons/openerp/po/javascript/pt_BR.po 2011-08-04 05:14:27 +0000 | |||
1908 | +++ addons/openerp/po/javascript/pt_BR.po 2012-11-15 08:05:25 +0000 | |||
1909 | @@ -14,8 +14,13 @@ | |||
1910 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
1911 | 15 | "Content-Type: text/plain; charset=utf-8\n" | 15 | "Content-Type: text/plain; charset=utf-8\n" |
1912 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
1913 | 17 | <<<<<<< TREE | ||
1914 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1915 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
1916 | 20 | ======= | ||
1917 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1918 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
1919 | 23 | >>>>>>> MERGE-SOURCE | ||
1920 | 19 | "Generated-By: Babel None\n" | 24 | "Generated-By: Babel None\n" |
1921 | 20 | 25 | ||
1922 | 21 | #: static/javascript/form.js:92 | 26 | #: static/javascript/form.js:92 |
1923 | 22 | 27 | ||
1924 | === modified file 'addons/openerp/po/javascript/ro.po' | |||
1925 | --- addons/openerp/po/javascript/ro.po 2011-08-04 05:14:27 +0000 | |||
1926 | +++ addons/openerp/po/javascript/ro.po 2012-11-15 08:05:25 +0000 | |||
1927 | @@ -8,14 +8,24 @@ | |||
1928 | 8 | "Project-Id-Version: openobject-client-web\n" | 8 | "Project-Id-Version: openobject-client-web\n" |
1929 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1930 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
1931 | 11 | <<<<<<< TREE | ||
1932 | 11 | "PO-Revision-Date: 2011-03-15 08:06+0000\n" | 12 | "PO-Revision-Date: 2011-03-15 08:06+0000\n" |
1933 | 12 | "Last-Translator: Mihai Satmarean <Unknown>\n" | 13 | "Last-Translator: Mihai Satmarean <Unknown>\n" |
1934 | 14 | ======= | ||
1935 | 15 | "PO-Revision-Date: 2011-09-16 16:34+0000\n" | ||
1936 | 16 | "Last-Translator: Syraxes <Unknown>\n" | ||
1937 | 17 | >>>>>>> MERGE-SOURCE | ||
1938 | 13 | "Language-Team: Romanian <ro@li.org>\n" | 18 | "Language-Team: Romanian <ro@li.org>\n" |
1939 | 14 | "MIME-Version: 1.0\n" | 19 | "MIME-Version: 1.0\n" |
1940 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 20 | "Content-Type: text/plain; charset=UTF-8\n" |
1941 | 16 | "Content-Transfer-Encoding: 8bit\n" | 21 | "Content-Transfer-Encoding: 8bit\n" |
1942 | 22 | <<<<<<< TREE | ||
1943 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 23 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
1944 | 18 | "X-Generator: Launchpad (build 13573)\n" | 24 | "X-Generator: Launchpad (build 13573)\n" |
1945 | 25 | ======= | ||
1946 | 26 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
1947 | 27 | "X-Generator: Launchpad (build 16179)\n" | ||
1948 | 28 | >>>>>>> MERGE-SOURCE | ||
1949 | 19 | 29 | ||
1950 | 20 | #: static/javascript/form.js:92 | 30 | #: static/javascript/form.js:92 |
1951 | 21 | #, python-format | 31 | #, python-format |
1952 | @@ -24,7 +34,7 @@ | |||
1953 | 24 | 34 | ||
1954 | 25 | #: static/javascript/form.js:169 | 35 | #: static/javascript/form.js:169 |
1955 | 26 | msgid "Invalid form, correct red fields." | 36 | msgid "Invalid form, correct red fields." |
1957 | 27 | msgstr "" | 37 | msgstr "Forma invalidă. Corectați cîmpurile colorate în roșu." |
1958 | 28 | 38 | ||
1959 | 29 | #: static/javascript/form.js:204 | 39 | #: static/javascript/form.js:204 |
1960 | 30 | msgid "Do you really want to delete this record?" | 40 | msgid "Do you really want to delete this record?" |
1961 | @@ -32,70 +42,74 @@ | |||
1962 | 32 | 42 | ||
1963 | 33 | #: static/javascript/form.js:960 | 43 | #: static/javascript/form.js:960 |
1964 | 34 | msgid "You must select one or several records !" | 44 | msgid "You must select one or several records !" |
1966 | 35 | msgstr "" | 45 | msgstr "Trebuie să selectați cel puțin o înregistrare !" |
1967 | 36 | 46 | ||
1968 | 37 | #: static/javascript/form.js:995 | 47 | #: static/javascript/form.js:995 |
1969 | 38 | msgid "You must save this record to perform the action !" | 48 | msgid "You must save this record to perform the action !" |
1971 | 39 | msgstr "" | 49 | msgstr "Trebuie să salvați înregistrarea mai întîi !" |
1972 | 40 | 50 | ||
1973 | 41 | #: static/javascript/form.js:1127 | 51 | #: static/javascript/form.js:1127 |
1974 | 42 | msgid "Do you really want to delete the attachment" | 52 | msgid "Do you really want to delete the attachment" |
1976 | 43 | msgstr "" | 53 | msgstr "Sigur doriți să ștergeți atașamentul" |
1977 | 44 | 54 | ||
1978 | 45 | #: static/javascript/form.js:1161 | 55 | #: static/javascript/form.js:1161 |
1979 | 46 | msgid "No record selected ! You can only attach to existing record." | 56 | msgid "No record selected ! You can only attach to existing record." |
1980 | 47 | msgstr "" | 57 | msgstr "" |
1981 | 58 | "Nu ați selectat nici o înregistrare ! Atașarea nu poate fi făcută decît la o " | ||
1982 | 59 | "înregistrare existentă." | ||
1983 | 48 | 60 | ||
1984 | 49 | #: static/javascript/form.js:1220 | 61 | #: static/javascript/form.js:1220 |
1985 | 50 | msgid "OpenERP - Error" | 62 | msgid "OpenERP - Error" |
1987 | 51 | msgstr "" | 63 | msgstr "Eroare OpenERP" |
1988 | 52 | 64 | ||
1989 | 53 | #: static/javascript/form.js:1291 | 65 | #: static/javascript/form.js:1291 |
1990 | 54 | msgid "" | 66 | msgid "" |
1991 | 55 | "Warning, the record has been modified,\n" | 67 | "Warning, the record has been modified,\n" |
1992 | 56 | "your changes will be discarded." | 68 | "your changes will be discarded." |
1993 | 57 | msgstr "" | 69 | msgstr "" |
1994 | 70 | "Atenție: înregistrarea a fost modificată întretimp,\n" | ||
1995 | 71 | "așadar schimbările făcute de dvs vor fi anulate." | ||
1996 | 58 | 72 | ||
1997 | 59 | #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123 | 73 | #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123 |
1998 | 60 | msgid "To edit Record, please first save it." | 74 | msgid "To edit Record, please first save it." |
2000 | 61 | msgstr "" | 75 | msgstr "Vă rugăm să salvați înregistrarea înainte de a încerca să o editați." |
2001 | 62 | 76 | ||
2002 | 63 | #: static/javascript/listgrid.js:650 | 77 | #: static/javascript/listgrid.js:650 |
2003 | 64 | msgid "Do you really want to delete selected record(s) ?" | 78 | msgid "Do you really want to delete selected record(s) ?" |
2005 | 65 | msgstr "" | 79 | msgstr "Sigur doriți ștergerea înregistrărilor selectate ?" |
2006 | 66 | 80 | ||
2007 | 67 | #: static/javascript/m2o.js:526 | 81 | #: static/javascript/m2o.js:526 |
2008 | 68 | msgid "error in display::" | 82 | msgid "error in display::" |
2010 | 69 | msgstr "" | 83 | msgstr "eroare la afișare::" |
2011 | 70 | 84 | ||
2012 | 71 | #: static/javascript/o2m.js:67 | 85 | #: static/javascript/o2m.js:67 |
2013 | 72 | msgid "Do you really want to delete record ?" | 86 | msgid "Do you really want to delete record ?" |
2015 | 73 | msgstr "" | 87 | msgstr "Sigur doriți să ștergeți înregistrarea ?" |
2016 | 74 | 88 | ||
2017 | 75 | #: static/javascript/search.js:285 | 89 | #: static/javascript/search.js:285 |
2018 | 76 | msgid "Invalid Value" | 90 | msgid "Invalid Value" |
2020 | 77 | msgstr "" | 91 | msgstr "Valoare incorectă" |
2021 | 78 | 92 | ||
2022 | 79 | #: static/javascript/viewed.js:63 | 93 | #: static/javascript/viewed.js:63 |
2023 | 80 | msgid "Do you really want to remove this node?" | 94 | msgid "Do you really want to remove this node?" |
2025 | 81 | msgstr "" | 95 | msgstr "Sigur doriți ștergerea acestui nod ?" |
2026 | 82 | 96 | ||
2027 | 83 | #: static/javascript/viewed.js:329 | 97 | #: static/javascript/viewed.js:329 |
2028 | 84 | msgid "Do you really wants to create an inherited view here?" | 98 | msgid "Do you really wants to create an inherited view here?" |
2030 | 85 | msgstr "" | 99 | msgstr "Sigur doriți crearea aici a unui view moștenit ?" |
2031 | 86 | 100 | ||
2032 | 87 | #: static/javascript/openerp/openerp.base.js:127 | 101 | #: static/javascript/openerp/openerp.base.js:127 |
2033 | 88 | msgid "doLoadingSuccess: Cannot parse JSON" | 102 | msgid "doLoadingSuccess: Cannot parse JSON" |
2035 | 89 | msgstr "" | 103 | msgstr "doLoadingSuccess: Eroare la parsarea JSON" |
2036 | 90 | 104 | ||
2037 | 91 | #: static/javascript/openerp/openerp.base.js:335 | 105 | #: static/javascript/openerp/openerp.base.js:335 |
2038 | 92 | msgid "Loading" | 106 | msgid "Loading" |
2040 | 93 | msgstr "" | 107 | msgstr "Se încarcă" |
2041 | 94 | 108 | ||
2042 | 95 | #: static/javascript/openerp/openerp.ui.tips.js:51 | 109 | #: static/javascript/openerp/openerp.ui.tips.js:51 |
2043 | 96 | msgid "Object" | 110 | msgid "Object" |
2045 | 97 | msgstr "" | 111 | msgstr "Obiect" |
2046 | 98 | 112 | ||
2047 | 99 | #: static/javascript/openerp/openerp.ui.tips.js:52 | 113 | #: static/javascript/openerp/openerp.ui.tips.js:52 |
2048 | 100 | msgid "Field" | 114 | msgid "Field" |
2050 | 101 | msgstr "" | 115 | msgstr "Câmp" |
2051 | 102 | 116 | ||
2052 | === modified file 'addons/openerp/po/javascript/ru.po' | |||
2053 | --- addons/openerp/po/javascript/ru.po 2011-08-04 05:14:27 +0000 | |||
2054 | +++ addons/openerp/po/javascript/ru.po 2012-11-15 08:05:25 +0000 | |||
2055 | @@ -14,8 +14,13 @@ | |||
2056 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2057 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2058 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2059 | 17 | <<<<<<< TREE | ||
2060 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
2061 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
2062 | 20 | ======= | ||
2063 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
2064 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
2065 | 23 | >>>>>>> MERGE-SOURCE | ||
2066 | 19 | 24 | ||
2067 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
2068 | 21 | #, python-format | 26 | #, python-format |
2069 | 22 | 27 | ||
2070 | === modified file 'addons/openerp/po/javascript/sk.po' | |||
2071 | --- addons/openerp/po/javascript/sk.po 2011-08-04 05:14:27 +0000 | |||
2072 | +++ addons/openerp/po/javascript/sk.po 2012-11-15 08:05:25 +0000 | |||
2073 | @@ -14,8 +14,13 @@ | |||
2074 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2075 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2076 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2077 | 17 | <<<<<<< TREE | ||
2078 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
2079 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
2080 | 20 | ======= | ||
2081 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
2082 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
2083 | 23 | >>>>>>> MERGE-SOURCE | ||
2084 | 19 | 24 | ||
2085 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
2086 | 21 | #, python-format | 26 | #, python-format |
2087 | 22 | 27 | ||
2088 | === added file 'addons/openerp/po/javascript/sl.po' | |||
2089 | --- addons/openerp/po/javascript/sl.po 1970-01-01 00:00:00 +0000 | |||
2090 | +++ addons/openerp/po/javascript/sl.po 2012-11-15 08:05:25 +0000 | |||
2091 | @@ -0,0 +1,104 @@ | |||
2092 | 1 | # Slovenian translation for openobject-client-web | ||
2093 | 2 | # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 | ||
2094 | 3 | # This file is distributed under the same license as the openobject-client-web package. | ||
2095 | 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, 2011. | ||
2096 | 5 | # | ||
2097 | 6 | msgid "" | ||
2098 | 7 | msgstr "" | ||
2099 | 8 | "Project-Id-Version: openobject-client-web\n" | ||
2100 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
2101 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | ||
2102 | 11 | "PO-Revision-Date: 2011-09-21 08:29+0000\n" | ||
2103 | 12 | "Last-Translator: Anze (Neotek) <Unknown>\n" | ||
2104 | 13 | "Language-Team: Slovenian <sl@li.org>\n" | ||
2105 | 14 | "MIME-Version: 1.0\n" | ||
2106 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | ||
2107 | 16 | "Content-Transfer-Encoding: 8bit\n" | ||
2108 | 17 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
2109 | 18 | "X-Generator: Launchpad (build 16179)\n" | ||
2110 | 19 | |||
2111 | 20 | #: static/javascript/form.js:92 | ||
2112 | 21 | #, python-format | ||
2113 | 22 | msgid "You selected to open %(tabs)s tabs - do you want to continue?" | ||
2114 | 23 | msgstr "" | ||
2115 | 24 | "Izbrali ste, da boste odprli zavihke %(tabs)s - ali želite nadaljevati?" | ||
2116 | 25 | |||
2117 | 26 | #: static/javascript/form.js:169 | ||
2118 | 27 | msgid "Invalid form, correct red fields." | ||
2119 | 28 | msgstr "Neveljavna oblika, popravite rdeča polja." | ||
2120 | 29 | |||
2121 | 30 | #: static/javascript/form.js:204 | ||
2122 | 31 | msgid "Do you really want to delete this record?" | ||
2123 | 32 | msgstr "Ali res želite izbrisati ta zapis?" | ||
2124 | 33 | |||
2125 | 34 | #: static/javascript/form.js:960 | ||
2126 | 35 | msgid "You must select one or several records !" | ||
2127 | 36 | msgstr "Izbrati morate enega ali več zapisov!" | ||
2128 | 37 | |||
2129 | 38 | #: static/javascript/form.js:995 | ||
2130 | 39 | msgid "You must save this record to perform the action !" | ||
2131 | 40 | msgstr "Morate shtaniti zapis za izvršitev tega dejanja!" | ||
2132 | 41 | |||
2133 | 42 | #: static/javascript/form.js:1127 | ||
2134 | 43 | msgid "Do you really want to delete the attachment" | ||
2135 | 44 | msgstr "Ali res želite izbrisati to priponko?" | ||
2136 | 45 | |||
2137 | 46 | #: static/javascript/form.js:1161 | ||
2138 | 47 | msgid "No record selected ! You can only attach to existing record." | ||
2139 | 48 | msgstr "Zapis ni izbran. Pripnete lahko samo na obstoječ zapis!" | ||
2140 | 49 | |||
2141 | 50 | #: static/javascript/form.js:1220 | ||
2142 | 51 | msgid "OpenERP - Error" | ||
2143 | 52 | msgstr "OpenERP - Napaka" | ||
2144 | 53 | |||
2145 | 54 | #: static/javascript/form.js:1291 | ||
2146 | 55 | msgid "" | ||
2147 | 56 | "Warning, the record has been modified,\n" | ||
2148 | 57 | "your changes will be discarded." | ||
2149 | 58 | msgstr "" | ||
2150 | 59 | "Opozorilo, zapis je bil spremenjen,\n" | ||
2151 | 60 | "vaše spremembe ne bodo upoštevane." | ||
2152 | 61 | |||
2153 | 62 | #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123 | ||
2154 | 63 | msgid "To edit Record, please first save it." | ||
2155 | 64 | msgstr "Za urejanje zapisa, ga prosim najprej shranite." | ||
2156 | 65 | |||
2157 | 66 | #: static/javascript/listgrid.js:650 | ||
2158 | 67 | msgid "Do you really want to delete selected record(s) ?" | ||
2159 | 68 | msgstr "Ali res želite izbrisati izbrane zapise?" | ||
2160 | 69 | |||
2161 | 70 | #: static/javascript/m2o.js:526 | ||
2162 | 71 | msgid "error in display::" | ||
2163 | 72 | msgstr "napaka v prikazu::" | ||
2164 | 73 | |||
2165 | 74 | #: static/javascript/o2m.js:67 | ||
2166 | 75 | msgid "Do you really want to delete record ?" | ||
2167 | 76 | msgstr "Ali res želite izbrisati zapis?" | ||
2168 | 77 | |||
2169 | 78 | #: static/javascript/search.js:285 | ||
2170 | 79 | msgid "Invalid Value" | ||
2171 | 80 | msgstr "Neveljavna vrednost" | ||
2172 | 81 | |||
2173 | 82 | #: static/javascript/viewed.js:63 | ||
2174 | 83 | msgid "Do you really want to remove this node?" | ||
2175 | 84 | msgstr "Ali res želite izbrisati to vozlišče?" | ||
2176 | 85 | |||
2177 | 86 | #: static/javascript/viewed.js:329 | ||
2178 | 87 | msgid "Do you really wants to create an inherited view here?" | ||
2179 | 88 | msgstr "Ali res želite ustvariti deden pogled tukaj?" | ||
2180 | 89 | |||
2181 | 90 | #: static/javascript/openerp/openerp.base.js:127 | ||
2182 | 91 | msgid "doLoadingSuccess: Cannot parse JSON" | ||
2183 | 92 | msgstr "doLoadingSuccess: Ni mogoče razčleniti JSON" | ||
2184 | 93 | |||
2185 | 94 | #: static/javascript/openerp/openerp.base.js:335 | ||
2186 | 95 | msgid "Loading" | ||
2187 | 96 | msgstr "Nalaganje" | ||
2188 | 97 | |||
2189 | 98 | #: static/javascript/openerp/openerp.ui.tips.js:51 | ||
2190 | 99 | msgid "Object" | ||
2191 | 100 | msgstr "Predmet" | ||
2192 | 101 | |||
2193 | 102 | #: static/javascript/openerp/openerp.ui.tips.js:52 | ||
2194 | 103 | msgid "Field" | ||
2195 | 104 | msgstr "Polje" | ||
2196 | 0 | 105 | ||
2197 | === modified file 'addons/openerp/po/javascript/sr.po' | |||
2198 | --- addons/openerp/po/javascript/sr.po 2011-08-04 05:14:27 +0000 | |||
2199 | +++ addons/openerp/po/javascript/sr.po 2012-11-15 08:05:25 +0000 | |||
2200 | @@ -9,13 +9,18 @@ | |||
2201 | 9 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 9 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
2202 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
2203 | 11 | "PO-Revision-Date: 2011-02-15 19:32+0000\n" | 11 | "PO-Revision-Date: 2011-02-15 19:32+0000\n" |
2205 | 12 | "Last-Translator: Antony Lesuisse <al@openerp.com>\n" | 12 | "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n" |
2206 | 13 | "Language-Team: sr <LL@li.org>\n" | 13 | "Language-Team: sr <LL@li.org>\n" |
2207 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2208 | 15 | "Content-Type: text/plain; charset=utf-8\n" | 15 | "Content-Type: text/plain; charset=utf-8\n" |
2209 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2210 | 17 | <<<<<<< TREE | ||
2211 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
2212 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
2213 | 20 | ======= | ||
2214 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
2215 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
2216 | 23 | >>>>>>> MERGE-SOURCE | ||
2217 | 19 | "Generated-By: Babel None\n" | 24 | "Generated-By: Babel None\n" |
2218 | 20 | 25 | ||
2219 | 21 | #: static/javascript/form.js:92 | 26 | #: static/javascript/form.js:92 |
2220 | 22 | 27 | ||
2221 | === modified file 'addons/openerp/po/javascript/sr@latin.po' | |||
2222 | --- addons/openerp/po/javascript/sr@latin.po 2011-08-04 05:14:27 +0000 | |||
2223 | +++ addons/openerp/po/javascript/sr@latin.po 2012-11-15 08:05:25 +0000 | |||
2224 | @@ -9,13 +9,18 @@ | |||
2225 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2226 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
2227 | 11 | "PO-Revision-Date: 2011-02-15 19:31+0000\n" | 11 | "PO-Revision-Date: 2011-02-15 19:31+0000\n" |
2229 | 12 | "Last-Translator: Antony Lesuisse <al@openerp.com>\n" | 12 | "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n" |
2230 | 13 | "Language-Team: Serbian latin <sr@latin@li.org>\n" | 13 | "Language-Team: Serbian latin <sr@latin@li.org>\n" |
2231 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2232 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2233 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2234 | 17 | <<<<<<< TREE | ||
2235 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
2236 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
2237 | 20 | ======= | ||
2238 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
2239 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
2240 | 23 | >>>>>>> MERGE-SOURCE | ||
2241 | 19 | 24 | ||
2242 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
2243 | 21 | #, python-format | 26 | #, python-format |
2244 | @@ -74,7 +79,7 @@ | |||
2245 | 74 | 79 | ||
2246 | 75 | #: static/javascript/search.js:285 | 80 | #: static/javascript/search.js:285 |
2247 | 76 | msgid "Invalid Value" | 81 | msgid "Invalid Value" |
2249 | 77 | msgstr "" | 82 | msgstr "Vrednost nije ispravna" |
2250 | 78 | 83 | ||
2251 | 79 | #: static/javascript/viewed.js:63 | 84 | #: static/javascript/viewed.js:63 |
2252 | 80 | msgid "Do you really want to remove this node?" | 85 | msgid "Do you really want to remove this node?" |
2253 | 81 | 86 | ||
2254 | === modified file 'addons/openerp/po/javascript/sv.po' | |||
2255 | --- addons/openerp/po/javascript/sv.po 2011-08-04 05:14:27 +0000 | |||
2256 | +++ addons/openerp/po/javascript/sv.po 2012-11-15 08:05:25 +0000 | |||
2257 | @@ -8,20 +8,25 @@ | |||
2258 | 8 | "Project-Id-Version: PROJECT VERSION\n" | 8 | "Project-Id-Version: PROJECT VERSION\n" |
2259 | 9 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 9 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
2260 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
2263 | 11 | "PO-Revision-Date: 2011-02-15 19:31+0000\n" | 11 | "PO-Revision-Date: 2012-04-24 10:37+0000\n" |
2264 | 12 | "Last-Translator: Antony Lesuisse <al@openerp.com>\n" | 12 | "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n" |
2265 | 13 | "Language-Team: sv <LL@li.org>\n" | 13 | "Language-Team: sv <LL@li.org>\n" |
2266 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2267 | 15 | "Content-Type: text/plain; charset=utf-8\n" | 15 | "Content-Type: text/plain; charset=utf-8\n" |
2268 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2269 | 17 | <<<<<<< TREE | ||
2270 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
2271 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
2272 | 20 | ======= | ||
2273 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
2274 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
2275 | 23 | >>>>>>> MERGE-SOURCE | ||
2276 | 19 | "Generated-By: Babel None\n" | 24 | "Generated-By: Babel None\n" |
2277 | 20 | 25 | ||
2278 | 21 | #: static/javascript/form.js:92 | 26 | #: static/javascript/form.js:92 |
2279 | 22 | #, python-format | 27 | #, python-format |
2280 | 23 | msgid "You selected to open %(tabs)s tabs - do you want to continue?" | 28 | msgid "You selected to open %(tabs)s tabs - do you want to continue?" |
2282 | 24 | msgstr "" | 29 | msgstr "Du valde att öppna %(tabs)s flikar - vill du fullfölja?" |
2283 | 25 | 30 | ||
2284 | 26 | #: static/javascript/form.js:169 | 31 | #: static/javascript/form.js:169 |
2285 | 27 | msgid "Invalid form, correct red fields." | 32 | msgid "Invalid form, correct red fields." |
2286 | @@ -33,11 +38,11 @@ | |||
2287 | 33 | 38 | ||
2288 | 34 | #: static/javascript/form.js:960 | 39 | #: static/javascript/form.js:960 |
2289 | 35 | msgid "You must select one or several records !" | 40 | msgid "You must select one or several records !" |
2291 | 36 | msgstr "" | 41 | msgstr "Du måste välja minst en post !" |
2292 | 37 | 42 | ||
2293 | 38 | #: static/javascript/form.js:995 | 43 | #: static/javascript/form.js:995 |
2294 | 39 | msgid "You must save this record to perform the action !" | 44 | msgid "You must save this record to perform the action !" |
2296 | 40 | msgstr "" | 45 | msgstr "Du måste spara denna post för att utföra åtgärden!" |
2297 | 41 | 46 | ||
2298 | 42 | #: static/javascript/form.js:1127 | 47 | #: static/javascript/form.js:1127 |
2299 | 43 | msgid "Do you really want to delete the attachment" | 48 | msgid "Do you really want to delete the attachment" |
2300 | @@ -45,17 +50,19 @@ | |||
2301 | 45 | 50 | ||
2302 | 46 | #: static/javascript/form.js:1161 | 51 | #: static/javascript/form.js:1161 |
2303 | 47 | msgid "No record selected ! You can only attach to existing record." | 52 | msgid "No record selected ! You can only attach to existing record." |
2305 | 48 | msgstr "" | 53 | msgstr "Ingen post vald ! Du kan endast bifoga till befintliga poster." |
2306 | 49 | 54 | ||
2307 | 50 | #: static/javascript/form.js:1220 | 55 | #: static/javascript/form.js:1220 |
2308 | 51 | msgid "OpenERP - Error" | 56 | msgid "OpenERP - Error" |
2310 | 52 | msgstr "" | 57 | msgstr "OpenERP - Fel" |
2311 | 53 | 58 | ||
2312 | 54 | #: static/javascript/form.js:1291 | 59 | #: static/javascript/form.js:1291 |
2313 | 55 | msgid "" | 60 | msgid "" |
2314 | 56 | "Warning, the record has been modified,\n" | 61 | "Warning, the record has been modified,\n" |
2315 | 57 | "your changes will be discarded." | 62 | "your changes will be discarded." |
2316 | 58 | msgstr "" | 63 | msgstr "" |
2317 | 64 | "Varning! Posten har ändrats,\n" | ||
2318 | 65 | "dina ändringar kommer att förloras." | ||
2319 | 59 | 66 | ||
2320 | 60 | #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123 | 67 | #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123 |
2321 | 61 | msgid "To edit Record, please first save it." | 68 | msgid "To edit Record, please first save it." |
2322 | @@ -67,7 +74,7 @@ | |||
2323 | 67 | 74 | ||
2324 | 68 | #: static/javascript/m2o.js:526 | 75 | #: static/javascript/m2o.js:526 |
2325 | 69 | msgid "error in display::" | 76 | msgid "error in display::" |
2327 | 70 | msgstr "" | 77 | msgstr "fel i presentationen::" |
2328 | 71 | 78 | ||
2329 | 72 | #: static/javascript/o2m.js:67 | 79 | #: static/javascript/o2m.js:67 |
2330 | 73 | msgid "Do you really want to delete record ?" | 80 | msgid "Do you really want to delete record ?" |
2331 | @@ -75,7 +82,7 @@ | |||
2332 | 75 | 82 | ||
2333 | 76 | #: static/javascript/search.js:285 | 83 | #: static/javascript/search.js:285 |
2334 | 77 | msgid "Invalid Value" | 84 | msgid "Invalid Value" |
2336 | 78 | msgstr "" | 85 | msgstr "Ogiltigt värde" |
2337 | 79 | 86 | ||
2338 | 80 | #: static/javascript/viewed.js:63 | 87 | #: static/javascript/viewed.js:63 |
2339 | 81 | msgid "Do you really want to remove this node?" | 88 | msgid "Do you really want to remove this node?" |
2340 | @@ -87,11 +94,11 @@ | |||
2341 | 87 | 94 | ||
2342 | 88 | #: static/javascript/openerp/openerp.base.js:127 | 95 | #: static/javascript/openerp/openerp.base.js:127 |
2343 | 89 | msgid "doLoadingSuccess: Cannot parse JSON" | 96 | msgid "doLoadingSuccess: Cannot parse JSON" |
2345 | 90 | msgstr "" | 97 | msgstr "doLoadingSuccess: Kan inte tolka JSON" |
2346 | 91 | 98 | ||
2347 | 92 | #: static/javascript/openerp/openerp.base.js:335 | 99 | #: static/javascript/openerp/openerp.base.js:335 |
2348 | 93 | msgid "Loading" | 100 | msgid "Loading" |
2350 | 94 | msgstr "" | 101 | msgstr "Läser in" |
2351 | 95 | 102 | ||
2352 | 96 | #: static/javascript/openerp/openerp.ui.tips.js:51 | 103 | #: static/javascript/openerp/openerp.ui.tips.js:51 |
2353 | 97 | msgid "Object" | 104 | msgid "Object" |
2354 | 98 | 105 | ||
2355 | === modified file 'addons/openerp/po/javascript/th.po' | |||
2356 | --- addons/openerp/po/javascript/th.po 2011-08-04 05:14:27 +0000 | |||
2357 | +++ addons/openerp/po/javascript/th.po 2012-11-15 08:05:25 +0000 | |||
2358 | @@ -14,8 +14,13 @@ | |||
2359 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2360 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2361 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2362 | 17 | <<<<<<< TREE | ||
2363 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
2364 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
2365 | 20 | ======= | ||
2366 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
2367 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
2368 | 23 | >>>>>>> MERGE-SOURCE | ||
2369 | 19 | 24 | ||
2370 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
2371 | 21 | #, python-format | 26 | #, python-format |
2372 | 22 | 27 | ||
2373 | === modified file 'addons/openerp/po/javascript/tr.po' | |||
2374 | --- addons/openerp/po/javascript/tr.po 2011-08-04 05:14:27 +0000 | |||
2375 | +++ addons/openerp/po/javascript/tr.po 2012-11-15 08:05:25 +0000 | |||
2376 | @@ -8,23 +8,29 @@ | |||
2377 | 8 | "Project-Id-Version: openobject-client-web\n" | 8 | "Project-Id-Version: openobject-client-web\n" |
2378 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2379 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
2382 | 11 | "PO-Revision-Date: 2011-04-27 13:36+0000\n" | 11 | "PO-Revision-Date: 2012-07-29 20:56+0000\n" |
2383 | 12 | "Last-Translator: Caner Başaran <Unknown>\n" | 12 | "Last-Translator: Ayhan KIZILTAN <Unknown>\n" |
2384 | 13 | "Language-Team: Turkish <tr@li.org>\n" | 13 | "Language-Team: Turkish <tr@li.org>\n" |
2385 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2386 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2387 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2388 | 17 | <<<<<<< TREE | ||
2389 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
2390 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
2391 | 20 | ======= | ||
2392 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
2393 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
2394 | 23 | >>>>>>> MERGE-SOURCE | ||
2395 | 19 | 24 | ||
2396 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
2397 | 21 | #, python-format | 26 | #, python-format |
2398 | 22 | msgid "You selected to open %(tabs)s tabs - do you want to continue?" | 27 | msgid "You selected to open %(tabs)s tabs - do you want to continue?" |
2400 | 23 | msgstr "Sekmelerini %(tabs) seçtiniz - Devam etmek istiyor musunuz?" | 28 | msgstr "" |
2401 | 29 | "Açmak için %(tabs) sekmelerini seçtiniz - Devam etmek istiyor musunuz?" | ||
2402 | 24 | 30 | ||
2403 | 25 | #: static/javascript/form.js:169 | 31 | #: static/javascript/form.js:169 |
2404 | 26 | msgid "Invalid form, correct red fields." | 32 | msgid "Invalid form, correct red fields." |
2406 | 27 | msgstr "Hatalı form, kırmızı alanların düzeltiniz." | 33 | msgstr "Geçersiz biçim, kırmızı alanları düzeltiniz." |
2407 | 28 | 34 | ||
2408 | 29 | #: static/javascript/form.js:204 | 35 | #: static/javascript/form.js:204 |
2409 | 30 | msgid "Do you really want to delete this record?" | 36 | msgid "Do you really want to delete this record?" |
2410 | @@ -44,8 +50,7 @@ | |||
2411 | 44 | 50 | ||
2412 | 45 | #: static/javascript/form.js:1161 | 51 | #: static/javascript/form.js:1161 |
2413 | 46 | msgid "No record selected ! You can only attach to existing record." | 52 | msgid "No record selected ! You can only attach to existing record." |
2416 | 47 | msgstr "" | 53 | msgstr "Hiç kayıt seçilmedi! Sadece varolan kayıta ekleyebilirsiniz." |
2415 | 48 | "Hiç Kayıt seçilmedi! Sadece oluşturulmuş bir kayda ek ekleyebilirsiniz." | ||
2417 | 49 | 54 | ||
2418 | 50 | #: static/javascript/form.js:1220 | 55 | #: static/javascript/form.js:1220 |
2419 | 51 | msgid "OpenERP - Error" | 56 | msgid "OpenERP - Error" |
2420 | @@ -56,20 +61,20 @@ | |||
2421 | 56 | "Warning, the record has been modified,\n" | 61 | "Warning, the record has been modified,\n" |
2422 | 57 | "your changes will be discarded." | 62 | "your changes will be discarded." |
2423 | 58 | msgstr "" | 63 | msgstr "" |
2425 | 59 | "Dikkat, Bu kayıt değiştirilmiş,\n" | 64 | "Uyarı, Bu kayıt değiştirilmiş,\n" |
2426 | 60 | "yaptığınız değişiklikler gözardı edilecek." | 65 | "yaptığınız değişiklikler gözardı edilecek." |
2427 | 61 | 66 | ||
2428 | 62 | #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123 | 67 | #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123 |
2429 | 63 | msgid "To edit Record, please first save it." | 68 | msgid "To edit Record, please first save it." |
2431 | 64 | msgstr "Bu kaydı düzenlemek için önce kaydetmeniz gerekiyor." | 69 | msgstr "Kaydı düzenlemek için lütfen önce kaydedin." |
2432 | 65 | 70 | ||
2433 | 66 | #: static/javascript/listgrid.js:650 | 71 | #: static/javascript/listgrid.js:650 |
2434 | 67 | msgid "Do you really want to delete selected record(s) ?" | 72 | msgid "Do you really want to delete selected record(s) ?" |
2436 | 68 | msgstr "Bu kayıt(lar)ı silmek istediğinden emin misin?" | 73 | msgstr "Seçili kayıt(lar)ı silmek istediğinize emin misiniz?" |
2437 | 69 | 74 | ||
2438 | 70 | #: static/javascript/m2o.js:526 | 75 | #: static/javascript/m2o.js:526 |
2439 | 71 | msgid "error in display::" | 76 | msgid "error in display::" |
2441 | 72 | msgstr "ekranda hata::" | 77 | msgstr "görüntüde hata::" |
2442 | 73 | 78 | ||
2443 | 74 | #: static/javascript/o2m.js:67 | 79 | #: static/javascript/o2m.js:67 |
2444 | 75 | msgid "Do you really want to delete record ?" | 80 | msgid "Do you really want to delete record ?" |
2445 | @@ -81,15 +86,15 @@ | |||
2446 | 81 | 86 | ||
2447 | 82 | #: static/javascript/viewed.js:63 | 87 | #: static/javascript/viewed.js:63 |
2448 | 83 | msgid "Do you really want to remove this node?" | 88 | msgid "Do you really want to remove this node?" |
2450 | 84 | msgstr "Bu kayıtı gerçekten silmek istiyor musunuz?" | 89 | msgstr "Bu düğümü silmek istediğinize emin misiniz?" |
2451 | 85 | 90 | ||
2452 | 86 | #: static/javascript/viewed.js:329 | 91 | #: static/javascript/viewed.js:329 |
2453 | 87 | msgid "Do you really wants to create an inherited view here?" | 92 | msgid "Do you really wants to create an inherited view here?" |
2455 | 88 | msgstr "Bağlantılı görünüm oluşturmak istediğinden emin misin?" | 93 | msgstr "Devralınmış görünüm oluşturmak istediğinden emin misin?" |
2456 | 89 | 94 | ||
2457 | 90 | #: static/javascript/openerp/openerp.base.js:127 | 95 | #: static/javascript/openerp/openerp.base.js:127 |
2458 | 91 | msgid "doLoadingSuccess: Cannot parse JSON" | 96 | msgid "doLoadingSuccess: Cannot parse JSON" |
2460 | 92 | msgstr "doLoadingSuccess: Parse edilemedi JSON" | 97 | msgstr "doLoadingSuccess: JSON ayrıştırılamıyor" |
2461 | 93 | 98 | ||
2462 | 94 | #: static/javascript/openerp/openerp.base.js:335 | 99 | #: static/javascript/openerp/openerp.base.js:335 |
2463 | 95 | msgid "Loading" | 100 | msgid "Loading" |
2464 | 96 | 101 | ||
2465 | === modified file 'addons/openerp/po/javascript/uk.po' | |||
2466 | --- addons/openerp/po/javascript/uk.po 2011-08-04 05:14:27 +0000 | |||
2467 | +++ addons/openerp/po/javascript/uk.po 2012-11-15 08:05:25 +0000 | |||
2468 | @@ -14,8 +14,13 @@ | |||
2469 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2470 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2471 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2472 | 17 | <<<<<<< TREE | ||
2473 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
2474 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
2475 | 20 | ======= | ||
2476 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
2477 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
2478 | 23 | >>>>>>> MERGE-SOURCE | ||
2479 | 19 | 24 | ||
2480 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
2481 | 21 | #, python-format | 26 | #, python-format |
2482 | 22 | 27 | ||
2483 | === modified file 'addons/openerp/po/javascript/zh_CN.po' | |||
2484 | --- addons/openerp/po/javascript/zh_CN.po 2011-08-04 05:14:27 +0000 | |||
2485 | +++ addons/openerp/po/javascript/zh_CN.po 2012-11-15 08:05:25 +0000 | |||
2486 | @@ -14,8 +14,13 @@ | |||
2487 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2488 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2489 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2490 | 17 | <<<<<<< TREE | ||
2491 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n" |
2492 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
2493 | 20 | ======= | ||
2494 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
2495 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
2496 | 23 | >>>>>>> MERGE-SOURCE | ||
2497 | 19 | 24 | ||
2498 | 20 | #: static/javascript/form.js:92 | 25 | #: static/javascript/form.js:92 |
2499 | 21 | #, python-format | 26 | #, python-format |
2500 | 22 | 27 | ||
2501 | === added file 'addons/openerp/po/javascript/zh_TW.po' | |||
2502 | --- addons/openerp/po/javascript/zh_TW.po 1970-01-01 00:00:00 +0000 | |||
2503 | +++ addons/openerp/po/javascript/zh_TW.po 2012-11-15 08:05:25 +0000 | |||
2504 | @@ -0,0 +1,101 @@ | |||
2505 | 1 | # Chinese (Traditional) translation for openobject-client-web | ||
2506 | 2 | # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 | ||
2507 | 3 | # This file is distributed under the same license as the openobject-client-web package. | ||
2508 | 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, 2011. | ||
2509 | 5 | # | ||
2510 | 6 | msgid "" | ||
2511 | 7 | msgstr "" | ||
2512 | 8 | "Project-Id-Version: openobject-client-web\n" | ||
2513 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
2514 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | ||
2515 | 11 | "PO-Revision-Date: 2011-12-04 16:15+0000\n" | ||
2516 | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
2517 | 13 | "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n" | ||
2518 | 14 | "MIME-Version: 1.0\n" | ||
2519 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | ||
2520 | 16 | "Content-Transfer-Encoding: 8bit\n" | ||
2521 | 17 | "X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n" | ||
2522 | 18 | "X-Generator: Launchpad (build 16179)\n" | ||
2523 | 19 | |||
2524 | 20 | #: static/javascript/form.js:92 | ||
2525 | 21 | #, python-format | ||
2526 | 22 | msgid "You selected to open %(tabs)s tabs - do you want to continue?" | ||
2527 | 23 | msgstr "" | ||
2528 | 24 | |||
2529 | 25 | #: static/javascript/form.js:169 | ||
2530 | 26 | msgid "Invalid form, correct red fields." | ||
2531 | 27 | msgstr "" | ||
2532 | 28 | |||
2533 | 29 | #: static/javascript/form.js:204 | ||
2534 | 30 | msgid "Do you really want to delete this record?" | ||
2535 | 31 | msgstr "" | ||
2536 | 32 | |||
2537 | 33 | #: static/javascript/form.js:960 | ||
2538 | 34 | msgid "You must select one or several records !" | ||
2539 | 35 | msgstr "" | ||
2540 | 36 | |||
2541 | 37 | #: static/javascript/form.js:995 | ||
2542 | 38 | msgid "You must save this record to perform the action !" | ||
2543 | 39 | msgstr "必須儲存此紀錄以進行動作!" | ||
2544 | 40 | |||
2545 | 41 | #: static/javascript/form.js:1127 | ||
2546 | 42 | msgid "Do you really want to delete the attachment" | ||
2547 | 43 | msgstr "" | ||
2548 | 44 | |||
2549 | 45 | #: static/javascript/form.js:1161 | ||
2550 | 46 | msgid "No record selected ! You can only attach to existing record." | ||
2551 | 47 | msgstr "" | ||
2552 | 48 | |||
2553 | 49 | #: static/javascript/form.js:1220 | ||
2554 | 50 | msgid "OpenERP - Error" | ||
2555 | 51 | msgstr "" | ||
2556 | 52 | |||
2557 | 53 | #: static/javascript/form.js:1291 | ||
2558 | 54 | msgid "" | ||
2559 | 55 | "Warning, the record has been modified,\n" | ||
2560 | 56 | "your changes will be discarded." | ||
2561 | 57 | msgstr "" | ||
2562 | 58 | |||
2563 | 59 | #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123 | ||
2564 | 60 | msgid "To edit Record, please first save it." | ||
2565 | 61 | msgstr "" | ||
2566 | 62 | |||
2567 | 63 | #: static/javascript/listgrid.js:650 | ||
2568 | 64 | msgid "Do you really want to delete selected record(s) ?" | ||
2569 | 65 | msgstr "" | ||
2570 | 66 | |||
2571 | 67 | #: static/javascript/m2o.js:526 | ||
2572 | 68 | msgid "error in display::" | ||
2573 | 69 | msgstr "" | ||
2574 | 70 | |||
2575 | 71 | #: static/javascript/o2m.js:67 | ||
2576 | 72 | msgid "Do you really want to delete record ?" | ||
2577 | 73 | msgstr "" | ||
2578 | 74 | |||
2579 | 75 | #: static/javascript/search.js:285 | ||
2580 | 76 | msgid "Invalid Value" | ||
2581 | 77 | msgstr "" | ||
2582 | 78 | |||
2583 | 79 | #: static/javascript/viewed.js:63 | ||
2584 | 80 | msgid "Do you really want to remove this node?" | ||
2585 | 81 | msgstr "" | ||
2586 | 82 | |||
2587 | 83 | #: static/javascript/viewed.js:329 | ||
2588 | 84 | msgid "Do you really wants to create an inherited view here?" | ||
2589 | 85 | msgstr "" | ||
2590 | 86 | |||
2591 | 87 | #: static/javascript/openerp/openerp.base.js:127 | ||
2592 | 88 | msgid "doLoadingSuccess: Cannot parse JSON" | ||
2593 | 89 | msgstr "" | ||
2594 | 90 | |||
2595 | 91 | #: static/javascript/openerp/openerp.base.js:335 | ||
2596 | 92 | msgid "Loading" | ||
2597 | 93 | msgstr "" | ||
2598 | 94 | |||
2599 | 95 | #: static/javascript/openerp/openerp.ui.tips.js:51 | ||
2600 | 96 | msgid "Object" | ||
2601 | 97 | msgstr "" | ||
2602 | 98 | |||
2603 | 99 | #: static/javascript/openerp/openerp.ui.tips.js:52 | ||
2604 | 100 | msgid "Field" | ||
2605 | 101 | msgstr "" | ||
2606 | 0 | 102 | ||
2607 | === modified file 'addons/openerp/po/messages/ar.po' | |||
2608 | --- addons/openerp/po/messages/ar.po 2011-08-04 05:14:27 +0000 | |||
2609 | +++ addons/openerp/po/messages/ar.po 2012-11-15 08:05:25 +0000 | |||
2610 | @@ -8,14 +8,19 @@ | |||
2611 | 8 | "Project-Id-Version: openobject-client-web\n" | 8 | "Project-Id-Version: openobject-client-web\n" |
2612 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2613 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
2616 | 11 | "PO-Revision-Date: 2011-03-26 15:22+0000\n" | 11 | "PO-Revision-Date: 2011-09-02 22:08+0000\n" |
2617 | 12 | "Last-Translator: kifcaliph <kifcaliph@hotmail.com>\n" | 12 | "Last-Translator: kifcaliph <Unknown>\n" |
2618 | 13 | "Language-Team: Arabic <ar@li.org>\n" | 13 | "Language-Team: Arabic <ar@li.org>\n" |
2619 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2620 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2621 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2622 | 17 | <<<<<<< TREE | ||
2623 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:13+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:13+0000\n" |
2624 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
2625 | 20 | ======= | ||
2626 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:10+0000\n" | ||
2627 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
2628 | 23 | >>>>>>> MERGE-SOURCE | ||
2629 | 19 | 24 | ||
2630 | 20 | #: validators.py:75 | 25 | #: validators.py:75 |
2631 | 21 | msgid "Invalid literal for float" | 26 | msgid "Invalid literal for float" |
2632 | @@ -967,7 +972,7 @@ | |||
2633 | 967 | 972 | ||
2634 | 968 | #: controllers/templates/header.mako:66 controllers/templates/header.mako:69 | 973 | #: controllers/templates/header.mako:66 controllers/templates/header.mako:69 |
2635 | 969 | msgid "About" | 974 | msgid "About" |
2637 | 970 | msgstr "عن" | 975 | msgstr "عن النظام" |
2638 | 971 | 976 | ||
2639 | 972 | #: controllers/templates/header.mako:73 controllers/templates/header.mako:75 | 977 | #: controllers/templates/header.mako:73 controllers/templates/header.mako:75 |
2640 | 973 | msgid "Help" | 978 | msgid "Help" |
2641 | @@ -1577,79 +1582,3 @@ | |||
2642 | 1577 | #: widgets/templates/listgrid/listgrid.mako:194 | 1582 | #: widgets/templates/listgrid/listgrid.mako:194 |
2643 | 1578 | msgid "Delete record(s)." | 1583 | msgid "Delete record(s)." |
2644 | 1579 | msgstr "حذف السجل او السجلات." | 1584 | msgstr "حذف السجل او السجلات." |
2645 | 1580 | |||
2646 | 1581 | #~ msgid "Click here to add new image." | ||
2647 | 1582 | #~ msgstr "إضغط لإضافة صورة جديدة" | ||
2648 | 1583 | |||
2649 | 1584 | #~ msgid "Add Resource:" | ||
2650 | 1585 | #~ msgstr "إضافة مصدر:" | ||
2651 | 1586 | |||
2652 | 1587 | #~ msgid "Image" | ||
2653 | 1588 | #~ msgstr "صوره" | ||
2654 | 1589 | |||
2655 | 1590 | #~ msgid "You do not have a valid OpenERP publisher warranty contract !" | ||
2656 | 1591 | #~ msgstr "لا يوجد لديك عقد ضمان صحيح من الناشر للـ OpenERP" | ||
2657 | 1592 | |||
2658 | 1593 | #~ msgid "" | ||
2659 | 1594 | #~ "If you are using OpenERP in production, it is recommended to have\n" | ||
2660 | 1595 | #~ "a publisher warranty program.\n" | ||
2661 | 1596 | #~ "\n" | ||
2662 | 1597 | #~ "The OpenERP publisher warranty contract provides you with bug fix guarantees " | ||
2663 | 1598 | #~ "and an\n" | ||
2664 | 1599 | #~ "automatic migration system so that we can start working on your problems " | ||
2665 | 1600 | #~ "within a few\n" | ||
2666 | 1601 | #~ "hours.\n" | ||
2667 | 1602 | #~ "\n" | ||
2668 | 1603 | #~ "With a publisher warranty contract, errors such as this one can be sent " | ||
2669 | 1604 | #~ "directly to the OpenERP\n" | ||
2670 | 1605 | #~ "team for review and evaluation.\n" | ||
2671 | 1606 | #~ "\n" | ||
2672 | 1607 | #~ "The publisher warranty program offers you:\n" | ||
2673 | 1608 | #~ "* Automatic migrations on new versions,\n" | ||
2674 | 1609 | #~ "* A bugfix guarantee,\n" | ||
2675 | 1610 | #~ "* Monthly announces of potential bugs and their fixes,\n" | ||
2676 | 1611 | #~ "* Security alerts by email and automatic migration,\n" | ||
2677 | 1612 | #~ "* Access to the customer portal.\n" | ||
2678 | 1613 | #~ msgstr "" | ||
2679 | 1614 | #~ "إذا كنت تستخدم OpenERP للإنتاج، فإنه من المفضل الحصول\n" | ||
2680 | 1615 | #~ "علي عقد ضمان من الناشر.\n" | ||
2681 | 1616 | #~ "\n" | ||
2682 | 1617 | #~ "يتضمن عقد الضمان من الناشر توفير حلول لمشاكل النظام و نقل\n" | ||
2683 | 1618 | #~ "تلقائي للنظام و ذلك للبدء في حل مشاكلك في ساعات قليلة.\n" | ||
2684 | 1619 | #~ "\n" | ||
2685 | 1620 | #~ "مع عقد الضمان، مثل هذه الأخطاء يتم إرسالها مباشرة إلي فريق عمل\n" | ||
2686 | 1621 | #~ "OpenERP للنظر فيها و التحليل.\n" | ||
2687 | 1622 | #~ "\n" | ||
2688 | 1623 | #~ "إن عقد الضمان يتيح لك:\n" | ||
2689 | 1624 | #~ "* النقل التلقائي للإصدارات الجديدة.\n" | ||
2690 | 1625 | #~ "* ضمان تصحيح أخطاء البرنامج.\n" | ||
2691 | 1626 | #~ "* سلامة أمن النظام\n" | ||
2692 | 1627 | #~ "* الدع م الفني اللازم\n" | ||
2693 | 1628 | |||
2694 | 1629 | #~ msgid "" | ||
2695 | 1630 | #~ "Your publisher warranty contract does not cover all modules installed in " | ||
2696 | 1631 | #~ "your system !\n" | ||
2697 | 1632 | #~ "If you are using OpenERP in production, it is highly suggested to upgrade " | ||
2698 | 1633 | #~ "your\n" | ||
2699 | 1634 | #~ "contract.\n" | ||
2700 | 1635 | #~ "\n" | ||
2701 | 1636 | #~ "If you have developed your own modules or installed third party module, we\n" | ||
2702 | 1637 | #~ "can provide you an additional publisher warranty contract for these modules. " | ||
2703 | 1638 | #~ "After\n" | ||
2704 | 1639 | #~ "having reviewed your modules, our quality team will ensure they will " | ||
2705 | 1640 | #~ "migrate\n" | ||
2706 | 1641 | #~ "automatically for all future stable versions of OpenERP at no extra cost.\n" | ||
2707 | 1642 | #~ "\n" | ||
2708 | 1643 | #~ "Here is the list of modules not covered by your publisher warranty contract:" | ||
2709 | 1644 | #~ msgstr "" | ||
2710 | 1645 | #~ "لا يشمل عقد الضمان جميع الأكواد التي تم تنصيبها علي النظام!\n" | ||
2711 | 1646 | #~ "إذا كنت تستخدم OpenERP للإنتاج، فإنه من الأفضل لك تحديث\n" | ||
2712 | 1647 | #~ "عقد الضمان.\n" | ||
2713 | 1648 | #~ "\n" | ||
2714 | 1649 | #~ "إذا قمت بتطوير أكواد خاصة لك أو إستخدمت أكواد من شركات أخري غير OpenERP، " | ||
2715 | 1650 | #~ "فنحن\n" | ||
2716 | 1651 | #~ "يمكننا أيضاً تقديم عقد ضمان نشر إضافي لهذه الأكواد ايضاً، و ذلك بعد\n" | ||
2717 | 1652 | #~ "ان يتم إستعراض هذه الأكواد، ليقوم فريق الجودة لتأكيد و لدعم النقل\n" | ||
2718 | 1653 | #~ "التلقائي لكل الإصدارات الحديثة لنظام OpenERP و ذلك دون أي تكلفة\n" | ||
2719 | 1654 | #~ "\n" | ||
2720 | 1655 | #~ "هذه قائمة بـ بجميع الأكواد التي لا تشتمل علي ضمان الناشر:" | ||
2721 | 1656 | 1585 | ||
2722 | === modified file 'addons/openerp/po/messages/bg.po' | |||
2723 | --- addons/openerp/po/messages/bg.po 2011-08-04 05:14:27 +0000 | |||
2724 | +++ addons/openerp/po/messages/bg.po 2012-11-15 08:05:25 +0000 | |||
2725 | @@ -8,14 +8,19 @@ | |||
2726 | 8 | "Project-Id-Version: openobject-client-web\n" | 8 | "Project-Id-Version: openobject-client-web\n" |
2727 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2728 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
2730 | 11 | "PO-Revision-Date: 2011-03-27 16:44+0000\n" | 11 | "PO-Revision-Date: 2012-03-01 16:57+0000\n" |
2731 | 12 | "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n" | 12 | "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n" |
2732 | 13 | "Language-Team: Bulgarian <bg@li.org>\n" | 13 | "Language-Team: Bulgarian <bg@li.org>\n" |
2733 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2734 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2735 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2736 | 17 | <<<<<<< TREE | ||
2737 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:13+0000\n" | 18 | "X-Launchpad-Export-Date: 2011-08-04 05:13+0000\n" |
2738 | 18 | "X-Generator: Launchpad (build 13573)\n" | 19 | "X-Generator: Launchpad (build 13573)\n" |
2739 | 20 | ======= | ||
2740 | 21 | "X-Launchpad-Export-Date: 2012-10-23 05:10+0000\n" | ||
2741 | 22 | "X-Generator: Launchpad (build 16179)\n" | ||
2742 | 23 | >>>>>>> MERGE-SOURCE | ||
2743 | 19 | 24 | ||
2744 | 20 | #: validators.py:75 | 25 | #: validators.py:75 |
2745 | 21 | msgid "Invalid literal for float" | 26 | msgid "Invalid literal for float" |
2746 | @@ -64,7 +69,7 @@ | |||
2747 | 64 | #: validators.py:256 | 69 | #: validators.py:256 |
2748 | 65 | #, python-format | 70 | #, python-format |
2749 | 66 | msgid "You must provide a full domain name (like %(domain)s.com)" | 71 | msgid "You must provide a full domain name (like %(domain)s.com)" |
2751 | 67 | msgstr "" | 72 | msgstr "Трябва да предоставите пълни име на домейн (напр. %(domain)s.com)" |
2752 | 68 | 73 | ||
2753 | 69 | #: validators.py:260 | 74 | #: validators.py:260 |
2754 | 70 | msgid "Please enter an integer value" | 75 | msgid "Please enter an integer value" |
2755 | @@ -190,6 +195,8 @@ | |||
2756 | 190 | "This is the password of the 'admin' user that will be created in your new " | 195 | "This is the password of the 'admin' user that will be created in your new " |
2757 | 191 | "database. It has to be the same than the above field." | 196 | "database. It has to be the same than the above field." |
2758 | 192 | msgstr "" | 197 | msgstr "" |
2759 | 198 | "Това е паролата на \"ADMIN\" потрбителят, който ще бъде създаден в новата " | ||
2760 | 199 | "база данни. Трябва да бъде еднакъв с горното поле." | ||
2761 | 193 | 200 | ||
2762 | 194 | #: controllers/database.py:79 | 201 | #: controllers/database.py:79 |
2763 | 195 | msgid "Drop database" | 202 | msgid "Drop database" |
2764 | @@ -1567,12 +1574,3 @@ | |||
2765 | 1567 | #: widgets/templates/listgrid/listgrid.mako:194 | 1574 | #: widgets/templates/listgrid/listgrid.mako:194 |
2766 | 1568 | msgid "Delete record(s)." | 1575 | msgid "Delete record(s)." |
2767 | 1569 | msgstr "Изтриване на запис(и)." | 1576 | msgstr "Изтриване на запис(и)." |
2768 | 1570 | |||
2769 | 1571 | #~ msgid "Image" | ||
2770 | 1572 | #~ msgstr "Изображение" | ||
2771 | 1573 | |||
2772 | 1574 | #~ msgid "Add Resource:" | ||
2773 | 1575 | #~ msgstr "Добави ресурс" | ||
2774 | 1576 | |||
2775 | 1577 | #~ msgid "Click here to add new image." | ||
2776 | 1578 | #~ msgstr "Натиснете за да добавите ново изображение." | ||
2777 | 1579 | 1577 | ||
2778 | === added file 'addons/openerp/po/messages/bn.po' | |||
2779 | --- addons/openerp/po/messages/bn.po 1970-01-01 00:00:00 +0000 | |||
2780 | +++ addons/openerp/po/messages/bn.po 2012-11-15 08:05:25 +0000 | |||
2781 | @@ -0,0 +1,1540 @@ | |||
2782 | 1 | # Bengali translation for openobject-client-web | ||
2783 | 2 | # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 | ||
2784 | 3 | # This file is distributed under the same license as the openobject-client-web package. | ||
2785 | 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, 2011. | ||
2786 | 5 | # | ||
2787 | 6 | msgid "" | ||
2788 | 7 | msgstr "" | ||
2789 | 8 | "Project-Id-Version: openobject-client-web\n" | ||
2790 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
2791 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | ||
2792 | 11 | "PO-Revision-Date: 2011-12-02 07:14+0000\n" | ||
2793 | 12 | "Last-Translator: Kaustav Das Modak <kaustav.dasmodak@yahoo.co.in>\n" | ||
2794 | 13 | "Language-Team: Bengali <bn@li.org>\n" | ||
2795 | 14 | "MIME-Version: 1.0\n" | ||
2796 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | ||
2797 | 16 | "Content-Transfer-Encoding: 8bit\n" | ||
2798 | 17 | "X-Launchpad-Export-Date: 2012-10-23 05:10+0000\n" | ||
2799 | 18 | "X-Generator: Launchpad (build 16179)\n" | ||
2800 | 19 | |||
2801 | 20 | #: validators.py:75 | ||
2802 | 21 | msgid "Invalid literal for float" | ||
2803 | 22 | msgstr "" | ||
2804 | 23 | |||
2805 | 24 | #: validators.py:114 validators.py:119 validators.py:262 | ||
2806 | 25 | msgid "Invalid datetime format" | ||
2807 | 26 | msgstr "" | ||
2808 | 27 | |||
2809 | 28 | #: validators.py:166 | ||
2810 | 29 | msgid "Please select a file." | ||
2811 | 30 | msgstr "অনুগ্রহ করে একটি ফাইল নির্বাচন করুন" | ||
2812 | 31 | |||
2813 | 32 | #: validators.py:247 | ||
2814 | 33 | msgid "Please enter an email address" | ||
2815 | 34 | msgstr "অনুগ্রহ করে একটি ই-মেল ঠিকানা লিখুন" | ||
2816 | 35 | |||
2817 | 36 | #: validators.py:248 | ||
2818 | 37 | msgid "An email address must contain a single @" | ||
2819 | 38 | msgstr "ই-মেল ঠিকানাতে একটি @ চিহ্ন থাকা উচিৎ" | ||
2820 | 39 | |||
2821 | 40 | #: validators.py:249 | ||
2822 | 41 | #, python-format | ||
2823 | 42 | msgid "" | ||
2824 | 43 | "The username portion of the email address is invalid (the portion before the " | ||
2825 | 44 | "@: %(username)s)" | ||
2826 | 45 | msgstr "" | ||
2827 | 46 | "ই-মেল ঠিকানায় ব্যবহারকারীর নামের অংশটি অবৈধ্য (@ ছিহ্নের আগের অংশটি: " | ||
2828 | 47 | "%(username)s)" | ||
2829 | 48 | |||
2830 | 49 | #: validators.py:250 | ||
2831 | 50 | #, python-format | ||
2832 | 51 | msgid "" | ||
2833 | 52 | "The domain portion of the email address is invalid (the portion after the @: " | ||
2834 | 53 | "%(domain)s)" | ||
2835 | 54 | msgstr "" | ||
2836 | 55 | "ই-মেল ঠিকানায় ডোমেন নামের অংশটি অবৈধ্য (@ ছিহ্নের পরের অংশটি: %(domain)s)" | ||
2837 | 56 | |||
2838 | 57 | #: validators.py:254 | ||
2839 | 58 | msgid "You must start your URL with http://, https://, etc" | ||
2840 | 59 | msgstr "ইউআরএল http://, https://, ইত্যাদি দিয়ে শুরু হওয়া উচিৎ" | ||
2841 | 60 | |||
2842 | 61 | #: validators.py:255 | ||
2843 | 62 | msgid "That is not a valid URL" | ||
2844 | 63 | msgstr "" | ||
2845 | 64 | |||
2846 | 65 | #: validators.py:256 | ||
2847 | 66 | #, python-format | ||
2848 | 67 | msgid "You must provide a full domain name (like %(domain)s.com)" | ||
2849 | 68 | msgstr "" | ||
2850 | 69 | |||
2851 | 70 | #: validators.py:260 | ||
2852 | 71 | msgid "Please enter an integer value" | ||
2853 | 72 | msgstr "" | ||
2854 | 73 | |||
2855 | 74 | #: validators.py:261 | ||
2856 | 75 | msgid "Please enter a number" | ||
2857 | 76 | msgstr "" | ||
2858 | 77 | |||
2859 | 78 | #: controllers/actions.py:94 | ||
2860 | 79 | msgid "Invalid View" | ||
2861 | 80 | msgstr "" | ||
2862 | 81 | |||
2863 | 82 | #: controllers/actions.py:127 | ||
2864 | 83 | msgid "Error no report" | ||
2865 | 84 | msgstr "" | ||
2866 | 85 | |||
2867 | 86 | #: controllers/actions.py:153 | ||
2868 | 87 | msgid "Nothing to print" | ||
2869 | 88 | msgstr "" | ||
2870 | 89 | |||
2871 | 90 | #: controllers/actions.py:173 | ||
2872 | 91 | msgid "Printing aborted, too long delay" | ||
2873 | 92 | msgstr "" | ||
2874 | 93 | |||
2875 | 94 | #: controllers/actions.py:397 | ||
2876 | 95 | msgid "Relative URLs are not supported" | ||
2877 | 96 | msgstr "" | ||
2878 | 97 | |||
2879 | 98 | #: controllers/actions.py:425 | ||
2880 | 99 | msgid "Action not found" | ||
2881 | 100 | msgstr "" | ||
2882 | 101 | |||
2883 | 102 | #: controllers/actions.py:474 | ||
2884 | 103 | msgid "No action defined" | ||
2885 | 104 | msgstr "" | ||
2886 | 105 | |||
2887 | 106 | #: controllers/attachment.py:55 | ||
2888 | 107 | msgid "No record selected, You can only attach to existing record..." | ||
2889 | 108 | msgstr "" | ||
2890 | 109 | |||
2891 | 110 | #: controllers/database.py:63 | ||
2892 | 111 | msgid "Create database" | ||
2893 | 112 | msgstr "" | ||
2894 | 113 | |||
2895 | 114 | #: controllers/database.py:65 controllers/templates/database.mako:56 | ||
2896 | 115 | #: controllers/templates/search.mako:145 | ||
2897 | 116 | msgid "Create" | ||
2898 | 117 | msgstr "" | ||
2899 | 118 | |||
2900 | 119 | #: controllers/database.py:68 | ||
2901 | 120 | msgid "Super admin password:" | ||
2902 | 121 | msgstr "" | ||
2903 | 122 | |||
2904 | 123 | #: controllers/database.py:68 | ||
2905 | 124 | msgid "" | ||
2906 | 125 | "This is the password of the user that have the rights to administer " | ||
2907 | 126 | "databases. This is not a OpenERP user, just a super administrator. If you " | ||
2908 | 127 | "did not changed it, the password is 'admin' after installation." | ||
2909 | 128 | msgstr "" | ||
2910 | 129 | |||
2911 | 130 | #: controllers/database.py:69 controllers/database.py:101 | ||
2912 | 131 | msgid "New database name:" | ||
2913 | 132 | msgstr "" | ||
2914 | 133 | |||
2915 | 134 | #: controllers/database.py:69 | ||
2916 | 135 | msgid "" | ||
2917 | 136 | "Choose the name of the database that will be created. The name must not " | ||
2918 | 137 | "contain any special character. Exemple: 'terp'." | ||
2919 | 138 | msgstr "" | ||
2920 | 139 | |||
2921 | 140 | #: controllers/database.py:70 | ||
2922 | 141 | msgid "Load Demonstration data:" | ||
2923 | 142 | msgstr "" | ||
2924 | 143 | |||
2925 | 144 | #: controllers/database.py:70 | ||
2926 | 145 | msgid "" | ||
2927 | 146 | "Check this box if you want demonstration data to be installed on your new " | ||
2928 | 147 | "database. These data will help you to understand OpenERP, with predefined " | ||
2929 | 148 | "products, partners, etc." | ||
2930 | 149 | msgstr "" | ||
2931 | 150 | |||
2932 | 151 | #: controllers/database.py:71 | ||
2933 | 152 | msgid "Default Language:" | ||
2934 | 153 | msgstr "" | ||
2935 | 154 | |||
2936 | 155 | #: controllers/database.py:71 | ||
2937 | 156 | msgid "" | ||
2938 | 157 | "Choose the default language that will be installed for this database. You " | ||
2939 | 158 | "will be able to install new languages after installation through the " | ||
2940 | 159 | "administration menu." | ||
2941 | 160 | msgstr "" | ||
2942 | 161 | |||
2943 | 162 | #: controllers/database.py:72 | ||
2944 | 163 | msgid "Administrator password:" | ||
2945 | 164 | msgstr "" | ||
2946 | 165 | |||
2947 | 166 | #: controllers/database.py:72 | ||
2948 | 167 | msgid "" | ||
2949 | 168 | "This is the password of the 'admin' user that will be created in your new " | ||
2950 | 169 | "database." | ||
2951 | 170 | msgstr "" | ||
2952 | 171 | |||
2953 | 172 | #: controllers/database.py:73 | ||
2954 | 173 | msgid "Confirm password:" | ||
2955 | 174 | msgstr "" | ||
2956 | 175 | |||
2957 | 176 | #: controllers/database.py:73 | ||
2958 | 177 | msgid "" | ||
2959 | 178 | "This is the password of the 'admin' user that will be created in your new " | ||
2960 | 179 | "database. It has to be the same than the above field." | ||
2961 | 180 | msgstr "" | ||
2962 | 181 | |||
2963 | 182 | #: controllers/database.py:79 | ||
2964 | 183 | msgid "Drop database" | ||
2965 | 184 | msgstr "" | ||
2966 | 185 | |||
2967 | 186 | #: controllers/database.py:81 controllers/templates/database.mako:58 | ||
2968 | 187 | msgid "Drop" | ||
2969 | 188 | msgstr "" | ||
2970 | 189 | |||
2971 | 190 | #: controllers/database.py:83 controllers/database.py:91 | ||
2972 | 191 | #: controllers/templates/login.mako:43 | ||
2973 | 192 | msgid "Database:" | ||
2974 | 193 | msgstr "" | ||
2975 | 194 | |||
2976 | 195 | #: controllers/database.py:84 controllers/database.py:92 | ||
2977 | 196 | #: controllers/database.py:100 controllers/templates/login.mako:61 | ||
2978 | 197 | #: controllers/templates/login_ajax.mako:78 | ||
2979 | 198 | #: controllers/templates/login_ajax.mako:98 | ||
2980 | 199 | msgid "Password:" | ||
2981 | 200 | msgstr "" | ||
2982 | 201 | |||
2983 | 202 | #: controllers/database.py:88 | ||
2984 | 203 | msgid "Backup database" | ||
2985 | 204 | msgstr "" | ||
2986 | 205 | |||
2987 | 206 | #: controllers/database.py:90 controllers/templates/database.mako:60 | ||
2988 | 207 | msgid "Backup" | ||
2989 | 208 | msgstr "" | ||
2990 | 209 | |||
2991 | 210 | #: controllers/database.py:96 | ||
2992 | 211 | msgid "Restore database" | ||
2993 | 212 | msgstr "" | ||
2994 | 213 | |||
2995 | 214 | #: controllers/database.py:98 controllers/templates/database.mako:62 | ||
2996 | 215 | msgid "Restore" | ||
2997 | 216 | msgstr "" | ||
2998 | 217 | |||
2999 | 218 | #: controllers/database.py:99 | ||
3000 | 219 | msgid "File:" | ||
3001 | 220 | msgstr "" | ||
3002 | 221 | |||
3003 | 222 | #: controllers/database.py:105 | ||
3004 | 223 | msgid "Change Administrator Password" | ||
3005 | 224 | msgstr "" | ||
3006 | 225 | |||
3007 | 226 | #: controllers/database.py:107 controllers/templates/preferences/index.mako:37 | ||
3008 | 227 | msgid "Change Password" | ||
3009 | 228 | msgstr "" | ||
3010 | 229 | |||
3011 | 230 | #: controllers/database.py:108 | ||
3012 | 231 | msgid "Old Password:" | ||
3013 | 232 | msgstr "" | ||
3014 | 233 | |||
3015 | 234 | #: controllers/database.py:109 | ||
3016 | 235 | msgid "New Password:" | ||
3017 | 236 | msgstr "" | ||
3018 | 237 | |||
3019 | 238 | #: controllers/database.py:110 | ||
3020 | 239 | msgid "Confirm Password:" | ||
3021 | 240 | msgstr "" | ||
3022 | 241 | |||
3023 | 242 | #: controllers/database.py:173 | ||
3024 | 243 | msgid "You must avoid all accents, space or special characters." | ||
3025 | 244 | msgstr "" | ||
3026 | 245 | |||
3027 | 246 | #: controllers/database.py:174 | ||
3028 | 247 | msgid "Bad database name" | ||
3029 | 248 | msgstr "" | ||
3030 | 249 | |||
3031 | 250 | #: controllers/database.py:194 | ||
3032 | 251 | msgid "" | ||
3033 | 252 | "The server crashed during installation.\n" | ||
3034 | 253 | "We suggest you to drop this database." | ||
3035 | 254 | msgstr "" | ||
3036 | 255 | |||
3037 | 256 | #: controllers/database.py:195 | ||
3038 | 257 | msgid "Error during database creation" | ||
3039 | 258 | msgstr "" | ||
3040 | 259 | |||
3041 | 260 | #: controllers/database.py:198 controllers/database.py:225 | ||
3042 | 261 | #: controllers/database.py:271 controllers/database.py:294 | ||
3043 | 262 | msgid "Bad super admin password" | ||
3044 | 263 | msgstr "" | ||
3045 | 264 | |||
3046 | 265 | #: controllers/database.py:202 | ||
3047 | 266 | msgid "Could not create database." | ||
3048 | 267 | msgstr "" | ||
3049 | 268 | |||
3050 | 269 | #: controllers/database.py:228 | ||
3051 | 270 | msgid "Could not drop database" | ||
3052 | 271 | msgstr "" | ||
3053 | 272 | |||
3054 | 273 | #: controllers/database.py:251 | ||
3055 | 274 | msgid "Could not create backup." | ||
3056 | 275 | msgstr "" | ||
3057 | 276 | |||
3058 | 277 | #: controllers/database.py:275 | ||
3059 | 278 | msgid "Could not restore database" | ||
3060 | 279 | msgstr "" | ||
3061 | 280 | |||
3062 | 281 | #: controllers/database.py:298 | ||
3063 | 282 | msgid "Error, password not changed." | ||
3064 | 283 | msgstr "" | ||
3065 | 284 | |||
3066 | 285 | #: controllers/error_page.py:79 | ||
3067 | 286 | msgid "" | ||
3068 | 287 | "Your problem has been sent to the quality team\n" | ||
3069 | 288 | "We will recontact you after analysing the problem." | ||
3070 | 289 | msgstr "" | ||
3071 | 290 | |||
3072 | 291 | #: controllers/error_page.py:81 | ||
3073 | 292 | #, python-format | ||
3074 | 293 | msgid "" | ||
3075 | 294 | "Your problem could not be sent to the quality team\n" | ||
3076 | 295 | "Please report this error manually at %s" | ||
3077 | 296 | msgstr "" | ||
3078 | 297 | |||
3079 | 298 | #: controllers/form.py:561 | ||
3080 | 299 | #, python-format | ||
3081 | 300 | msgid "Invalid button type \"%s\"" | ||
3082 | 301 | msgstr "" | ||
3083 | 302 | |||
3084 | 303 | #: controllers/form.py:944 controllers/tree.py:243 | ||
3085 | 304 | msgid "No record selected" | ||
3086 | 305 | msgstr "" | ||
3087 | 306 | |||
3088 | 307 | #: controllers/form.py:949 | ||
3089 | 308 | msgid "Print Screen" | ||
3090 | 309 | msgstr "" | ||
3091 | 310 | |||
3092 | 311 | #: controllers/form.py:1016 widgets/listgrid.py:305 widgets/listgrid.py:366 | ||
3093 | 312 | #: widgets/form/_form.py:910 | ||
3094 | 313 | msgid "Application Error" | ||
3095 | 314 | msgstr "" | ||
3096 | 315 | |||
3097 | 316 | #: controllers/form.py:1016 | ||
3098 | 317 | #, python-format | ||
3099 | 318 | msgid "Wrong on_change trigger: %s" | ||
3100 | 319 | msgstr "" | ||
3101 | 320 | |||
3102 | 321 | #: controllers/form.py:1121 | ||
3103 | 322 | msgid "Open resource" | ||
3104 | 323 | msgstr "" | ||
3105 | 324 | |||
3106 | 325 | #: controllers/form.py:1124 | ||
3107 | 326 | msgid "Set to default value" | ||
3108 | 327 | msgstr "" | ||
3109 | 328 | |||
3110 | 329 | #: controllers/form.py:1125 | ||
3111 | 330 | msgid "Set as default" | ||
3112 | 331 | msgstr "" | ||
3113 | 332 | |||
3114 | 333 | #: controllers/form.py:1132 | ||
3115 | 334 | msgid "Action" | ||
3116 | 335 | msgstr "" | ||
3117 | 336 | |||
3118 | 337 | #: controllers/form.py:1133 | ||
3119 | 338 | msgid "Report" | ||
3120 | 339 | msgstr "" | ||
3121 | 340 | |||
3122 | 341 | #: controllers/impex.py:66 | ||
3123 | 342 | msgid "" | ||
3124 | 343 | "Operation failed\n" | ||
3125 | 344 | "I/O error" | ||
3126 | 345 | msgstr "" | ||
3127 | 346 | |||
3128 | 347 | #: controllers/impex.py:402 | ||
3129 | 348 | msgid "Export Error" | ||
3130 | 349 | msgstr "" | ||
3131 | 350 | |||
3132 | 351 | #: controllers/impex.py:469 | ||
3133 | 352 | msgid "Database ID" | ||
3134 | 353 | msgstr "" | ||
3135 | 354 | |||
3136 | 355 | #: controllers/impex.py:476 | ||
3137 | 356 | msgid "Error opening .CSV file" | ||
3138 | 357 | msgstr "" | ||
3139 | 358 | |||
3140 | 359 | #: controllers/impex.py:476 | ||
3141 | 360 | msgid "Input Error." | ||
3142 | 361 | msgstr "" | ||
3143 | 362 | |||
3144 | 363 | #: controllers/impex.py:498 | ||
3145 | 364 | #, python-format | ||
3146 | 365 | msgid "You cannot import the field '%s', because we cannot auto-detect it" | ||
3147 | 366 | msgstr "" | ||
3148 | 367 | |||
3149 | 368 | #: controllers/impex.py:501 | ||
3150 | 369 | #, python-format | ||
3151 | 370 | msgid "Error processing the first line of the file. Field \"%s\" is unknown" | ||
3152 | 371 | msgstr "" | ||
3153 | 372 | |||
3154 | 373 | #: controllers/impex.py:72 controllers/impex.py:501 | ||
3155 | 374 | msgid "Import Error." | ||
3156 | 375 | msgstr "" | ||
3157 | 376 | |||
3158 | 377 | #: controllers/impex.py:520 | ||
3159 | 378 | msgid "The CSV delimiter must be a single character" | ||
3160 | 379 | msgstr "" | ||
3161 | 380 | |||
3162 | 381 | #: controllers/impex.py:532 | ||
3163 | 382 | msgid "File Format Error" | ||
3164 | 383 | msgstr "" | ||
3165 | 384 | |||
3166 | 385 | #: controllers/impex.py:550 | ||
3167 | 386 | msgid "XML-RPC error" | ||
3168 | 387 | msgstr "" | ||
3169 | 388 | |||
3170 | 389 | #: controllers/impex.py:555 | ||
3171 | 390 | #, python-format | ||
3172 | 391 | msgid "Imported %d objects" | ||
3173 | 392 | msgstr "" | ||
3174 | 393 | |||
3175 | 394 | #: controllers/impex.py:560 | ||
3176 | 395 | #, python-format | ||
3177 | 396 | msgid "Error trying to import this record:%s. ErrorMessage:%s %s" | ||
3178 | 397 | msgstr "" | ||
3179 | 398 | |||
3180 | 399 | #: controllers/impex.py:561 | ||
3181 | 400 | msgid "ImportationError" | ||
3182 | 401 | msgstr "" | ||
3183 | 402 | |||
3184 | 403 | #: controllers/listgrid.py:52 | ||
3185 | 404 | msgid "Parent record doesn't exists..." | ||
3186 | 405 | msgstr "" | ||
3187 | 406 | |||
3188 | 407 | #: controllers/preferences.py:35 | ||
3189 | 408 | msgid "Change your password" | ||
3190 | 409 | msgstr "" | ||
3191 | 410 | |||
3192 | 411 | #: controllers/preferences.py:65 controllers/templates/header.mako:59 | ||
3193 | 412 | msgid "Preferences" | ||
3194 | 413 | msgstr "" | ||
3195 | 414 | |||
3196 | 415 | #: controllers/preferences.py:92 | ||
3197 | 416 | msgid "All passwords have to be filled." | ||
3198 | 417 | msgstr "" | ||
3199 | 418 | |||
3200 | 419 | #: controllers/preferences.py:94 | ||
3201 | 420 | msgid "The new password and its confirmation must be identical." | ||
3202 | 421 | msgstr "" | ||
3203 | 422 | |||
3204 | 423 | #: controllers/preferences.py:103 | ||
3205 | 424 | msgid "Could not change your password." | ||
3206 | 425 | msgstr "" | ||
3207 | 426 | |||
3208 | 427 | #: controllers/preferences.py:105 | ||
3209 | 428 | msgid "Original password incorrect, your password was not changed." | ||
3210 | 429 | msgstr "" | ||
3211 | 430 | |||
3212 | 431 | #: controllers/root.py:174 | ||
3213 | 432 | #, python-format | ||
3214 | 433 | msgid "Version %s" | ||
3215 | 434 | msgstr "" | ||
3216 | 435 | |||
3217 | 436 | #: controllers/translator.py:136 | ||
3218 | 437 | msgid "You need to save the resource before adding translations." | ||
3219 | 438 | msgstr "" | ||
3220 | 439 | |||
3221 | 440 | #: controllers/tree.py:274 | ||
3222 | 441 | msgid "No resource selected" | ||
3223 | 442 | msgstr "" | ||
3224 | 443 | |||
3225 | 444 | #: controllers/utils.py:43 | ||
3226 | 445 | msgid "Could not connect to server" | ||
3227 | 446 | msgstr "" | ||
3228 | 447 | |||
3229 | 448 | #: controllers/utils.py:127 controllers/templates/login_ajax.mako:111 | ||
3230 | 449 | msgid "Bad username or password" | ||
3231 | 450 | msgstr "" | ||
3232 | 451 | |||
3233 | 452 | #: controllers/view_log.py:32 | ||
3234 | 453 | msgid "ID" | ||
3235 | 454 | msgstr "" | ||
3236 | 455 | |||
3237 | 456 | #: controllers/view_log.py:33 | ||
3238 | 457 | msgid "Creation User" | ||
3239 | 458 | msgstr "" | ||
3240 | 459 | |||
3241 | 460 | #: controllers/view_log.py:34 | ||
3242 | 461 | msgid "Creation Date" | ||
3243 | 462 | msgstr "" | ||
3244 | 463 | |||
3245 | 464 | #: controllers/view_log.py:35 | ||
3246 | 465 | msgid "Latest Modification by" | ||
3247 | 466 | msgstr "" | ||
3248 | 467 | |||
3249 | 468 | #: controllers/view_log.py:36 | ||
3250 | 469 | msgid "Latest Modification Date" | ||
3251 | 470 | msgstr "" | ||
3252 | 471 | |||
3253 | 472 | #: controllers/view_log.py:37 | ||
3254 | 473 | msgid "Owner" | ||
3255 | 474 | msgstr "" | ||
3256 | 475 | |||
3257 | 476 | #: controllers/view_log.py:38 | ||
3258 | 477 | msgid "Group Owner" | ||
3259 | 478 | msgstr "" | ||
3260 | 479 | |||
3261 | 480 | #: controllers/view_log.py:39 | ||
3262 | 481 | msgid "Access Level" | ||
3263 | 482 | msgstr "" | ||
3264 | 483 | |||
3265 | 484 | #: controllers/view_log.py:40 | ||
3266 | 485 | msgid "Internal module data ID" | ||
3267 | 486 | msgstr "" | ||
3268 | 487 | |||
3269 | 488 | #: controllers/viewed.py:221 | ||
3270 | 489 | msgid "Invalid view id." | ||
3271 | 490 | msgstr "" | ||
3272 | 491 | |||
3273 | 492 | #: controllers/viewed.py:499 | ||
3274 | 493 | msgid "Unable to create inherited view." | ||
3275 | 494 | msgstr "" | ||
3276 | 495 | |||
3277 | 496 | #: controllers/viewed.py:501 | ||
3278 | 497 | msgid "Can't create inherited view here." | ||
3279 | 498 | msgstr "" | ||
3280 | 499 | |||
3281 | 500 | #: controllers/viewed.py:504 | ||
3282 | 501 | msgid "Not implemented yet!" | ||
3283 | 502 | msgstr "" | ||
3284 | 503 | |||
3285 | 504 | #: controllers/viewed.py:609 | ||
3286 | 505 | msgid "Unable to update the view." | ||
3287 | 506 | msgstr "" | ||
3288 | 507 | |||
3289 | 508 | #: controllers/viewed.py:859 | ||
3290 | 509 | msgid "New Window" | ||
3291 | 510 | msgstr "" | ||
3292 | 511 | |||
3293 | 512 | #: controllers/viewed.py:871 | ||
3294 | 513 | msgid "Save Button" | ||
3295 | 514 | msgstr "" | ||
3296 | 515 | |||
3297 | 516 | #: controllers/viewed.py:871 | ||
3298 | 517 | msgid "Cancel Button" | ||
3299 | 518 | msgstr "" | ||
3300 | 519 | |||
3301 | 520 | #: controllers/viewed.py:871 | ||
3302 | 521 | msgid "Open Button" | ||
3303 | 522 | msgstr "" | ||
3304 | 523 | |||
3305 | 524 | #: controllers/viewed.py:877 | ||
3306 | 525 | msgid "Left" | ||
3307 | 526 | msgstr "" | ||
3308 | 527 | |||
3309 | 528 | #: controllers/viewed.py:877 | ||
3310 | 529 | msgid "Center" | ||
3311 | 530 | msgstr "" | ||
3312 | 531 | |||
3313 | 532 | #: controllers/viewed.py:877 | ||
3314 | 533 | msgid "Right" | ||
3315 | 534 | msgstr "" | ||
3316 | 535 | |||
3317 | 536 | #: controllers/templates/about.mako:4 | ||
3318 | 537 | msgid "About the OpenERP Web" | ||
3319 | 538 | msgstr "" | ||
3320 | 539 | |||
3321 | 540 | #: controllers/templates/about.mako:27 | ||
3322 | 541 | msgid "OpenERP Web" | ||
3323 | 542 | msgstr "" | ||
3324 | 543 | |||
3325 | 544 | #: controllers/templates/about.mako:30 | ||
3326 | 545 | msgid "Copyright © 2006-TODAY OpenERP SA. All Rights Reserved." | ||
3327 | 546 | msgstr "" | ||
3328 | 547 | |||
3329 | 548 | #: controllers/templates/about.mako:31 | ||
3330 | 549 | msgid "OpenERP is a trademark of the OpenERP SA Company." | ||
3331 | 550 | msgstr "" | ||
3332 | 551 | |||
3333 | 552 | #: controllers/templates/about.mako:33 | ||
3334 | 553 | #, python-format | ||
3335 | 554 | msgid "%(ooweb)s is jointly developed by %(tiny)s and %(axelor)s." | ||
3336 | 555 | msgstr "" | ||
3337 | 556 | |||
3338 | 557 | #: controllers/templates/about.mako:39 | ||
3339 | 558 | #, python-format | ||
3340 | 559 | msgid "Licenced under the terms of %(license)s" | ||
3341 | 560 | msgstr "" | ||
3342 | 561 | |||
3343 | 562 | #: controllers/templates/about.mako:42 | ||
3344 | 563 | msgid "About OpenERP" | ||
3345 | 564 | msgstr "" | ||
3346 | 565 | |||
3347 | 566 | #: controllers/templates/about.mako:44 | ||
3348 | 567 | #, python-format | ||
3349 | 568 | msgid "" | ||
3350 | 569 | "%(openobject)s is a free enterprise-scale software system that is designed " | ||
3351 | 570 | "to boost\n" | ||
3352 | 571 | " productivity and profit through data integration. It " | ||
3353 | 572 | "connects, improves and\n" | ||
3354 | 573 | " manages business processes in areas such as sales, " | ||
3355 | 574 | "finance, supply chain,\n" | ||
3356 | 575 | " project management, production, services, CRM, etc..\n" | ||
3357 | 576 | " " | ||
3358 | 577 | msgstr "" | ||
3359 | 578 | |||
3360 | 579 | #: controllers/templates/about.mako:51 | ||
3361 | 580 | msgid "" | ||
3362 | 581 | "The system is platform-independent, and can be installed on Windows, Mac OS " | ||
3363 | 582 | "X,\n" | ||
3364 | 583 | " and various Linux and other Unix-based distributions. " | ||
3365 | 584 | "Its architecture enables\n" | ||
3366 | 585 | " new functionality to be rapidly created, modifications " | ||
3367 | 586 | "to be made to a\n" | ||
3368 | 587 | " production system and migration to a new version to be " | ||
3369 | 588 | "straightforward." | ||
3370 | 589 | msgstr "" | ||
3371 | 590 | |||
3372 | 591 | #: controllers/templates/about.mako:57 | ||
3373 | 592 | msgid "" | ||
3374 | 593 | "Depending on your needs, OpenERP is available through a web or application " | ||
3375 | 594 | "client." | ||
3376 | 595 | msgstr "" | ||
3377 | 596 | |||
3378 | 597 | #: controllers/templates/database.mako:54 controllers/templates/login.mako:4 | ||
3379 | 598 | #: controllers/templates/login.mako:71 controllers/templates/login_ajax.mako:85 | ||
3380 | 599 | #: controllers/templates/login_ajax.mako:104 | ||
3381 | 600 | msgid "Login" | ||
3382 | 601 | msgstr "" | ||
3383 | 602 | |||
3384 | 603 | #: controllers/templates/database.mako:64 | ||
3385 | 604 | msgid "Password" | ||
3386 | 605 | msgstr "" | ||
3387 | 606 | |||
3388 | 607 | #: controllers/templates/error_page.mako:82 | ||
3389 | 608 | #, python-format | ||
3390 | 609 | msgid "An %(error_type)s has been reported." | ||
3391 | 610 | msgstr "" | ||
3392 | 611 | |||
3393 | 612 | #: controllers/templates/error_page.mako:84 | ||
3394 | 613 | msgid "Let me fix it" | ||
3395 | 614 | msgstr "" | ||
3396 | 615 | |||
3397 | 616 | #: controllers/templates/error_page.mako:91 | ||
3398 | 617 | #: controllers/templates/error_page.mako:93 | ||
3399 | 618 | msgid "Fix it for me" | ||
3400 | 619 | msgstr "" | ||
3401 | 620 | |||
3402 | 621 | #: controllers/templates/error_page.mako:99 | ||
3403 | 622 | msgid "Publisher warranty contract." | ||
3404 | 623 | msgstr "" | ||
3405 | 624 | |||
3406 | 625 | #: controllers/templates/error_page.mako:100 | ||
3407 | 626 | msgid "" | ||
3408 | 627 | "Your request will be sent to OpenERP and publisher warranty team will reply " | ||
3409 | 628 | "you shortly." | ||
3410 | 629 | msgstr "" | ||
3411 | 630 | |||
3412 | 631 | #: controllers/templates/error_page.mako:104 | ||
3413 | 632 | msgid "Summary of the problem:" | ||
3414 | 633 | msgstr "" | ||
3415 | 634 | |||
3416 | 635 | #: controllers/templates/error_page.mako:111 | ||
3417 | 636 | msgid "Explain what you did:" | ||
3418 | 637 | msgstr "" | ||
3419 | 638 | |||
3420 | 639 | #: controllers/templates/error_page.mako:120 | ||
3421 | 640 | msgid "Other Comments:" | ||
3422 | 641 | msgstr "" | ||
3423 | 642 | |||
3424 | 643 | #: controllers/templates/error_page.mako:132 | ||
3425 | 644 | msgid "Send to Publisher Warranty Team" | ||
3426 | 645 | msgstr "" | ||
3427 | 646 | |||
3428 | 647 | #: controllers/templates/error_page.mako:159 | ||
3429 | 648 | msgid "Write concurrency warning :" | ||
3430 | 649 | msgstr "" | ||
3431 | 650 | |||
3432 | 651 | #: controllers/templates/error_page.mako:164 | ||
3433 | 652 | msgid "" | ||
3434 | 653 | "This document has been modified while you were editing it.\n" | ||
3435 | 654 | "Choose:\n" | ||
3436 | 655 | "\n" | ||
3437 | 656 | " - \"Cancel\" to cancel saving.\n" | ||
3438 | 657 | " - \"Write anyway\" to save your current version." | ||
3439 | 658 | msgstr "" | ||
3440 | 659 | |||
3441 | 660 | #: controllers/templates/error_page.mako:178 controllers/templates/exp.mako:251 | ||
3442 | 661 | #: controllers/templates/form.mako:141 controllers/templates/openo2m.mako:41 | ||
3443 | 662 | #: controllers/templates/selection.mako:43 | ||
3444 | 663 | #: controllers/templates/viewlist.mako:160 | ||
3445 | 664 | #: controllers/templates/preferences/index.mako:38 | ||
3446 | 665 | #: widgets/templates/listgrid/listgrid.mako:41 | ||
3447 | 666 | msgid "Cancel" | ||
3448 | 667 | msgstr "" | ||
3449 | 668 | |||
3450 | 669 | #: controllers/templates/error_page.mako:179 | ||
3451 | 670 | msgid "Write Anyway" | ||
3452 | 671 | msgstr "" | ||
3453 | 672 | |||
3454 | 673 | #: controllers/templates/exp.mako:151 | ||
3455 | 674 | msgid "Export Data" | ||
3456 | 675 | msgstr "" | ||
3457 | 676 | |||
3458 | 677 | #: controllers/templates/exp.mako:166 | ||
3459 | 678 | msgid "Export Type:" | ||
3460 | 679 | msgstr "" | ||
3461 | 680 | |||
3462 | 681 | #: controllers/templates/exp.mako:169 | ||
3463 | 682 | msgid "Import Compatible Export" | ||
3464 | 683 | msgstr "" | ||
3465 | 684 | |||
3466 | 685 | #: controllers/templates/exp.mako:172 | ||
3467 | 686 | msgid "Export all Data" | ||
3468 | 687 | msgstr "" | ||
3469 | 688 | |||
3470 | 689 | #: controllers/templates/exp.mako:190 | ||
3471 | 690 | msgid "Available fields" | ||
3472 | 691 | msgstr "" | ||
3473 | 692 | |||
3474 | 693 | #: controllers/templates/exp.mako:192 | ||
3475 | 694 | msgid "Fields to export" | ||
3476 | 695 | msgstr "" | ||
3477 | 696 | |||
3478 | 697 | #: controllers/templates/exp.mako:194 | ||
3479 | 698 | msgid "Save fields list" | ||
3480 | 699 | msgstr "" | ||
3481 | 700 | |||
3482 | 701 | #: controllers/templates/exp.mako:196 | ||
3483 | 702 | msgid "Save as:" | ||
3484 | 703 | msgstr "" | ||
3485 | 704 | |||
3486 | 705 | #: controllers/templates/exp.mako:198 controllers/templates/fieldpref.mako:102 | ||
3487 | 706 | #: controllers/templates/selection.mako:45 | ||
3488 | 707 | msgid "OK" | ||
3489 | 708 | msgstr "" | ||
3490 | 709 | |||
3491 | 710 | #: controllers/templates/exp.mako:202 | ||
3492 | 711 | msgid "Saved exports:" | ||
3493 | 712 | msgstr "" | ||
3494 | 713 | |||
3495 | 714 | #: controllers/templates/exp.mako:211 controllers/templates/form.mako:136 | ||
3496 | 715 | #: widgets/form/templates/one2many.mako:23 widgets/templates/sidebar.mako:67 | ||
3497 | 716 | #: widgets/templates/listgrid/listgrid.mako:119 | ||
3498 | 717 | #: widgets/templates/listgrid/listgrid.mako:123 | ||
3499 | 718 | #: widgets/templates/listgrid/listgrid.mako:127 | ||
3500 | 719 | #: widgets/templates/listgrid/listgrid.mako:191 | ||
3501 | 720 | #: widgets/templates/listgrid/listgrid.mako:196 | ||
3502 | 721 | #: widgets/templates/listgrid/listgroup.mako:131 | ||
3503 | 722 | #: widgets/templates/listgrid/multiple_group.mako:81 | ||
3504 | 723 | msgid "Delete" | ||
3505 | 724 | msgstr "" | ||
3506 | 725 | |||
3507 | 726 | #: controllers/templates/exp.mako:224 widgets/templates/sidebar.mako:56 | ||
3508 | 727 | #: widgets/templates/listgrid/listgrid.mako:153 | ||
3509 | 728 | msgid "Add" | ||
3510 | 729 | msgstr "" | ||
3511 | 730 | |||
3512 | 731 | #: controllers/templates/exp.mako:229 controllers/templates/viewlist.mako:125 | ||
3513 | 732 | msgid "Remove" | ||
3514 | 733 | msgstr "" | ||
3515 | 734 | |||
3516 | 735 | #: controllers/templates/exp.mako:234 | ||
3517 | 736 | msgid "Remove All" | ||
3518 | 737 | msgstr "" | ||
3519 | 738 | |||
3520 | 739 | #: controllers/templates/exp.mako:252 | ||
3521 | 740 | msgid "Export to File" | ||
3522 | 741 | msgstr "" | ||
3523 | 742 | |||
3524 | 743 | #: controllers/templates/fieldpref.mako:4 | ||
3525 | 744 | #: controllers/templates/fieldpref.mako:29 | ||
3526 | 745 | msgid "Field Preferences" | ||
3527 | 746 | msgstr "" | ||
3528 | 747 | |||
3529 | 748 | #: controllers/templates/fieldpref.mako:39 | ||
3530 | 749 | msgid "Field Name:" | ||
3531 | 750 | msgstr "" | ||
3532 | 751 | |||
3533 | 752 | #: controllers/templates/fieldpref.mako:43 | ||
3534 | 753 | msgid "Domain:" | ||
3535 | 754 | msgstr "" | ||
3536 | 755 | |||
3537 | 756 | #: controllers/templates/fieldpref.mako:47 | ||
3538 | 757 | msgid "Default Value:" | ||
3539 | 758 | msgstr "" | ||
3540 | 759 | |||
3541 | 760 | #: controllers/templates/fieldpref.mako:57 | ||
3542 | 761 | msgid "Value applicable for:" | ||
3543 | 762 | msgstr "" | ||
3544 | 763 | |||
3545 | 764 | #: controllers/templates/fieldpref.mako:63 | ||
3546 | 765 | msgid "Only for you" | ||
3547 | 766 | msgstr "" | ||
3548 | 767 | |||
3549 | 768 | #: controllers/templates/fieldpref.mako:67 | ||
3550 | 769 | msgid "For all" | ||
3551 | 770 | msgstr "" | ||
3552 | 771 | |||
3553 | 772 | #: controllers/templates/fieldpref.mako:76 | ||
3554 | 773 | msgid "Value applicable if:" | ||
3555 | 774 | msgstr "" | ||
3556 | 775 | |||
3557 | 776 | #: controllers/templates/fieldpref.mako:79 | ||
3558 | 777 | msgid "Always applicable!" | ||
3559 | 778 | msgstr "" | ||
3560 | 779 | |||
3561 | 780 | #: controllers/templates/fieldpref.mako:99 controllers/templates/imp.mako:204 | ||
3562 | 781 | #: controllers/templates/index.mako:201 controllers/templates/openm2.mako:52 | ||
3563 | 782 | #: controllers/templates/save_filter.mako:42 | ||
3564 | 783 | #: controllers/templates/search.mako:129 | ||
3565 | 784 | #: controllers/templates/translator.mako:41 | ||
3566 | 785 | #: controllers/templates/translator.mako:108 | ||
3567 | 786 | #: controllers/templates/viewed.mako:37 | ||
3568 | 787 | #: controllers/templates/viewed_new.mako:43 | ||
3569 | 788 | #: controllers/templates/viewed_new_model.mako:42 | ||
3570 | 789 | #: controllers/templates/viewed_preview.mako:28 | ||
3571 | 790 | #: controllers/templates/viewlist.mako:129 widgets/templates/sidebar.mako:67 | ||
3572 | 791 | #: widgets/templates/viewform.mako:37 | ||
3573 | 792 | msgid "Close" | ||
3574 | 793 | msgstr "" | ||
3575 | 794 | |||
3576 | 795 | #: controllers/templates/footer.mako:3 | ||
3577 | 796 | #, python-format | ||
3578 | 797 | msgid "© 2008-2010 %(ooweb)s SA. All Rights Reserved " | ||
3579 | 798 | msgstr "" | ||
3580 | 799 | |||
3581 | 800 | #: controllers/templates/footer.mako:6 | ||
3582 | 801 | msgid "Significant contributions to the web client have been made by" | ||
3583 | 802 | msgstr "" | ||
3584 | 803 | |||
3585 | 804 | #: controllers/templates/form.mako:64 controllers/templates/tree.mako:33 | ||
3586 | 805 | msgid "Disable all Tips" | ||
3587 | 806 | msgstr "" | ||
3588 | 807 | |||
3589 | 808 | #: controllers/templates/form.mako:65 controllers/templates/tree.mako:34 | ||
3590 | 809 | msgid "Hide this Tip" | ||
3591 | 810 | msgstr "" | ||
3592 | 811 | |||
3593 | 812 | #: controllers/templates/form.mako:83 controllers/templates/tree.mako:41 | ||
3594 | 813 | msgid "Add / Remove Shortcut..." | ||
3595 | 814 | msgstr "" | ||
3596 | 815 | |||
3597 | 816 | #: controllers/templates/form.mako:87 | ||
3598 | 817 | #, python-format | ||
3599 | 818 | msgid "Search: %s" | ||
3600 | 819 | msgstr "" | ||
3601 | 820 | |||
3602 | 821 | #: controllers/templates/form.mako:94 | ||
3603 | 822 | msgid "Corporate Intelligence..." | ||
3604 | 823 | msgstr "" | ||
3605 | 824 | |||
3606 | 825 | #: controllers/templates/form.mako:100 | ||
3607 | 826 | msgid "Show Logs..." | ||
3608 | 827 | msgstr "" | ||
3609 | 828 | |||
3610 | 829 | #: controllers/templates/form.mako:112 | ||
3611 | 830 | msgid "Create a new resource" | ||
3612 | 831 | msgstr "" | ||
3613 | 832 | |||
3614 | 833 | #: controllers/templates/form.mako:113 controllers/templates/search.mako:128 | ||
3615 | 834 | #: controllers/templates/viewed_new_model.mako:36 | ||
3616 | 835 | #: controllers/templates/viewlist.mako:119 widgets/form/_o2m.py:97 | ||
3617 | 836 | #: widgets/form/templates/one2many.mako:21 | ||
3618 | 837 | #: widgets/templates/listgrid/listgrid.mako:158 | ||
3619 | 838 | #: widgets/templates/listgrid/listgrid.mako:162 | ||
3620 | 839 | #: widgets/templates/listgrid/listgroup.mako:20 | ||
3621 | 840 | msgid "New" | ||
3622 | 841 | msgstr "" | ||
3623 | 842 | |||
3624 | 843 | #: controllers/templates/form.mako:117 | ||
3625 | 844 | msgid "Edit this resource" | ||
3626 | 845 | msgstr "" | ||
3627 | 846 | |||
3628 | 847 | #: controllers/templates/form.mako:118 controllers/templates/viewlist.mako:122 | ||
3629 | 848 | #: widgets/templates/listgrid/listgrid.mako:83 | ||
3630 | 849 | #: widgets/templates/listgrid/listgrid.mako:93 | ||
3631 | 850 | #: widgets/templates/listgrid/listgroup.mako:112 | ||
3632 | 851 | #: widgets/templates/listgrid/multiple_group.mako:63 | ||
3633 | 852 | msgid "Edit" | ||
3634 | 853 | msgstr "" | ||
3635 | 854 | |||
3636 | 855 | #: controllers/templates/form.mako:122 | ||
3637 | 856 | msgid "Save this resource" | ||
3638 | 857 | msgstr "" | ||
3639 | 858 | |||
3640 | 859 | #: controllers/templates/form.mako:123 controllers/templates/openm2.mako:48 | ||
3641 | 860 | #: controllers/templates/save_filter.mako:41 | ||
3642 | 861 | #: controllers/templates/translator.mako:39 | ||
3643 | 862 | #: controllers/templates/translator.mako:106 | ||
3644 | 863 | #: controllers/templates/viewed_new.mako:40 | ||
3645 | 864 | #: controllers/templates/viewed_new_model.mako:39 | ||
3646 | 865 | #: controllers/templates/viewlist.mako:157 | ||
3647 | 866 | #: controllers/templates/preferences/index.mako:39 | ||
3648 | 867 | msgid "Save" | ||
3649 | 868 | msgstr "" | ||
3650 | 869 | |||
3651 | 870 | #: controllers/templates/form.mako:125 | ||
3652 | 871 | msgid "Save & Edit this resource" | ||
3653 | 872 | msgstr "" | ||
3654 | 873 | |||
3655 | 874 | #: controllers/templates/form.mako:126 | ||
3656 | 875 | msgid "Save & Edit" | ||
3657 | 876 | msgstr "" | ||
3658 | 877 | |||
3659 | 878 | #: controllers/templates/form.mako:130 | ||
3660 | 879 | msgid "Duplicate this resource" | ||
3661 | 880 | msgstr "" | ||
3662 | 881 | |||
3663 | 882 | #: controllers/templates/form.mako:131 | ||
3664 | 883 | msgid "Duplicate" | ||
3665 | 884 | msgstr "" | ||
3666 | 885 | |||
3667 | 886 | #: controllers/templates/form.mako:135 | ||
3668 | 887 | msgid "Delete this resource" | ||
3669 | 888 | msgstr "" | ||
3670 | 889 | |||
3671 | 890 | #: controllers/templates/form.mako:140 | ||
3672 | 891 | msgid "Cancel editing the current resource" | ||
3673 | 892 | msgstr "" | ||
3674 | 893 | |||
3675 | 894 | #: controllers/templates/form.mako:145 | ||
3676 | 895 | msgid "Create new node" | ||
3677 | 896 | msgstr "" | ||
3678 | 897 | |||
3679 | 898 | #: controllers/templates/form.mako:146 | ||
3680 | 899 | msgid "New Node" | ||
3681 | 900 | msgstr "" | ||
3682 | 901 | |||
3683 | 902 | #: controllers/templates/form.mako:150 | ||
3684 | 903 | msgid "Show grid in workflow canvas" | ||
3685 | 904 | msgstr "" | ||
3686 | 905 | |||
3687 | 906 | #: controllers/templates/form.mako:151 | ||
3688 | 907 | msgid "Show grid" | ||
3689 | 908 | msgstr "" | ||
3690 | 909 | |||
3691 | 910 | #: controllers/templates/header.mako:33 | ||
3692 | 911 | #, python-format | ||
3693 | 912 | msgid "%(company)s" | ||
3694 | 913 | msgstr "" | ||
3695 | 914 | |||
3696 | 915 | #: controllers/templates/header.mako:34 controllers/templates/index.mako:230 | ||
3697 | 916 | #, python-format | ||
3698 | 917 | msgid "%(user)s" | ||
3699 | 918 | msgstr "" | ||
3700 | 919 | |||
3701 | 920 | #: controllers/templates/header.mako:45 controllers/templates/header.mako:47 | ||
3702 | 921 | msgid "Home" | ||
3703 | 922 | msgstr "" | ||
3704 | 923 | |||
3705 | 924 | #: controllers/templates/header.mako:53 | ||
3706 | 925 | msgid "Requests" | ||
3707 | 926 | msgstr "" | ||
3708 | 927 | |||
3709 | 928 | #: controllers/templates/header.mako:62 | ||
3710 | 929 | msgid "Edit Preferences" | ||
3711 | 930 | msgstr "" | ||
3712 | 931 | |||
3713 | 932 | #: controllers/templates/header.mako:66 controllers/templates/header.mako:69 | ||
3714 | 933 | msgid "About" | ||
3715 | 934 | msgstr "" | ||
3716 | 935 | |||
3717 | 936 | #: controllers/templates/header.mako:73 controllers/templates/header.mako:75 | ||
3718 | 937 | msgid "Help" | ||
3719 | 938 | msgstr "" | ||
3720 | 939 | |||
3721 | 940 | #: controllers/templates/header.mako:81 controllers/templates/header.mako:84 | ||
3722 | 941 | msgid "Clear Cache" | ||
3723 | 942 | msgstr "" | ||
3724 | 943 | |||
3725 | 944 | #: controllers/templates/header.mako:89 | ||
3726 | 945 | msgid "Logout" | ||
3727 | 946 | msgstr "" | ||
3728 | 947 | |||
3729 | 948 | #: controllers/templates/imp.mako:79 | ||
3730 | 949 | msgid "Import Data" | ||
3731 | 950 | msgstr "" | ||
3732 | 951 | |||
3733 | 952 | #: controllers/templates/imp.mako:89 | ||
3734 | 953 | msgid "1. Import a .CSV file" | ||
3735 | 954 | msgstr "" | ||
3736 | 955 | |||
3737 | 956 | #: controllers/templates/imp.mako:105 | ||
3738 | 957 | msgid "CSV File:" | ||
3739 | 958 | msgstr "" | ||
3740 | 959 | |||
3741 | 960 | #: controllers/templates/imp.mako:123 | ||
3742 | 961 | msgid "2. Check your file format" | ||
3743 | 962 | msgstr "" | ||
3744 | 963 | |||
3745 | 964 | #: controllers/templates/imp.mako:130 | ||
3746 | 965 | #, python-format | ||
3747 | 966 | msgid "The import failed due to: %(message)s" | ||
3748 | 967 | msgstr "" | ||
3749 | 968 | |||
3750 | 969 | #: controllers/templates/imp.mako:132 | ||
3751 | 970 | msgid "Here is a preview of the file we could not import:" | ||
3752 | 971 | msgstr "" | ||
3753 | 972 | |||
3754 | 973 | #: controllers/templates/imp.mako:157 | ||
3755 | 974 | msgid "CSV Options" | ||
3756 | 975 | msgstr "" | ||
3757 | 976 | |||
3758 | 977 | #: controllers/templates/imp.mako:160 | ||
3759 | 978 | msgid "Separator:" | ||
3760 | 979 | msgstr "" | ||
3761 | 980 | |||
3762 | 981 | #: controllers/templates/imp.mako:162 | ||
3763 | 982 | msgid "Delimiter:" | ||
3764 | 983 | msgstr "" | ||
3765 | 984 | |||
3766 | 985 | #: controllers/templates/imp.mako:166 | ||
3767 | 986 | msgid "Encoding:" | ||
3768 | 987 | msgstr "" | ||
3769 | 988 | |||
3770 | 989 | #: controllers/templates/imp.mako:173 | ||
3771 | 990 | msgid "Lines to skip:" | ||
3772 | 991 | msgstr "" | ||
3773 | 992 | |||
3774 | 993 | #: controllers/templates/imp.mako:187 | ||
3775 | 994 | msgid "3. File imported" | ||
3776 | 995 | msgstr "" | ||
3777 | 996 | |||
3778 | 997 | #: controllers/templates/imp.mako:205 | ||
3779 | 998 | msgid "Import File" | ||
3780 | 999 | msgstr "" | ||
3781 | 1000 | |||
3782 | 1001 | #: controllers/templates/index.mako:167 | ||
3783 | 1002 | msgid "System Logs" | ||
3784 | 1003 | msgstr "" | ||
3785 | 1004 | |||
3786 | 1005 | #: controllers/templates/index.mako:192 | ||
3787 | 1006 | msgid "More" | ||
3788 | 1007 | msgstr "" | ||
3789 | 1008 | |||
3790 | 1009 | #: controllers/templates/index.mako:193 | ||
3791 | 1010 | msgid "Widgets" | ||
3792 | 1011 | msgstr "" | ||
3793 | 1012 | |||
3794 | 1013 | #: controllers/templates/index.mako:233 controllers/templates/index.mako:238 | ||
3795 | 1014 | #, python-format | ||
3796 | 1015 | msgid "Powered by %(openerp)s " | ||
3797 | 1016 | msgstr "" | ||
3798 | 1017 | |||
3799 | 1018 | #: controllers/templates/login.mako:57 controllers/templates/login_ajax.mako:72 | ||
3800 | 1019 | #: controllers/templates/login_ajax.mako:94 | ||
3801 | 1020 | msgid "User:" | ||
3802 | 1021 | msgstr "" | ||
3803 | 1022 | |||
3804 | 1023 | #: controllers/templates/login.mako:68 | ||
3805 | 1024 | msgid "Databases" | ||
3806 | 1025 | msgstr "" | ||
3807 | 1026 | |||
3808 | 1027 | #: controllers/templates/login.mako:88 | ||
3809 | 1028 | msgid "Top Contributor:" | ||
3810 | 1029 | msgstr "" | ||
3811 | 1030 | |||
3812 | 1031 | #: controllers/templates/login.mako:98 | ||
3813 | 1032 | msgid "" | ||
3814 | 1033 | "We think that daily job activities can be more intuitive, efficient, " | ||
3815 | 1034 | "automated, .. and even fun." | ||
3816 | 1035 | msgstr "" | ||
3817 | 1036 | |||
3818 | 1037 | #: controllers/templates/login.mako:99 | ||
3819 | 1038 | msgid "OpenERP's vision to be:" | ||
3820 | 1039 | msgstr "" | ||
3821 | 1040 | |||
3822 | 1041 | #: controllers/templates/login.mako:107 | ||
3823 | 1042 | msgid "Full featured" | ||
3824 | 1043 | msgstr "" | ||
3825 | 1044 | |||
3826 | 1045 | #: controllers/templates/login.mako:108 | ||
3827 | 1046 | msgid "" | ||
3828 | 1047 | "Today's enterprise challenges are multiple. We provide one module for each " | ||
3829 | 1048 | "need." | ||
3830 | 1049 | msgstr "" | ||
3831 | 1050 | |||
3832 | 1051 | #: controllers/templates/login.mako:116 | ||
3833 | 1052 | msgid "Open Source" | ||
3834 | 1053 | msgstr "" | ||
3835 | 1054 | |||
3836 | 1055 | #: controllers/templates/login.mako:117 | ||
3837 | 1056 | msgid "" | ||
3838 | 1057 | "To Build a great product, we rely on the knowledge of thousands of " | ||
3839 | 1058 | "contributors." | ||
3840 | 1059 | msgstr "" | ||
3841 | 1060 | |||
3842 | 1061 | #: controllers/templates/login.mako:125 | ||
3843 | 1062 | msgid "User Friendly" | ||
3844 | 1063 | msgstr "" | ||
3845 | 1064 | |||
3846 | 1065 | #: controllers/templates/login.mako:126 | ||
3847 | 1066 | msgid "" | ||
3848 | 1067 | "In order to be productive, people need clean and easy to use interface." | ||
3849 | 1068 | msgstr "" | ||
3850 | 1069 | |||
3851 | 1070 | #: controllers/templates/modules.mako:4 | ||
3852 | 1071 | msgid "Module Management" | ||
3853 | 1072 | msgstr "" | ||
3854 | 1073 | |||
3855 | 1074 | #: controllers/templates/modules.mako:17 | ||
3856 | 1075 | msgid "Web Modules" | ||
3857 | 1076 | msgstr "" | ||
3858 | 1077 | |||
3859 | 1078 | #: controllers/templates/openo2m.mako:34 | ||
3860 | 1079 | msgid "Save & Close" | ||
3861 | 1080 | msgstr "" | ||
3862 | 1081 | |||
3863 | 1082 | #: controllers/templates/openo2m.mako:37 | ||
3864 | 1083 | msgid "Save & New" | ||
3865 | 1084 | msgstr "" | ||
3866 | 1085 | |||
3867 | 1086 | #: controllers/templates/save_filter.mako:18 | ||
3868 | 1087 | msgid "Save as Filter" | ||
3869 | 1088 | msgstr "" | ||
3870 | 1089 | |||
3871 | 1090 | #: controllers/templates/save_filter.mako:30 | ||
3872 | 1091 | msgid "Filter Name" | ||
3873 | 1092 | msgstr "" | ||
3874 | 1093 | |||
3875 | 1094 | #: controllers/templates/search.mako:110 | ||
3876 | 1095 | #, python-format | ||
3877 | 1096 | msgid "Search %(name)s" | ||
3878 | 1097 | msgstr "" | ||
3879 | 1098 | |||
3880 | 1099 | #: controllers/templates/search.mako:125 widgets/form/templates/datetime.mako:8 | ||
3881 | 1100 | msgid "Select" | ||
3882 | 1101 | msgstr "" | ||
3883 | 1102 | |||
3884 | 1103 | #: controllers/templates/search.mako:127 widgets/_views.py:77 | ||
3885 | 1104 | #: widgets/form/templates/many2one.mako:22 | ||
3886 | 1105 | #: widgets/form/templates/reference.mako:27 widgets/templates/viewform.mako:26 | ||
3887 | 1106 | msgid "Search" | ||
3888 | 1107 | msgstr "" | ||
3889 | 1108 | |||
3890 | 1109 | #: controllers/templates/search.mako:143 | ||
3891 | 1110 | #, python-format | ||
3892 | 1111 | msgid "No record found : '%(searched_string)s'." | ||
3893 | 1112 | msgstr "" | ||
3894 | 1113 | |||
3895 | 1114 | #: controllers/templates/selection.mako:4 | ||
3896 | 1115 | msgid "Select action" | ||
3897 | 1116 | msgstr "" | ||
3898 | 1117 | |||
3899 | 1118 | #: controllers/templates/selection.mako:23 | ||
3900 | 1119 | msgid "Select your action" | ||
3901 | 1120 | msgstr "" | ||
3902 | 1121 | |||
3903 | 1122 | #: controllers/templates/server_log.mako:4 | ||
3904 | 1123 | msgid "Server Actions..." | ||
3905 | 1124 | msgstr "" | ||
3906 | 1125 | |||
3907 | 1126 | #: controllers/templates/server_log.mako:14 | ||
3908 | 1127 | msgid "Server Actions" | ||
3909 | 1128 | msgstr "" | ||
3910 | 1129 | |||
3911 | 1130 | #: controllers/templates/translator.mako:4 | ||
3912 | 1131 | msgid "Add Translations" | ||
3913 | 1132 | msgstr "" | ||
3914 | 1133 | |||
3915 | 1134 | #: controllers/templates/translator.mako:17 | ||
3916 | 1135 | msgid "Add Translation" | ||
3917 | 1136 | msgstr "" | ||
3918 | 1137 | |||
3919 | 1138 | #: controllers/templates/translator.mako:27 | ||
3920 | 1139 | msgid "Add Translation for:" | ||
3921 | 1140 | msgstr "" | ||
3922 | 1141 | |||
3923 | 1142 | #: controllers/templates/translator.mako:31 | ||
3924 | 1143 | msgid "Fields" | ||
3925 | 1144 | msgstr "" | ||
3926 | 1145 | |||
3927 | 1146 | #: controllers/templates/translator.mako:32 | ||
3928 | 1147 | msgid "Labels" | ||
3929 | 1148 | msgstr "" | ||
3930 | 1149 | |||
3931 | 1150 | #: controllers/templates/translator.mako:33 | ||
3932 | 1151 | msgid "Relates" | ||
3933 | 1152 | msgstr "" | ||
3934 | 1153 | |||
3935 | 1154 | #: controllers/templates/translator.mako:34 | ||
3936 | 1155 | msgid "View" | ||
3937 | 1156 | msgstr "" | ||
3938 | 1157 | |||
3939 | 1158 | #: controllers/templates/translator.mako:53 | ||
3940 | 1159 | msgid "Field" | ||
3941 | 1160 | msgstr "" | ||
3942 | 1161 | |||
3943 | 1162 | #: controllers/templates/view_log.mako:4 controllers/templates/view_log.mako:12 | ||
3944 | 1163 | msgid "Information" | ||
3945 | 1164 | msgstr "" | ||
3946 | 1165 | |||
3947 | 1166 | #: controllers/templates/viewed.mako:17 | ||
3948 | 1167 | #, python-format | ||
3949 | 1168 | msgid "View Editor %s - %s" | ||
3950 | 1169 | msgstr "" | ||
3951 | 1170 | |||
3952 | 1171 | #: controllers/templates/viewed.mako:31 | ||
3953 | 1172 | msgid "Create a new inherited view" | ||
3954 | 1173 | msgstr "" | ||
3955 | 1174 | |||
3956 | 1175 | #: controllers/templates/viewed.mako:31 | ||
3957 | 1176 | msgid "Inherited View" | ||
3958 | 1177 | msgstr "" | ||
3959 | 1178 | |||
3960 | 1179 | #: controllers/templates/viewed.mako:34 | ||
3961 | 1180 | msgid "Preview" | ||
3962 | 1181 | msgstr "" | ||
3963 | 1182 | |||
3964 | 1183 | #: controllers/templates/viewed_add.mako:6 | ||
3965 | 1184 | msgid "Node Type:" | ||
3966 | 1185 | msgstr "" | ||
3967 | 1186 | |||
3968 | 1187 | #: controllers/templates/viewed_add.mako:23 | ||
3969 | 1188 | msgid "New Field" | ||
3970 | 1189 | msgstr "" | ||
3971 | 1190 | |||
3972 | 1191 | #: controllers/templates/viewed_add.mako:27 | ||
3973 | 1192 | msgid "Position:" | ||
3974 | 1193 | msgstr "" | ||
3975 | 1194 | |||
3976 | 1195 | #: controllers/templates/viewlist.mako:4 | ||
3977 | 1196 | #: controllers/templates/viewlist.mako:108 | ||
3978 | 1197 | #, python-format | ||
3979 | 1198 | msgid "Manage Views (%s)" | ||
3980 | 1199 | msgstr "" | ||
3981 | 1200 | |||
3982 | 1201 | #: controllers/templates/viewlist.mako:146 | ||
3983 | 1202 | #, python-format | ||
3984 | 1203 | msgid "Create a view (%s)" | ||
3985 | 1204 | msgstr "" | ||
3986 | 1205 | |||
3987 | 1206 | #: controllers/templates/viewlist.mako:174 | ||
3988 | 1207 | msgid "View Name:" | ||
3989 | 1208 | msgstr "" | ||
3990 | 1209 | |||
3991 | 1210 | #: controllers/templates/viewlist.mako:178 | ||
3992 | 1211 | msgid "View Type:" | ||
3993 | 1212 | msgstr "" | ||
3994 | 1213 | |||
3995 | 1214 | #: controllers/templates/viewlist.mako:189 | ||
3996 | 1215 | msgid "Priority:" | ||
3997 | 1216 | msgstr "" | ||
3998 | 1217 | |||
3999 | 1218 | #: utils/common.py:24 | ||
4000 | 1219 | msgid "Error" | ||
4001 | 1220 | msgstr "" | ||
4002 | 1221 | |||
4003 | 1222 | #: utils/common.py:27 | ||
4004 | 1223 | msgid "Warning" | ||
4005 | 1224 | msgstr "" | ||
4006 | 1225 | |||
4007 | 1226 | #: utils/rpc.py:131 | ||
4008 | 1227 | msgid "Access Denied" | ||
4009 | 1228 | msgstr "" | ||
4010 | 1229 | |||
4011 | 1230 | #: utils/rpc.py:238 | ||
4012 | 1231 | msgid "Unsupported protocol." | ||
4013 | 1232 | msgstr "" | ||
4014 | 1233 | |||
4015 | 1234 | #: utils/rpc.py:342 | ||
4016 | 1235 | msgid "" | ||
4017 | 1236 | "You select a timezone but OpenERP could not find pytz library!\n" | ||
4018 | 1237 | "The timezone functionality will be disable." | ||
4019 | 1238 | msgstr "" | ||
4020 | 1239 | |||
4021 | 1240 | #: utils/rpc.py:355 | ||
4022 | 1241 | msgid "Not logged..." | ||
4023 | 1242 | msgstr "" | ||
4024 | 1243 | |||
4025 | 1244 | #: utils/rpc.py:355 | ||
4026 | 1245 | msgid "Authorization Error" | ||
4027 | 1246 | msgstr "" | ||
4028 | 1247 | |||
4029 | 1248 | #: utils/rpc.py:439 | ||
4030 | 1249 | msgid "== Access Denied ==" | ||
4031 | 1250 | msgstr "" | ||
4032 | 1251 | |||
4033 | 1252 | #: widgets/_views.py:46 | ||
4034 | 1253 | msgid "Form" | ||
4035 | 1254 | msgstr "" | ||
4036 | 1255 | |||
4037 | 1256 | #: widgets/_views.py:47 | ||
4038 | 1257 | msgid "Form view..." | ||
4039 | 1258 | msgstr "" | ||
4040 | 1259 | |||
4041 | 1260 | #: widgets/_views.py:78 | ||
4042 | 1261 | msgid "Search view..." | ||
4043 | 1262 | msgstr "" | ||
4044 | 1263 | |||
4045 | 1264 | #: widgets/listgrid.py:305 | ||
4046 | 1265 | msgid "Wrong on_change trigger" | ||
4047 | 1266 | msgstr "" | ||
4048 | 1267 | |||
4049 | 1268 | #: widgets/listgrid.py:368 widgets/form/_form.py:904 | ||
4050 | 1269 | #, python-format | ||
4051 | 1270 | msgid "Invalid view, duplicate field: %s" | ||
4052 | 1271 | msgstr "" | ||
4053 | 1272 | |||
4054 | 1273 | #: widgets/pager.py:56 | ||
4055 | 1274 | #, python-format | ||
4056 | 1275 | msgid "%s" | ||
4057 | 1276 | msgstr "" | ||
4058 | 1277 | |||
4059 | 1278 | #: widgets/pager.py:68 | ||
4060 | 1279 | #, python-format | ||
4061 | 1280 | msgid "%s - %s" | ||
4062 | 1281 | msgstr "" | ||
4063 | 1282 | |||
4064 | 1283 | #: widgets/search.py:280 | ||
4065 | 1284 | msgid "contains" | ||
4066 | 1285 | msgstr "" | ||
4067 | 1286 | |||
4068 | 1287 | #: widgets/search.py:280 | ||
4069 | 1288 | msgid "doesn't contain" | ||
4070 | 1289 | msgstr "" | ||
4071 | 1290 | |||
4072 | 1291 | #: widgets/search.py:281 | ||
4073 | 1292 | msgid "is equal to" | ||
4074 | 1293 | msgstr "" | ||
4075 | 1294 | |||
4076 | 1295 | #: widgets/search.py:281 | ||
4077 | 1296 | msgid "is not equal to" | ||
4078 | 1297 | msgstr "" | ||
4079 | 1298 | |||
4080 | 1299 | #: widgets/search.py:282 | ||
4081 | 1300 | msgid "greater than" | ||
4082 | 1301 | msgstr "" | ||
4083 | 1302 | |||
4084 | 1303 | #: widgets/search.py:282 | ||
4085 | 1304 | msgid "less than" | ||
4086 | 1305 | msgstr "" | ||
4087 | 1306 | |||
4088 | 1307 | #: widgets/search.py:283 | ||
4089 | 1308 | msgid "in" | ||
4090 | 1309 | msgstr "" | ||
4091 | 1310 | |||
4092 | 1311 | #: widgets/search.py:283 | ||
4093 | 1312 | msgid "not in" | ||
4094 | 1313 | msgstr "" | ||
4095 | 1314 | |||
4096 | 1315 | #: widgets/search.py:392 | ||
4097 | 1316 | msgid "Yes" | ||
4098 | 1317 | msgstr "" | ||
4099 | 1318 | |||
4100 | 1319 | #: widgets/search.py:392 | ||
4101 | 1320 | msgid "No" | ||
4102 | 1321 | msgstr "" | ||
4103 | 1322 | |||
4104 | 1323 | #: widgets/form/_action.py:48 | ||
4105 | 1324 | msgid "Action not found!" | ||
4106 | 1325 | msgstr "" | ||
4107 | 1326 | |||
4108 | 1327 | #: widgets/form/_o2m.py:97 widgets/templates/listgrid/listgrid.mako:156 | ||
4109 | 1328 | #: widgets/templates/listgrid/listgrid.mako:162 | ||
4110 | 1329 | #: widgets/templates/listgrid/listgroup.mako:20 | ||
4111 | 1330 | msgid "Create new record." | ||
4112 | 1331 | msgstr "" | ||
4113 | 1332 | |||
4114 | 1333 | #: widgets/form/_o2m.py:110 | ||
4115 | 1334 | msgid "Save/New" | ||
4116 | 1335 | msgstr "" | ||
4117 | 1336 | |||
4118 | 1337 | #: widgets/form/_o2m.py:110 | ||
4119 | 1338 | msgid "Save parent record." | ||
4120 | 1339 | msgstr "" | ||
4121 | 1340 | |||
4122 | 1341 | #: widgets/form/_o2m.py:229 | ||
4123 | 1342 | #, python-format | ||
4124 | 1343 | msgid "%d of %d" | ||
4125 | 1344 | msgstr "" | ||
4126 | 1345 | |||
4127 | 1346 | #: widgets/form/_o2m.py:231 | ||
4128 | 1347 | #, python-format | ||
4129 | 1348 | msgid "- of %d" | ||
4130 | 1349 | msgstr "" | ||
4131 | 1350 | |||
4132 | 1351 | #: widgets/form/templates/binary.mako:28 | ||
4133 | 1352 | msgid "Save As" | ||
4134 | 1353 | msgstr "" | ||
4135 | 1354 | |||
4136 | 1355 | #: widgets/form/templates/binary.mako:31 | ||
4137 | 1356 | msgid "add attachment" | ||
4138 | 1357 | msgstr "" | ||
4139 | 1358 | |||
4140 | 1359 | #: widgets/form/templates/image.mako:6 | ||
4141 | 1360 | msgid "Replace image" | ||
4142 | 1361 | msgstr "" | ||
4143 | 1362 | |||
4144 | 1363 | #: widgets/form/templates/many2one.mako:2 | ||
4145 | 1364 | #: widgets/form/templates/reference.mako:30 | ||
4146 | 1365 | msgid "Open" | ||
4147 | 1366 | msgstr "" | ||
4148 | 1367 | |||
4149 | 1368 | #: widgets/form/templates/many2one.mako:2 | ||
4150 | 1369 | #: widgets/form/templates/reference.mako:30 | ||
4151 | 1370 | msgid "Open a resource" | ||
4152 | 1371 | msgstr "" | ||
4153 | 1372 | |||
4154 | 1373 | #: widgets/form/templates/one2many.mako:21 | ||
4155 | 1374 | msgid "Create new record..." | ||
4156 | 1375 | msgstr "" | ||
4157 | 1376 | |||
4158 | 1377 | #: widgets/form/templates/one2many.mako:23 | ||
4159 | 1378 | msgid "Delete record..." | ||
4160 | 1379 | msgstr "" | ||
4161 | 1380 | |||
4162 | 1381 | #: widgets/form/templates/one2many.mako:29 | ||
4163 | 1382 | msgid "Translate me." | ||
4164 | 1383 | msgstr "" | ||
4165 | 1384 | |||
4166 | 1385 | #: widgets/form/templates/one2many.mako:48 | ||
4167 | 1386 | msgid "Previous record..." | ||
4168 | 1387 | msgstr "" | ||
4169 | 1388 | |||
4170 | 1389 | #: widgets/form/templates/one2many.mako:50 | ||
4171 | 1390 | msgid "Next record..." | ||
4172 | 1391 | msgstr "" | ||
4173 | 1392 | |||
4174 | 1393 | #: widgets/templates/logs.mako:22 | ||
4175 | 1394 | msgid "More..." | ||
4176 | 1395 | msgstr "" | ||
4177 | 1396 | |||
4178 | 1397 | #: widgets/templates/logs.mako:35 | ||
4179 | 1398 | msgid "Less..." | ||
4180 | 1399 | msgstr "" | ||
4181 | 1400 | |||
4182 | 1401 | #: widgets/templates/pager.mako:9 | ||
4183 | 1402 | msgid "<< First" | ||
4184 | 1403 | msgstr "" | ||
4185 | 1404 | |||
4186 | 1405 | #: widgets/templates/pager.mako:14 | ||
4187 | 1406 | msgid "< Previous" | ||
4188 | 1407 | msgstr "" | ||
4189 | 1408 | |||
4190 | 1409 | #: widgets/templates/pager.mako:19 | ||
4191 | 1410 | msgid "of" | ||
4192 | 1411 | msgstr "" | ||
4193 | 1412 | |||
4194 | 1413 | #: widgets/templates/pager.mako:24 | ||
4195 | 1414 | msgid "Next >" | ||
4196 | 1415 | msgstr "" | ||
4197 | 1416 | |||
4198 | 1417 | #: widgets/templates/pager.mako:29 | ||
4199 | 1418 | msgid "Last >>" | ||
4200 | 1419 | msgstr "" | ||
4201 | 1420 | |||
4202 | 1421 | #: widgets/templates/pager.mako:37 | ||
4203 | 1422 | msgid "Change Limit:" | ||
4204 | 1423 | msgstr "" | ||
4205 | 1424 | |||
4206 | 1425 | #: widgets/templates/sidebar.mako:37 | ||
4207 | 1426 | msgid "Reports" | ||
4208 | 1427 | msgstr "" | ||
4209 | 1428 | |||
4210 | 1429 | #: widgets/templates/sidebar.mako:41 widgets/templates/viewform.mako:51 | ||
4211 | 1430 | msgid "Actions" | ||
4212 | 1431 | msgstr "" | ||
4213 | 1432 | |||
4214 | 1433 | #: widgets/templates/sidebar.mako:45 | ||
4215 | 1434 | msgid "Links" | ||
4216 | 1435 | msgstr "" | ||
4217 | 1436 | |||
4218 | 1437 | #: widgets/templates/sidebar.mako:49 | ||
4219 | 1438 | msgid "Submenu" | ||
4220 | 1439 | msgstr "" | ||
4221 | 1440 | |||
4222 | 1441 | #: widgets/templates/sidebar.mako:54 | ||
4223 | 1442 | msgid "Attachments" | ||
4224 | 1443 | msgstr "" | ||
4225 | 1444 | |||
4226 | 1445 | #: widgets/templates/sidebar.mako:74 | ||
4227 | 1446 | msgid "File" | ||
4228 | 1447 | msgstr "" | ||
4229 | 1448 | |||
4230 | 1449 | #: widgets/templates/sidebar.mako:83 | ||
4231 | 1450 | msgid "Customize" | ||
4232 | 1451 | msgstr "" | ||
4233 | 1452 | |||
4234 | 1453 | #: widgets/templates/sidebar.mako:87 | ||
4235 | 1454 | msgid "Manage views of the current object" | ||
4236 | 1455 | msgstr "" | ||
4237 | 1456 | |||
4238 | 1457 | #: widgets/templates/sidebar.mako:89 | ||
4239 | 1458 | msgid "Manage Views" | ||
4240 | 1459 | msgstr "" | ||
4241 | 1460 | |||
4242 | 1461 | #: widgets/templates/sidebar.mako:93 | ||
4243 | 1462 | msgid "Edit workflow of the current object" | ||
4244 | 1463 | msgstr "" | ||
4245 | 1464 | |||
4246 | 1465 | #: widgets/templates/sidebar.mako:94 | ||
4247 | 1466 | msgid "Edit Workflow" | ||
4248 | 1467 | msgstr "" | ||
4249 | 1468 | |||
4250 | 1469 | #: widgets/templates/sidebar.mako:98 | ||
4251 | 1470 | msgid "Customize current object or create a new object" | ||
4252 | 1471 | msgstr "" | ||
4253 | 1472 | |||
4254 | 1473 | #: widgets/templates/sidebar.mako:100 | ||
4255 | 1474 | msgid "Customize Object" | ||
4256 | 1475 | msgstr "" | ||
4257 | 1476 | |||
4258 | 1477 | #: widgets/templates/sidebar.mako:106 | ||
4259 | 1478 | msgid "Other Options" | ||
4260 | 1479 | msgstr "" | ||
4261 | 1480 | |||
4262 | 1481 | #: widgets/templates/sidebar.mako:111 widgets/templates/sidebar.mako:119 | ||
4263 | 1482 | msgid "Import" | ||
4264 | 1483 | msgstr "" | ||
4265 | 1484 | |||
4266 | 1485 | #: widgets/templates/sidebar.mako:114 widgets/templates/sidebar.mako:122 | ||
4267 | 1486 | msgid "Export" | ||
4268 | 1487 | msgstr "" | ||
4269 | 1488 | |||
4270 | 1489 | #: widgets/templates/sidebar.mako:126 | ||
4271 | 1490 | msgid "Translate" | ||
4272 | 1491 | msgstr "" | ||
4273 | 1492 | |||
4274 | 1493 | #: widgets/templates/sidebar.mako:131 | ||
4275 | 1494 | msgid "View Log" | ||
4276 | 1495 | msgstr "" | ||
4277 | 1496 | |||
4278 | 1497 | #: widgets/templates/viewform.mako:25 | ||
4279 | 1498 | msgid "Filter records." | ||
4280 | 1499 | msgstr "" | ||
4281 | 1500 | |||
4282 | 1501 | #: widgets/templates/viewform.mako:33 | ||
4283 | 1502 | msgid "Clear all." | ||
4284 | 1503 | msgstr "" | ||
4285 | 1504 | |||
4286 | 1505 | #: widgets/templates/viewform.mako:35 | ||
4287 | 1506 | msgid "Clear" | ||
4288 | 1507 | msgstr "" | ||
4289 | 1508 | |||
4290 | 1509 | #: widgets/templates/viewform.mako:43 | ||
4291 | 1510 | msgid "Filters" | ||
4292 | 1511 | msgstr "" | ||
4293 | 1512 | |||
4294 | 1513 | #: widgets/templates/viewform.mako:45 | ||
4295 | 1514 | msgid "Saved Filters" | ||
4296 | 1515 | msgstr "" | ||
4297 | 1516 | |||
4298 | 1517 | #: widgets/templates/viewform.mako:52 | ||
4299 | 1518 | msgid "New Filter" | ||
4300 | 1519 | msgstr "" | ||
4301 | 1520 | |||
4302 | 1521 | #: widgets/templates/viewform.mako:53 | ||
4303 | 1522 | msgid "Save Filter" | ||
4304 | 1523 | msgstr "" | ||
4305 | 1524 | |||
4306 | 1525 | #: widgets/templates/viewform.mako:54 | ||
4307 | 1526 | msgid "Manage Filters" | ||
4308 | 1527 | msgstr "" | ||
4309 | 1528 | |||
4310 | 1529 | #: widgets/templates/listgrid/listgrid.mako:23 | ||
4311 | 1530 | msgid "Update" | ||
4312 | 1531 | msgstr "" | ||
4313 | 1532 | |||
4314 | 1533 | #: widgets/templates/listgrid/listgrid.mako:152 | ||
4315 | 1534 | msgid "Add records..." | ||
4316 | 1535 | msgstr "" | ||
4317 | 1536 | |||
4318 | 1537 | #: widgets/templates/listgrid/listgrid.mako:190 | ||
4319 | 1538 | #: widgets/templates/listgrid/listgrid.mako:194 | ||
4320 | 1539 | msgid "Delete record(s)." | ||
4321 | 1540 | msgstr "" | ||
4322 | 0 | 1541 | ||
4323 | === modified file 'addons/openerp/po/messages/ca.po' | |||
4324 | --- addons/openerp/po/messages/ca.po 2011-08-04 05:14:27 +0000 | |||
4325 | +++ addons/openerp/po/messages/ca.po 2012-11-15 08:05:25 +0000 | |||
4326 | @@ -8,14 +8,20 @@ | |||
4327 | 8 | "Project-Id-Version: openobject-client-web\n" | 8 | "Project-Id-Version: openobject-client-web\n" |
4328 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4329 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" |
4332 | 11 | "PO-Revision-Date: 2011-02-28 12:02+0000\n" | 11 | "PO-Revision-Date: 2011-08-18 19:03+0000\n" |
4333 | 12 | "Last-Translator: Esther Xaus (Zikzakmedia) <Unknown>\n" | 12 | "Last-Translator: Jordi Esteve (www.zikzakmedia.com) " |
4334 | 13 | "<jesteve@zikzakmedia.com>\n" | ||
4335 | 13 | "Language-Team: Catalan <ca@li.org>\n" | 14 | "Language-Team: Catalan <ca@li.org>\n" |
4336 | 14 | "MIME-Version: 1.0\n" | 15 | "MIME-Version: 1.0\n" |
4337 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
4338 | 16 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
4339 | 18 | <<<<<<< TREE | ||
4340 | 17 | "X-Launchpad-Export-Date: 2011-08-04 05:13+0000\n" | 19 | "X-Launchpad-Export-Date: 2011-08-04 05:13+0000\n" |
4341 | 18 | "X-Generator: Launchpad (build 13573)\n" | 20 | "X-Generator: Launchpad (build 13573)\n" |
4342 | 21 | ======= | ||
4343 | 22 | "X-Launchpad-Export-Date: 2012-10-23 05:10+0000\n" | ||
4344 | 23 | "X-Generator: Launchpad (build 16179)\n" | ||
4345 | 24 | >>>>>>> MERGE-SOURCE | ||
4346 | 19 | 25 | ||
4347 | 20 | #: validators.py:75 | 26 | #: validators.py:75 |
4348 | 21 | msgid "Invalid literal for float" | 27 | msgid "Invalid literal for float" |
4349 | @@ -403,11 +409,11 @@ | |||
4350 | 403 | 409 | ||
4351 | 404 | #: controllers/impex.py:520 | 410 | #: controllers/impex.py:520 |
4352 | 405 | msgid "The CSV delimiter must be a single character" | 411 | msgid "The CSV delimiter must be a single character" |
4354 | 406 | msgstr "" | 412 | msgstr "El delimitador CSV ha de ser un únic caràcter" |
4355 | 407 | 413 | ||
4356 | 408 | #: controllers/impex.py:532 | 414 | #: controllers/impex.py:532 |
4357 | 409 | msgid "File Format Error" | 415 | msgid "File Format Error" |
4359 | 410 | msgstr "" | 416 | msgstr "Error format de fitxer" |
4360 | 411 | 417 | ||
4361 | 412 | #: controllers/impex.py:550 | 418 | #: controllers/impex.py:550 |
4362 | 413 | msgid "XML-RPC error" | 419 | msgid "XML-RPC error" |
4363 | @@ -1422,7 +1428,7 @@ | |||
4364 | 1422 | 1428 | ||
4365 | 1423 | #: widgets/form/templates/image.mako:6 | 1429 | #: widgets/form/templates/image.mako:6 |
4366 | 1424 | msgid "Replace image" | 1430 | msgid "Replace image" |
4368 | 1425 | msgstr "" | 1431 | msgstr "Reemplaça imatge" |
4369 | 1426 | 1432 | ||
4370 | 1427 | #: widgets/form/templates/many2one.mako:2 | 1433 | #: widgets/form/templates/many2one.mako:2 |
4371 | 1428 | #: widgets/form/templates/reference.mako:30 | 1434 | #: widgets/form/templates/reference.mako:30 |
4372 | @@ -1602,87 +1608,3 @@ | |||
4373 | 1602 | #: widgets/templates/listgrid/listgrid.mako:194 | 1608 | #: widgets/templates/listgrid/listgrid.mako:194 |
4374 | 1603 | msgid "Delete record(s)." | 1609 | msgid "Delete record(s)." |
4375 | 1604 | msgstr "Elimina registre(s)." | 1610 | msgstr "Elimina registre(s)." |
4376 | 1605 | |||
4377 | 1606 | #~ msgid "You do not have a valid OpenERP publisher warranty contract !" | ||
4378 | 1607 | #~ msgstr "No disposeu d'un contracte vàlid de garantia de l'editor d'OpenERP!" | ||
4379 | 1608 | |||
4380 | 1609 | #~ msgid "" | ||
4381 | 1610 | #~ "If you are using OpenERP in production, it is recommended to have\n" | ||
4382 | 1611 | #~ "a publisher warranty program.\n" | ||
4383 | 1612 | #~ "\n" | ||
4384 | 1613 | #~ "The OpenERP publisher warranty contract provides you with bug fix guarantees " | ||
4385 | 1614 | #~ "and an\n" | ||
4386 | 1615 | #~ "automatic migration system so that we can start working on your problems " | ||
4387 | 1616 | #~ "within a few\n" | ||
4388 | 1617 | #~ "hours.\n" | ||
4389 | 1618 | #~ "\n" | ||
4390 | 1619 | #~ "With a publisher warranty contract, errors such as this one can be sent " | ||
4391 | 1620 | #~ "directly to the OpenERP\n" | ||
4392 | 1621 | #~ "team for review and evaluation.\n" | ||
4393 | 1622 | #~ "\n" | ||
4394 | 1623 | #~ "The publisher warranty program offers you:\n" | ||
4395 | 1624 | #~ "* Automatic migrations on new versions,\n" | ||
4396 | 1625 | #~ "* A bugfix guarantee,\n" | ||
4397 | 1626 | #~ "* Monthly announces of potential bugs and their fixes,\n" | ||
4398 | 1627 | #~ "* Security alerts by email and automatic migration,\n" | ||
4399 | 1628 | #~ "* Access to the customer portal.\n" | ||
4400 | 1629 | #~ msgstr "" | ||
4401 | 1630 | #~ "Si esteu utilitzant OpenERP en producció, us recomanem adquirir\n" | ||
4402 | 1631 | #~ "un contracte de garantia de l'editor.\n" | ||
4403 | 1632 | #~ "El contracte de garantia de l'editor d'OpenERP us proporciona garanties de " | ||
4404 | 1633 | #~ "correcció d'errors\n" | ||
4405 | 1634 | #~ "i una migració automàtica del sistema, i nosaltres podrem treballar en el " | ||
4406 | 1635 | #~ "vostre problema\n" | ||
4407 | 1636 | #~ "en poques hores.\n" | ||
4408 | 1637 | #~ "Amb el contracte de garantia de l'editor, errors com l'actual es poden " | ||
4409 | 1638 | #~ "enviar directament a \n" | ||
4410 | 1639 | #~ "l'equip d'OpenERP per la sevq revisió i avaluació.\n" | ||
4411 | 1640 | #~ "El contracte de garantia de l'editor a més us ofereix:\n" | ||
4412 | 1641 | #~ "* Migracions automàtiques cap noves versions,\n" | ||
4413 | 1642 | #~ "* Garantia en correcció d'errors,\n" | ||
4414 | 1643 | #~ "* Anuncis mensuals d'errors potencials i les seves solucions,\n" | ||
4415 | 1644 | #~ "* Alertes de seguretat per email i migració automàtica,\n" | ||
4416 | 1645 | #~ "* Accés al portal de clients.\n" | ||
4417 | 1646 | |||
4418 | 1647 | #~ msgid "" | ||
4419 | 1648 | #~ "Your publisher warranty contract does not cover all modules installed in " | ||
4420 | 1649 | #~ "your system !\n" | ||
4421 | 1650 | #~ "If you are using OpenERP in production, it is highly suggested to upgrade " | ||
4422 | 1651 | #~ "your\n" | ||
4423 | 1652 | #~ "contract.\n" | ||
4424 | 1653 | #~ "\n" | ||
4425 | 1654 | #~ "If you have developed your own modules or installed third party module, we\n" | ||
4426 | 1655 | #~ "can provide you an additional publisher warranty contract for these modules. " | ||
4427 | 1656 | #~ "After\n" | ||
4428 | 1657 | #~ "having reviewed your modules, our quality team will ensure they will " | ||
4429 | 1658 | #~ "migrate\n" | ||
4430 | 1659 | #~ "automatically for all future stable versions of OpenERP at no extra cost.\n" | ||
4431 | 1660 | #~ "\n" | ||
4432 | 1661 | #~ "Here is the list of modules not covered by your publisher warranty contract:" | ||
4433 | 1662 | #~ msgstr "" | ||
4434 | 1663 | #~ "El vostre contracte de garantia de l'editor no cobreix tots els mòduls " | ||
4435 | 1664 | #~ "instal·lats en el vostre sistema!\n" | ||
4436 | 1665 | #~ "Si esteu utilitzant OpenERP en producció, és recomanable actualitzar el " | ||
4437 | 1666 | #~ "vostre\n" | ||
4438 | 1667 | #~ "contracte.\n" | ||
4439 | 1668 | #~ "\n" | ||
4440 | 1669 | #~ "Si heu desenvolupat els vostres propis mòduls o instal·lat un mòdul de " | ||
4441 | 1670 | #~ "tercers, \n" | ||
4442 | 1671 | #~ "podem oferir-li un contracte de garantia de l'editor addicional per aquests " | ||
4443 | 1672 | #~ "mòduls. Després \n" | ||
4444 | 1673 | #~ "d'haver examinat els mòduls, el nostre equip de qualitat garantira que els " | ||
4445 | 1674 | #~ "migraran\n" | ||
4446 | 1675 | #~ "automàticament per totes les versions futures estables d'OpenERP, sense cost " | ||
4447 | 1676 | #~ "addicional.\n" | ||
4448 | 1677 | #~ "\n" | ||
4449 | 1678 | #~ "Aquesta és la llista dels mòduls que no estan coberts pel contracte de " | ||
4450 | 1679 | #~ "garantia de l'editor:" | ||
4451 | 1680 | |||
4452 | 1681 | #~ msgid "Image" | ||
4453 | 1682 | #~ msgstr "Imatge" | ||
4454 | 1683 | |||
4455 | 1684 | #~ msgid "Add Resource:" | ||
4456 | 1685 | #~ msgstr "Afegeix recurs:" | ||
4457 | 1686 | |||
4458 | 1687 | #~ msgid "Click here to add new image." | ||
4459 | 1688 | #~ msgstr "Feu clic aquí per afegir una nova imatge." | ||
4460 | 1689 | 1611 | ||
4461 | === added file 'addons/openerp/po/messages/cs.po' | |||
4462 | --- addons/openerp/po/messages/cs.po 1970-01-01 00:00:00 +0000 | |||
4463 | +++ addons/openerp/po/messages/cs.po 2012-11-15 08:05:25 +0000 | |||
4464 | @@ -0,0 +1,1594 @@ | |||
4465 | 1 | # Translations template for PROJECT. | ||
4466 | 2 | # Copyright (C) 2011 ORGANIZATION | ||
4467 | 3 | # This file is distributed under the same license as the PROJECT project. | ||
4468 | 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, 2011. | ||
4469 | 5 | # | ||
4470 | 6 | msgid "" | ||
4471 | 7 | msgstr "" | ||
4472 | 8 | "Project-Id-Version: openobject-client-web\n" | ||
4473 | 9 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | ||
4474 | 10 | "POT-Creation-Date: 2011-03-18 11:53+0100\n" | ||
4475 | 11 | "PO-Revision-Date: 2011-12-14 10:07+0000\n" | ||
4476 | 12 | "Last-Translator: Konki <pavel.konkol@seznam.cz>\n" | ||
4477 | 13 | "Language-Team: Czech\n" | ||
4478 | 14 | "MIME-Version: 1.0\n" | ||
4479 | 15 | "Content-Type: text/plain; charset=utf-8\n" | ||
4480 | 16 | "Content-Transfer-Encoding: 8bit\n" | ||
4481 | 17 | "X-Launchpad-Export-Date: 2012-10-23 05:10+0000\n" | ||
4482 | 18 | "X-Generator: Launchpad (build 16179)\n" | ||
4483 | 19 | "X-Poedit-Language: Czech\n" | ||
4484 | 20 | "Generated-By: Babel 0.9.5\n" | ||
4485 | 21 | |||
4486 | 22 | #: validators.py:75 | ||
4487 | 23 | msgid "Invalid literal for float" | ||
4488 | 24 | msgstr "Neplatné znaky pro desetinné číslo" | ||
4489 | 25 | |||
4490 | 26 | #: validators.py:114 validators.py:119 validators.py:262 | ||
4491 | 27 | msgid "Invalid datetime format" | ||
4492 | 28 | msgstr "Neplatný formát data a času" | ||
4493 | 29 | |||
4494 | 30 | #: validators.py:166 | ||
4495 | 31 | msgid "Please select a file." | ||
4496 | 32 | msgstr "Prosíme vyberte soubor." | ||
4497 | 33 | |||
4498 | 34 | #: validators.py:247 | ||
4499 | 35 | msgid "Please enter an email address" | ||
4500 | 36 | msgstr "Prosíme zadejte emailovou adresu" | ||
4501 | 37 | |||
4502 | 38 | #: validators.py:248 | ||
4503 | 39 | msgid "An email address must contain a single @" | ||
4504 | 40 | msgstr "Emailová adresa musí obsahovat jediný @" | ||
4505 | 41 | |||
4506 | 42 | #: validators.py:249 | ||
4507 | 43 | #, python-format | ||
4508 | 44 | msgid "" | ||
4509 | 45 | "The username portion of the email address is invalid (the portion before the " | ||
4510 | 46 | "@: %(username)s)" | ||
4511 | 47 | msgstr "" | ||
4512 | 48 | "Část jména uživatele emailové adresy není platná (část přes @: %(username)s)" | ||
4513 | 49 | |||
4514 | 50 | #: validators.py:250 | ||
4515 | 51 | #, python-format | ||
4516 | 52 | msgid "" | ||
4517 | 53 | "The domain portion of the email address is invalid (the portion after the @: " | ||
4518 | 54 | "%(domain)s)" | ||
4519 | 55 | msgstr "Neplatná doménová část emailové adresy (část po @: %(domain)s)" | ||
4520 | 56 | |||
4521 | 57 | #: validators.py:254 | ||
4522 | 58 | msgid "You must start your URL with http://, https://, etc" | ||
4523 | 59 | msgstr "Vaše URL musí začínat http://, https://, atd." | ||
4524 | 60 | |||
4525 | 61 | #: validators.py:255 | ||
4526 | 62 | msgid "That is not a valid URL" | ||
4527 | 63 | msgstr "Toto není platné URL" | ||
4528 | 64 | |||
4529 | 65 | #: validators.py:256 | ||
4530 | 66 | #, python-format | ||
4531 | 67 | msgid "You must provide a full domain name (like %(domain)s.com)" | ||
4532 | 68 | msgstr "Musíte poskytnout plné jméno domény (jako %(domain)s.com)" | ||
4533 | 69 | |||
4534 | 70 | #: validators.py:260 | ||
4535 | 71 | msgid "Please enter an integer value" | ||
4536 | 72 | msgstr "Prosíme zadejte číselnou hodnotu" | ||
4537 | 73 | |||
4538 | 74 | #: validators.py:261 | ||
4539 | 75 | msgid "Please enter a number" | ||
4540 | 76 | msgstr "Prosíme zadejte číslo" | ||
4541 | 77 | |||
4542 | 78 | #: controllers/actions.py:94 | ||
4543 | 79 | msgid "Invalid View" | ||
4544 | 80 | msgstr "Neplatný pohled" | ||
4545 | 81 | |||
4546 | 82 | #: controllers/actions.py:127 | ||
4547 | 83 | msgid "Error no report" | ||
4548 | 84 | msgstr "Chyba bez hlášení" | ||
4549 | 85 | |||
4550 | 86 | #: controllers/actions.py:153 | ||
4551 | 87 | msgid "Nothing to print" | ||
4552 | 88 | msgstr "Není co tisknout!" | ||
4553 | 89 | |||
4554 | 90 | #: controllers/actions.py:173 | ||
4555 | 91 | msgid "Printing aborted, too long delay" | ||
4556 | 92 | msgstr "Tisk zrušen, dlouhá čekací prodleva" | ||
4557 | 93 | |||
4558 | 94 | #: controllers/actions.py:397 | ||
4559 | 95 | msgid "Relative URLs are not supported" | ||
4560 | 96 | msgstr "Nejsou podporována relativní URL" | ||
4561 | 97 | |||
4562 | 98 | #: controllers/actions.py:425 | ||
4563 | 99 | msgid "Action not found" | ||
4564 | 100 | msgstr "Akce nenalezena" | ||
4565 | 101 | |||
4566 | 102 | #: controllers/actions.py:474 | ||
4567 | 103 | msgid "No action defined" | ||
4568 | 104 | msgstr "Nedefinována žádná akce" | ||
4569 | 105 | |||
4570 | 106 | #: controllers/attachment.py:55 | ||
4571 | 107 | msgid "No record selected, You can only attach to existing record..." | ||
4572 | 108 | msgstr "Nevybrán záznam, můžete přiložit pouze k existujícímu záznamu..." | ||
4573 | 109 | |||
4574 | 110 | #: controllers/database.py:63 | ||
4575 | 111 | msgid "Create database" | ||
4576 | 112 | msgstr "Vytvořit databázi" | ||
4577 | 113 | |||
4578 | 114 | #: controllers/database.py:65 controllers/templates/database.mako:56 | ||
4579 | 115 | #: controllers/templates/search.mako:145 | ||
4580 | 116 | msgid "Create" | ||
4581 | 117 | msgstr "Vytvořit" | ||
4582 | 118 | |||
4583 | 119 | #: controllers/database.py:68 | ||
4584 | 120 | msgid "Super admin password:" | ||
4585 | 121 | msgstr "Heslo hlavního správce:" | ||
4586 | 122 | |||
4587 | 123 | #: controllers/database.py:68 | ||
4588 | 124 | msgid "" | ||
4589 | 125 | "This is the password of the user that have the rights to administer " | ||
4590 | 126 | "databases. This is not a OpenERP user, just a super administrator. If you " | ||
4591 | 127 | "did not changed it, the password is 'admin' after installation." | ||
4592 | 128 | msgstr "" | ||
4593 | 129 | "Toto je heslo uživatele, který má práva spravovat databázi. Toto není " | ||
4594 | 130 | "uživatel OpenERP, jen super správce. Heslo po instalaci je 'admin', pokud " | ||
4595 | 131 | "jste jej nezměnili." | ||
4596 | 132 | |||
4597 | 133 | #: controllers/database.py:69 controllers/database.py:101 | ||
4598 | 134 | msgid "New database name:" | ||
4599 | 135 | msgstr "Jméno nové databáze:" | ||
4600 | 136 | |||
4601 | 137 | #: controllers/database.py:69 | ||
4602 | 138 | msgid "" | ||
4603 | 139 | "Choose the name of the database that will be created. The name must not " | ||
4604 | 140 | "contain any special character. Exemple: 'terp'." | ||
4605 | 141 | msgstr "" | ||
4606 | 142 | "Vyberte jméno databáze, která bude vytvořena. Jméno nesmí obsahovat " | ||
4607 | 143 | "speciální symboly. Příklad: 'terp'." | ||
4608 | 144 | |||
4609 | 145 | #: controllers/database.py:70 | ||
4610 | 146 | msgid "Load Demonstration data:" | ||
4611 | 147 | msgstr "Načíst ukázkové údaje:" | ||
4612 | 148 | |||
4613 | 149 | #: controllers/database.py:70 | ||
4614 | 150 | msgid "" | ||
4615 | 151 | "Check this box if you want demonstration data to be installed on your new " | ||
4616 | 152 | "database. These data will help you to understand OpenERP, with predefined " | ||
4617 | 153 | "products, partners, etc." | ||
4618 | 154 | msgstr "" | ||
4619 | 155 | "Zaškrtněte toto pole, pokud chcete nechat načíst ukázková data do vaší nové " | ||
4620 | 156 | "databáze. Tyto data vám pomůžou pochopit OpenERP, s přednastavenými výrobky, " | ||
4621 | 157 | "partnery, aj." | ||
4622 | 158 | |||
4623 | 159 | #: controllers/database.py:71 | ||
4624 | 160 | msgid "Default Language:" | ||
4625 | 161 | msgstr "Výchozí jazyk:" | ||
4626 | 162 | |||
4627 | 163 | #: controllers/database.py:71 | ||
4628 | 164 | msgid "" | ||
4629 | 165 | "Choose the default language that will be installed for this database. You " | ||
4630 | 166 | "will be able to install new languages after installation through the " | ||
4631 | 167 | "administration menu." | ||
4632 | 168 | msgstr "" | ||
4633 | 169 | "Vyberte výchozí jazyk, který bude instalován do této databáze. Po instalaci " | ||
4634 | 170 | "budete mít možnost instalovat nové jazyky přes správcovskou nabídku." | ||
4635 | 171 | |||
4636 | 172 | #: controllers/database.py:72 | ||
4637 | 173 | msgid "Administrator password:" | ||
4638 | 174 | msgstr "Heslo správce:" | ||
4639 | 175 | |||
4640 | 176 | #: controllers/database.py:72 | ||
4641 | 177 | msgid "" | ||
4642 | 178 | "This is the password of the 'admin' user that will be created in your new " | ||
4643 | 179 | "database." | ||
4644 | 180 | msgstr "" | ||
4645 | 181 | "Toto je heslo uživatele 'admin', který bude vytvořen ve vaši nové databázi." | ||
4646 | 182 | |||
4647 | 183 | #: controllers/database.py:73 | ||
4648 | 184 | msgid "Confirm password:" | ||
4649 | 185 | msgstr "Potvrdit heslo:" | ||
4650 | 186 | |||
4651 | 187 | #: controllers/database.py:73 | ||
4652 | 188 | msgid "" | ||
4653 | 189 | "This is the password of the 'admin' user that will be created in your new " | ||
4654 | 190 | "database. It has to be the same than the above field." | ||
4655 | 191 | msgstr "" | ||
4656 | 192 | "Toto je heslo uživatele 'admin', který bude vytvořen ve vaši nové databázi. " | ||
4657 | 193 | "Musí být stejné jako pole nad ním." | ||
4658 | 194 | |||
4659 | 195 | #: controllers/database.py:79 | ||
4660 | 196 | msgid "Drop database" | ||
4661 | 197 | msgstr "Odstranit databázi" | ||
4662 | 198 | |||
4663 | 199 | #: controllers/database.py:81 controllers/templates/database.mako:58 | ||
4664 | 200 | msgid "Drop" | ||
4665 | 201 | msgstr "Odstranit" | ||
4666 | 202 | |||
4667 | 203 | #: controllers/database.py:83 controllers/database.py:91 | ||
4668 | 204 | #: controllers/templates/login.mako:43 | ||
4669 | 205 | msgid "Database:" | ||
4670 | 206 | msgstr "Databáze:" | ||
4671 | 207 | |||
4672 | 208 | #: controllers/database.py:84 controllers/database.py:92 | ||
4673 | 209 | #: controllers/database.py:100 controllers/templates/login.mako:61 | ||
4674 | 210 | #: controllers/templates/login_ajax.mako:78 | ||
4675 | 211 | #: controllers/templates/login_ajax.mako:98 | ||
4676 | 212 | msgid "Password:" | ||
4677 | 213 | msgstr "Heslo:" | ||
4678 | 214 | |||
4679 | 215 | #: controllers/database.py:88 | ||
4680 | 216 | msgid "Backup database" | ||
4681 | 217 | msgstr "Zálohovat databáze" | ||
4682 | 218 | |||
4683 | 219 | #: controllers/database.py:90 controllers/templates/database.mako:60 | ||
4684 | 220 | msgid "Backup" | ||
4685 | 221 | msgstr "Zálohovat" | ||
4686 | 222 | |||
4687 | 223 | #: controllers/database.py:96 | ||
4688 | 224 | msgid "Restore database" | ||
4689 | 225 | msgstr "Obnovit databázi" | ||
4690 | 226 | |||
4691 | 227 | #: controllers/database.py:98 controllers/templates/database.mako:62 | ||
4692 | 228 | msgid "Restore" | ||
4693 | 229 | msgstr "Obnovit" | ||
4694 | 230 | |||
4695 | 231 | #: controllers/database.py:99 | ||
4696 | 232 | msgid "File:" | ||
4697 | 233 | msgstr "Soubor:" | ||
4698 | 234 | |||
4699 | 235 | #: controllers/database.py:105 | ||
4700 | 236 | msgid "Change Administrator Password" | ||
4701 | 237 | msgstr "Změnit heslo správce" | ||
4702 | 238 | |||
4703 | 239 | #: controllers/database.py:107 controllers/templates/preferences/index.mako:37 | ||
4704 | 240 | msgid "Change Password" | ||
4705 | 241 | msgstr "Změnit heslo" | ||
4706 | 242 | |||
4707 | 243 | #: controllers/database.py:108 | ||
4708 | 244 | msgid "Old Password:" | ||
4709 | 245 | msgstr "Staré heslo:" | ||
4710 | 246 | |||
4711 | 247 | #: controllers/database.py:109 | ||
4712 | 248 | msgid "New Password:" | ||
4713 | 249 | msgstr "Nové heslo:" | ||
4714 | 250 | |||
4715 | 251 | #: controllers/database.py:110 | ||
4716 | 252 | msgid "Confirm Password:" | ||
4717 | 253 | msgstr "Potvrdit heslo:" | ||
4718 | 254 | |||
4719 | 255 | #: controllers/database.py:173 | ||
4720 | 256 | msgid "You must avoid all accents, space or special characters." | ||
4721 | 257 | msgstr "Musíte se vyhnout přízvukům, mezerám nebo speciálním znakům." | ||
4722 | 258 | |||
4723 | 259 | #: controllers/database.py:174 | ||
4724 | 260 | msgid "Bad database name" | ||
4725 | 261 | msgstr "Chybné jméno databáze" | ||
4726 | 262 | |||
4727 | 263 | #: controllers/database.py:194 | ||
4728 | 264 | msgid "" | ||
4729 | 265 | "The server crashed during installation.\n" | ||
4730 | 266 | "We suggest you to drop this database." | ||
4731 | 267 | msgstr "" | ||
4732 | 268 | "Server zkolaboval během instalace.\n" | ||
4733 | 269 | "Doporučujeme vám smazat tuto databázi." | ||
4734 | 270 | |||
4735 | 271 | #: controllers/database.py:195 | ||
4736 | 272 | msgid "Error during database creation" | ||
4737 | 273 | msgstr "Chyba během vytváření databáze" | ||
4738 | 274 | |||
4739 | 275 | #: controllers/database.py:198 controllers/database.py:225 | ||
4740 | 276 | #: controllers/database.py:271 controllers/database.py:294 | ||
4741 | 277 | msgid "Bad super admin password" | ||
4742 | 278 | msgstr "Chybné heslo hlavního správce" | ||
4743 | 279 | |||
4744 | 280 | #: controllers/database.py:202 | ||
4745 | 281 | msgid "Could not create database." | ||
4746 | 282 | msgstr "Nelze vytvořit databázi." | ||
4747 | 283 | |||
4748 | 284 | #: controllers/database.py:228 | ||
4749 | 285 | msgid "Could not drop database" | ||
4750 | 286 | msgstr "Nelze odstranit databázi" | ||
4751 | 287 | |||
4752 | 288 | #: controllers/database.py:251 | ||
4753 | 289 | msgid "Could not create backup." | ||
4754 | 290 | msgstr "Nelze vytvořit zálohu." | ||
4755 | 291 | |||
4756 | 292 | #: controllers/database.py:275 | ||
4757 | 293 | msgid "Could not restore database" | ||
4758 | 294 | msgstr "Databázi nelze obnovit" | ||
4759 | 295 | |||
4760 | 296 | #: controllers/database.py:298 | ||
4761 | 297 | msgid "Error, password not changed." | ||
4762 | 298 | msgstr "Chyba, heslo nebylo změněno." | ||
4763 | 299 | |||
4764 | 300 | #: controllers/error_page.py:79 | ||
4765 | 301 | msgid "" | ||
4766 | 302 | "Your problem has been sent to the quality team\n" | ||
4767 | 303 | "We will recontact you after analysing the problem." | ||
4768 | 304 | msgstr "" | ||
4769 | 305 | "Váš problém byl odeslán týmu kvality\n" | ||
4770 | 306 | "Po analýze problému vás budeme kontaktovat." | ||
4771 | 307 | |||
4772 | 308 | #: controllers/error_page.py:81 | ||
4773 | 309 | #, python-format | ||
4774 | 310 | msgid "" | ||
4775 | 311 | "Your problem could not be sent to the quality team\n" | ||
4776 | 312 | "Please report this error manually at %s" | ||
4777 | 313 | msgstr "" | ||
4778 | 314 | "Váš problém nelze odeslat týmu kvality\n" | ||
4779 | 315 | "Prosíme nahlašte tuto chybu ručně na: %s" | ||
4780 | 316 | |||
4781 | 317 | #: controllers/form.py:561 | ||
4782 | 318 | #, python-format | ||
4783 | 319 | msgid "Invalid button type \"%s\"" | ||
4784 | 320 | msgstr "Neplatný typ tlačítka \"%s\"" | ||
4785 | 321 | |||
4786 | 322 | #: controllers/form.py:944 controllers/tree.py:243 | ||
4787 | 323 | msgid "No record selected" | ||
4788 | 324 | msgstr "Nevybrán žádný záznam" | ||
4789 | 325 | |||
4790 | 326 | #: controllers/form.py:949 | ||
4791 | 327 | msgid "Print Screen" | ||
4792 | 328 | msgstr "Tisknout obrazovku" | ||
4793 | 329 | |||
4794 | 330 | #: controllers/form.py:1016 widgets/listgrid.py:305 widgets/listgrid.py:366 | ||
4795 | 331 | #: widgets/form/_form.py:910 | ||
4796 | 332 | msgid "Application Error" | ||
4797 | 333 | msgstr "Chyba aplikace" | ||
4798 | 334 | |||
4799 | 335 | #: controllers/form.py:1016 | ||
4800 | 336 | #, python-format | ||
4801 | 337 | msgid "Wrong on_change trigger: %s" | ||
4802 | 338 | msgstr "Chybný spouštěč on_change: %s" | ||
4803 | 339 | |||
4804 | 340 | #: controllers/form.py:1121 | ||
4805 | 341 | msgid "Open resource" | ||
4806 | 342 | msgstr "Otevřít zdroj" | ||
4807 | 343 | |||
4808 | 344 | #: controllers/form.py:1124 | ||
4809 | 345 | msgid "Set to default value" | ||
4810 | 346 | msgstr "Nastavit výchozí hodnotu" | ||
4811 | 347 | |||
4812 | 348 | #: controllers/form.py:1125 | ||
4813 | 349 | msgid "Set as default" | ||
4814 | 350 | msgstr "Nastavit jako výchozí" | ||
4815 | 351 | |||
4816 | 352 | #: controllers/form.py:1132 | ||
4817 | 353 | msgid "Action" | ||
4818 | 354 | msgstr "Akce" | ||
4819 | 355 | |||
4820 | 356 | #: controllers/form.py:1133 | ||
4821 | 357 | msgid "Report" | ||
4822 | 358 | msgstr "Výkaz" | ||
4823 | 359 | |||
4824 | 360 | #: controllers/impex.py:66 | ||
4825 | 361 | msgid "" | ||
4826 | 362 | "Operation failed\n" | ||
4827 | 363 | "I/O error" | ||
4828 | 364 | msgstr "" | ||
4829 | 365 | "Operace selhala\n" | ||
4830 | 366 | "I/O chyba" | ||
4831 | 367 | |||
4832 | 368 | #: controllers/impex.py:402 | ||
4833 | 369 | msgid "Export Error" | ||
4834 | 370 | msgstr "Chyba exportu" | ||
4835 | 371 | |||
4836 | 372 | #: controllers/impex.py:469 | ||
4837 | 373 | msgid "Database ID" | ||
4838 | 374 | msgstr "ID databáze" | ||
4839 | 375 | |||
4840 | 376 | #: controllers/impex.py:476 | ||
4841 | 377 | msgid "Error opening .CSV file" | ||
4842 | 378 | msgstr "Chyba otvírání souboru .CSV" | ||
4843 | 379 | |||
4844 | 380 | #: controllers/impex.py:476 | ||
4845 | 381 | msgid "Input Error." | ||
4846 | 382 | msgstr "Chyba vstupu." | ||
4847 | 383 | |||
4848 | 384 | #: controllers/impex.py:498 | ||
4849 | 385 | #, python-format | ||
4850 | 386 | msgid "You cannot import the field '%s', because we cannot auto-detect it" | ||
4851 | 387 | msgstr "" | ||
4852 | 388 | "Nemůžete importovat pole '%s', protože jej nemůžeme automaticky rozpoznat" | ||
4853 | 389 | |||
4854 | 390 | #: controllers/impex.py:501 | ||
4855 | 391 | #, python-format | ||
4856 | 392 | msgid "Error processing the first line of the file. Field \"%s\" is unknown" | ||
4857 | 393 | msgstr "Chyba zpracování první řádky souboru. Neznámé pole \"%s\"" | ||
4858 | 394 | |||
4859 | 395 | #: controllers/impex.py:72 controllers/impex.py:501 | ||
4860 | 396 | msgid "Import Error." | ||
4861 | 397 | msgstr "Chyba importu." | ||
4862 | 398 | |||
4863 | 399 | #: controllers/impex.py:520 | ||
4864 | 400 | msgid "The CSV delimiter must be a single character" | ||
4865 | 401 | msgstr "CSV oddělovač musí být jediný znak" | ||
4866 | 402 | |||
4867 | 403 | #: controllers/impex.py:532 | ||
4868 | 404 | msgid "File Format Error" | ||
4869 | 405 | msgstr "Chyba formátu souboru" | ||
4870 | 406 | |||
4871 | 407 | #: controllers/impex.py:550 | ||
4872 | 408 | msgid "XML-RPC error" | ||
4873 | 409 | msgstr "Chyba XML-RPC" | ||
4874 | 410 | |||
4875 | 411 | #: controllers/impex.py:555 | ||
4876 | 412 | #, python-format | ||
4877 | 413 | msgid "Imported %d objects" | ||
4878 | 414 | msgstr "Importováno %d objektů" | ||
4879 | 415 | |||
4880 | 416 | #: controllers/impex.py:560 | ||
4881 | 417 | #, python-format | ||
4882 | 418 | msgid "Error trying to import this record:%s. ErrorMessage:%s %s" | ||
4883 | 419 | msgstr "Chyba při pokusu o import tohoto záznamu:%s. Chybová zpráva:%s %s" | ||
4884 | 420 | |||
4885 | 421 | #: controllers/impex.py:561 | ||
4886 | 422 | msgid "ImportationError" | ||
4887 | 423 | msgstr "ChybaImportování" | ||
4888 | 424 | |||
4889 | 425 | #: controllers/listgrid.py:52 | ||
4890 | 426 | msgid "Parent record doesn't exists..." | ||
4891 | 427 | msgstr "Nadřazený záznam neexistuje..." | ||
4892 | 428 | |||
4893 | 429 | #: controllers/preferences.py:35 | ||
4894 | 430 | msgid "Change your password" | ||
4895 | 431 | msgstr "Změnit vaše heslo" | ||
4896 | 432 | |||
4897 | 433 | #: controllers/preferences.py:65 controllers/templates/header.mako:59 | ||
4898 | 434 | msgid "Preferences" | ||
4899 | 435 | msgstr "Předvolby" | ||
4900 | 436 | |||
4901 | 437 | #: controllers/preferences.py:92 | ||
4902 | 438 | msgid "All passwords have to be filled." | ||
4903 | 439 | msgstr "Musí být vyplněna všechna hesla." | ||
4904 | 440 | |||
4905 | 441 | #: controllers/preferences.py:94 | ||
4906 | 442 | msgid "The new password and its confirmation must be identical." | ||
4907 | 443 | msgstr "Nové heslo a jeho potvrzení musí být stejné." | ||
4908 | 444 | |||
4909 | 445 | #: controllers/preferences.py:103 | ||
4910 | 446 | msgid "Could not change your password." | ||
4911 | 447 | msgstr "Nelze změnit vaše heslo." | ||
4912 | 448 | |||
4913 | 449 | #: controllers/preferences.py:105 | ||
4914 | 450 | msgid "Original password incorrect, your password was not changed." | ||
4915 | 451 | msgstr "Neplatné původní heslo, vaše heslo nebylo změněno." | ||
4916 | 452 | |||
4917 | 453 | #: controllers/root.py:174 | ||
4918 | 454 | #, python-format | ||
4919 | 455 | msgid "Version %s" | ||
4920 | 456 | msgstr "Verze %s" | ||
4921 | 457 | |||
4922 | 458 | #: controllers/translator.py:136 | ||
4923 | 459 | msgid "You need to save the resource before adding translations." | ||
4924 | 460 | msgstr "Potřebujte uložit zdroj před přidáním překladů." | ||
4925 | 461 | |||
4926 | 462 | #: controllers/tree.py:274 | ||
4927 | 463 | msgid "No resource selected" | ||
4928 | 464 | msgstr "Nevybrán žádný zdroj" | ||
4929 | 465 | |||
4930 | 466 | #: controllers/utils.py:43 | ||
4931 | 467 | msgid "Could not connect to server" | ||
4932 | 468 | msgstr "Nelze připojit k serveru" | ||
4933 | 469 | |||
4934 | 470 | #: controllers/utils.py:127 controllers/templates/login_ajax.mako:111 | ||
4935 | 471 | msgid "Bad username or password" | ||
4936 | 472 | msgstr "Chybné jméno nebo heslo" | ||
4937 | 473 | |||
4938 | 474 | #: controllers/view_log.py:32 | ||
4939 | 475 | msgid "ID" | ||
4940 | 476 | msgstr "ID" | ||
4941 | 477 | |||
4942 | 478 | #: controllers/view_log.py:33 | ||
4943 | 479 | msgid "Creation User" | ||
4944 | 480 | msgstr "Vytvořil" | ||
4945 | 481 | |||
4946 | 482 | #: controllers/view_log.py:34 | ||
4947 | 483 | msgid "Creation Date" | ||
4948 | 484 | msgstr "Datum vytvoření" | ||
4949 | 485 | |||
4950 | 486 | #: controllers/view_log.py:35 | ||
4951 | 487 | msgid "Latest Modification by" | ||
4952 | 488 | msgstr "Změnil" | ||
4953 | 489 | |||
4954 | 490 | #: controllers/view_log.py:36 | ||
4955 | 491 | msgid "Latest Modification Date" | ||
4956 | 492 | msgstr "Naposledy změněno" | ||
4957 | 493 | |||
4958 | 494 | #: controllers/view_log.py:37 | ||
4959 | 495 | msgid "Owner" | ||
4960 | 496 | msgstr "Vlastník" | ||
4961 | 497 | |||
4962 | 498 | #: controllers/view_log.py:38 | ||
4963 | 499 | msgid "Group Owner" | ||
4964 | 500 | msgstr "Vlastník skupiny" | ||
4965 | 501 | |||
4966 | 502 | #: controllers/view_log.py:39 | ||
4967 | 503 | msgid "Access Level" | ||
4968 | 504 | msgstr "Úroveň přístupu" | ||
4969 | 505 | |||
4970 | 506 | #: controllers/view_log.py:40 | ||
4971 | 507 | msgid "Internal module data ID" | ||
4972 | 508 | msgstr "ID vnitřního datového modulu" | ||
4973 | 509 | |||
4974 | 510 | #: controllers/viewed.py:221 | ||
4975 | 511 | msgid "Invalid view id." | ||
4976 | 512 | msgstr "Chybné id pohledu" | ||
4977 | 513 | |||
4978 | 514 | #: controllers/viewed.py:499 | ||
4979 | 515 | msgid "Unable to create inherited view." | ||
4980 | 516 | msgstr "Nelze vytvořit zděděný pohled" | ||
4981 | 517 | |||
4982 | 518 | #: controllers/viewed.py:501 | ||
4983 | 519 | msgid "Can't create inherited view here." | ||
4984 | 520 | msgstr "Zde nelze vytvořit zděděný pohled." | ||
4985 | 521 | |||
4986 | 522 | #: controllers/viewed.py:504 | ||
4987 | 523 | msgid "Not implemented yet!" | ||
4988 | 524 | msgstr "Doposud nerealizováno!" | ||
4989 | 525 | |||
4990 | 526 | #: controllers/viewed.py:609 | ||
4991 | 527 | msgid "Unable to update the view." | ||
4992 | 528 | msgstr "Nelze aktualizovat pohled." | ||
4993 | 529 | |||
4994 | 530 | #: controllers/viewed.py:859 | ||
4995 | 531 | msgid "New Window" | ||
4996 | 532 | msgstr "Nové okno" | ||
4997 | 533 | |||
4998 | 534 | #: controllers/viewed.py:871 | ||
4999 | 535 | msgid "Save Button" | ||
5000 | 536 | msgstr "Tlačítko Uložit" |
The diff has been truncated for viewing.