Merge lp:~unifield-team/unifield-web/web_aio_28 into lp:unifield-web

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
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+134406@code.launchpad.net
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 include admin.py openerp-web.py run-tests.py py2exe_utils.py setup.nsi
6 graft doc
7 prune dist
8-prune lib
9+graft lib
10 graft win32
11 graft pixmaps
12
13
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 def act_url(action, data):
19 return execute_url(**dict(data,
20 url=action['url'],
21- target=action['target'],
22+ target=action.get('target','new'),
23 type=action['type']
24 ))
25
26@@ -347,8 +347,16 @@
27 # for that passing active_id in headers, to get it in openAction
28 if getattr(cherrypy.request, 'params', []):
29 if getattr(cherrypy.request.params, 'context', {}):
30- cherrypy.response.headers['active_id'] = cherrypy.request.params.get('_terp_id')\
31- or cherrypy.request.params.context.get('active_id')
32+<<<<<<< TREE
33+ cherrypy.response.headers['active_id'] = cherrypy.request.params.get('_terp_id')\
34+ or cherrypy.request.params.context.get('active_id')
35+=======
36+ cherrypy.response.headers['active_id'] = cherrypy.request.params.get('_terp_id')\
37+ or cherrypy.request.params.context.get('active_id')
38+
39+ # when action 'open a new tab', make sure we follow 'nodestroy' flag, if set.
40+ no_destroy = (action.get('nodestroy') and open_new_tab) and 'true' or 'false'
41+>>>>>>> MERGE-SOURCE
42
43 # Add 'opened' mark to indicate we're now within the popup and can
44 # continue on during the second round of execution
45@@ -370,11 +378,12 @@
46 url = '/?' + urllib.urlencode({'next': url})
47
48 cherrypy.response.headers['X-Target'] = action['target']
49+ cherrypy.response.headers['X-No-Destroy'] = no_destroy
50 cherrypy.response.headers['Location'] = url
51 return """<script type="text/javascript">
52- window.top.openAction('%s', '%s');
53+ window.top.openAction('%s', '%s', false, %s);
54 </script>
55- """ % (url, action['target'])
56+ """ % (url, action['target'], no_destroy)
57
58 def execute(action, **data):
59 """Execute the action with the provided data. for internal use only.
60@@ -406,6 +415,9 @@
61 # determine target for openAction()
62 target = {'new': 'popup'}.get(data['target'], 'iframe')
63
64+ cherrypy.response.headers['X-Target'] = target
65+ cherrypy.response.headers['Location'] = url
66+
67 return """<script type="text/javascript">
68 openAction('%s', '%s')
69 </script>
70@@ -447,6 +459,10 @@
71
72 ctx = dict(rpc.session.context, **(data.get('context') or {}))
73
74+ if type == 'ir.actions.report.xml':
75+ # avoid reading large binary values that we won't even care about
76+ ctx['bin_size'] = True
77+
78 res = rpc.session.execute('object', 'execute', type, 'read', act_id, False, ctx)
79 return execute(res, **data)
80
81
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 attachment = rpc.RPCProxy('ir.attachment').read(record, [], rpc.session.context)
87
88 if attachment['type'] == 'binary':
89- cherrypy.response.headers["Content-Disposition"] = 'attachment; filename="%s"' % attachment['name']
90+ cherrypy.response.headers["Content-Disposition"] = 'attachment; filename="%s"' % attachment['name'].encode('utf-8')
91 return base64.decodestring(attachment['datas'])
92 elif attachment['type'] == 'url':
93 raise redirect(attachment['url'])
94@@ -75,6 +75,7 @@
95 attachment_id = rpc.RPCProxy('ir.attachment').create({
96 'name': datas.filename,
97 'datas': base64.encodestring(datas.file.read()),
98+ 'datas_fname': datas.filename,
99 }, ctx)
100 return {'id': attachment_id, 'name': datas.filename}
101
102
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 submit_text = _('Restore')
108 fields = [openobject.widgets.FileField(name="filename", label=_('File:')),
109 openobject.widgets.PasswordField(name='password', label=_('Password:'), validator=formencode.validators.NotEmpty()),
110- openobject.widgets.TextField(name='dbname', label=_('New database name:'), validator=formencode.validators.NotEmpty())]
111+ openobject.widgets.TextField(name='dbname', label=_('New database name:'), validator=formencode.validators.NotEmpty(), readonly=1, attrs={'disabled': 'disabled'})]
112
113 class FormPassword(DBForm):
114 name = "password"
115@@ -254,7 +254,7 @@
116 return self.backup()
117 raise redirect('/openerp/login')
118
119- @expose(template="/openerp/controllers/templates/database.mako")
120+ @expose(template="/openerp/controllers/templates/database_restore.mako")
121 def restore(self, tg_errors=None, **kw):
122 form = _FORMS['restore']
123 error = self.msg
124@@ -264,8 +264,17 @@
125 @expose()
126 @validate(form=_FORMS['restore'])
127 @error_handler(restore)
128- def do_restore(self, filename, password, dbname, **kw):
129+ def do_restore(self, filename, password, dbname=None, **kw):
130 self.msg = {}
131+ if getattr(filename, 'filename', ''):
132+ submitted_filename = filename.filename
133+ matches = re.search('^(.*)-[0-9]{8}-[0-9]{6}.dump$', submitted_filename)
134+ if matches:
135+ dbname = matches.group(1)
136+ else:
137+ self.msg = {'message': _('The choosen file in not a valid database file'),
138+ 'title': _('Error')}
139+ return self.restore()
140 try:
141 data = base64.encodestring(filename.file.read())
142 rpc.session.execute_db('restore', password, dbname, data)
143
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 params.ids = (params.ids or []) + [params.id]
149 params.count += 1
150 else:
151+<<<<<<< TREE
152 ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info)
153 if params.button and params.button.name:
154 ctx.update({'button': params.button.name})
155@@ -428,11 +429,38 @@
156 # original_data[field] = original_value[0]
157 # if field in data and data[field] != original_data[field]:
158 # modified[field] = data[field]
159+=======
160+ ctx = dict((params.context or {}), **rpc.session.context)
161+ original_data = Model.read(params.id, data.keys(), ctx)
162+ modified = {}
163+
164+ if original_data and isinstance(original_data, dict):
165+ for field, original_value in original_data.iteritems():
166+ if isinstance(original_value, tuple):
167+ original_data[field] = original_value[0]
168+ if field in data and data[field] != original_data[field]:
169+ #When field is many2many at that time following code will be applied
170+ if isinstance(data[field], list) and isinstance(data[field][0][2], list):
171+ if sorted(data[field][0][2]) != sorted(original_data[field]):
172+ modified[field] = data[field]
173+ else:
174+ modified[field] = data[field]
175+>>>>>>> MERGE-SOURCE
176
177+<<<<<<< TREE
178 # Model.write([params.id], modified, ctx)
179 #else:
180 # Model.write([params.id], data, ctx)
181 Model.write([params.id], data, ctx)
182+=======
183+ ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info)
184+ if modified:
185+ Model.write([params.id], modified, ctx)
186+ else:
187+ ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info)
188+ if data:
189+ Model.write([params.id], data, ctx)
190+>>>>>>> MERGE-SOURCE
191
192 tw.ConcurrencyInfo.update(
193 params.model, Model.read([params.id], ['__last_update'], ctx)
194@@ -672,7 +700,7 @@
195 @expose(content_type='application/octet-stream')
196 def save_binary_data(self, _fname='file.dat', **kw):
197 params, data = TinyDict.split(kw)
198-
199+
200 cherrypy.response.headers['Content-Disposition'] = 'attachment; filename="%s"' % _fname
201
202 if params.datas:
203@@ -720,13 +748,14 @@
204 model = kw.get('model')
205 field = kw.get('field')
206 id = kw.get('id')
207+ default_value = kw.get('default_value')
208 proxy = rpc.RPCProxy(model)
209 if id == 'None':
210 # FIXME: doesnt honor the context
211- res = proxy.default_get([field]).get(field,'')
212+ res = default_value or proxy.default_get([field]).get(field,'')
213 else:
214 res = proxy.read([int(id)], [field])[0].get(field)
215- if res:
216+ if res and res != 'None':
217 return base64.decodestring(res)
218 else:
219 return open(openobject.paths.addons('openerp','static','images','placeholder.png'),'rb').read()
220@@ -984,7 +1013,7 @@
221 @expose()
222 def action(self, **kw):
223 params, data = TinyDict.split(kw)
224- context_menu = kw.get('context_menu')
225+ context_menu = kw.get('context_menu') or False
226
227 id = params.id or False
228 ids = params.selection or []
229@@ -1009,7 +1038,11 @@
230
231 if type is None:
232 action_type = rpc.RPCProxy('ir.actions.actions').read(act_id, ['type'], context)['type']
233- action = rpc.session.execute('object', 'execute', action_type, 'read', act_id, False, context)
234+ tmp_ctx = dict(context)
235+ if action_type == 'ir.actions.report.xml':
236+ # avoid reading large binary values that we won't even care about
237+ tmp_ctx['bin_size'] = True
238+ action = rpc.session.execute('object', 'execute', action_type, 'read', act_id, False, tmp_ctx)
239
240 if domain:
241 if isinstance(domain, basestring):
242@@ -1017,6 +1050,8 @@
243 domain.extend(expr_eval(action.get('domain', '[]'), context))
244 action['domain'] = ustr(domain)
245
246+ if context.get('search_view'):
247+ context.pop('search_view')
248 action['form_context'] = context or {}
249 import actions
250 return actions.execute(action, model=params.model, id=id, ids=ids, report_type='pdf', context_menu=context_menu)
251@@ -1038,6 +1073,10 @@
252 model = data.pop('_terp_model')
253 context = data.pop('_terp_context')
254
255+ change_default = False
256+ if '_terp_change_default' in data:
257+ change_default = data.pop('_terp_change_default')
258+
259 try:
260 context = eval(context) # convert to python dict
261 except:
262@@ -1148,6 +1187,17 @@
263 if 'domain' in result:
264 for k in result['domain']:
265 result['domain'][k] = ustr(result['domain'][k])
266+<<<<<<< TREE
267+=======
268+
269+ if change_default:
270+ value = data.get('_terp_value')
271+ proxy = rpc.RPCProxy('ir.values')
272+ values = proxy.get('default', '%s=%s' % (caller, value), [(model, False)], False, context)
273+ for index, fname, value in values:
274+ if fname not in result['value']:
275+ result['value'][fname] = value
276+>>>>>>> MERGE-SOURCE
277 return result
278
279 @expose('json')
280@@ -1221,7 +1271,7 @@
281 for index, fname, value in values:
282 data[fname] = value
283
284- return dict(values=data)
285+ return dict(value=data)
286
287 # Possible to create shortcut for particular object or not.
288 def can_shortcut_create(self):
289
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
295 params, data = TinyDict.split(kw)
296 ctx = dict((params.context or {}), **rpc.session.context)
297+<<<<<<< TREE
298+=======
299+
300+ if ctx.get("group_by_no_leaf", 0):
301+ raise common.warning(_("You cannot export these record(s) !"), _('Error'))
302+
303+>>>>>>> MERGE-SOURCE
304 views = {}
305 if params.view_mode and params.view_ids:
306 for i, view in enumerate(params.view_mode):
307@@ -235,23 +242,12 @@
308 id = prefix + (prefix and '/' or '') + field
309 nm = name + (name and '/' or '') + value['string']
310
311- if is_importing and (value.get('type') not in ('reference',)) and (not value.get('readonly') \
312- or not dict(value.get('states', {}).get('draft', [('readonly', True)])).get('readonly', True)):
313-
314- record.update(id=id, items={'name': nm},
315- action='javascript: void(0)', target=None,
316- icon=None, children=[],
317- required=value.get('required', False))
318-
319- records.append(record)
320-
321- elif not is_importing:
322-
323- record.update(id=id, items={'name': nm},
324- action='javascript: void(0)', target=None,
325- icon=None, children=[])
326- records.append(record)
327-
328+ record.update(id=id, items={'name': nm},
329+ action='javascript: void(0)', target=None,
330+ icon=None, children=[],
331+ required=value.get('required', False))
332+
333+ records.append(record)
334
335 if len(nm.split('/')) < 3 and value.get('relation', False):
336
337
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 import simplejson
343
344 import cherrypy
345-from openerp.controllers import SecuredController
346+from openerp.controllers import SecuredController, openo2m
347 from openerp.utils import rpc, TinyDict, TinyForm, TinyFormError, context_with_concurrency_info, cache
348 from openerp.widgets import listgrid, listgroup
349
350@@ -186,14 +186,23 @@
351 domain = grp_domain
352 group_level = ast.literal_eval(group_level)
353 groups = ast.literal_eval(groups)
354-
355- context = {'group_by_no_leaf': int(no_leaf), 'group_by': group_by, '__domain': domain}
356- args = {'editable': True,
357+ # build a new TinyDict to correctly handle _terp_* params
358+ params = TinyDict(**kw)
359+ editable = params.editable
360+ selectable = params.selectable or 2
361+ context = params.context or {}
362+ context.update({'group_by_no_leaf': int(no_leaf), 'group_by': group_by, '__domain': domain})
363+ # we force offset to 0, as in group_by mode only 'limit' have an effect
364+ # (offset pagination in only for base grouping - which is handled by ListGroup)
365+ offset = 0
366+ limit = params.limit or 20
367+ args = {'editable': editable,
368 'view_mode': ['tree', 'form', 'calendar', 'graph'],
369 'nolinks': 1, 'group_by_ctx': group_by,
370- 'selectable': 2,
371+ 'selectable': selectable,
372 'multiple_group_by': True,
373 'sort_key': kw.get('sort_key'),
374+ 'offset': offset, 'limit': limit,
375 'sort_order': kw.get('sort_order')}
376
377 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 def get(self, **kw):
380 params, data = TinyDict.split(kw)
381
382+ if not params.model and params.o2m and params.view_params.model:
383+ # Ok, no base model, copy infos from _terp_view_params.
384+ # This is required to be able to correctly build the form view
385+ # and to get the 'widget' related to the requested listgrid
386+ view_params_base, x = TinyDict.split(params.view_params)
387+ view_params_update = dict([(k[6:], v) for k, v in view_params_base.iteritems()
388+ if k.startswith('_terp_') ])
389+ params.update(view_params_update)
390+
391 groupby = params.get('_terp_group_by_ctx')
392 if groupby and isinstance(groupby, basestring):
393 groupby = groupby.split(',')
394@@ -283,6 +301,8 @@
395 if params.wiz_id:
396 res = wizard.Wizard().execute(params)
397 frm = res['form']
398+ elif params.o2m and len(params.o2m.split('/')) > 1:
399+ frm = openo2m.OpenO2M().create_form(params)
400 else:
401 frm = form.Form().create_form(params)
402
403@@ -373,14 +393,27 @@
404 return dict(error = ustr(e))
405
406 @expose('json', methods=('POST',))
407- def groupbyDrag(self, model, children, domain):
408- domain = ast.literal_eval(domain)[0]
409+ def groupbyDrag(self, model, children, domain, level='0'):
410+ """ update records represented by children domain based on groupby domain
411+
412+ :param model: model to update
413+ :param children: children records domain or children record id
414+ :param domain: group_by domain will be convert to values
415+ """
416+ domain = ast.literal_eval(domain)
417 children = ast.literal_eval(children)
418+ level = ast.literal_eval(level)
419 if isinstance(children, list):
420 children = list(children)
421 else:
422- children = [children]
423- rpc.RPCProxy(model).write(children, {domain[0]: domain[2]})
424+ children = [('id','=',children)]
425+ # convert domain to values
426+ values = {}
427+ for i, d in enumerate(domain):
428+ if len(d) == 3 and i <= level:
429+ values[d[0]] = d[2]
430+ children_ids = rpc.RPCProxy(model).search(children)
431+ rpc.RPCProxy(model).write(children_ids, values)
432 return {}
433
434 @expose('json', methods=('POST',))
435
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 # to get proper view, first generate form using the view_params
441 vp = params.view_params
442
443+ widget_prefix, _sep, widget_name = (params.o2m or '').rpartition('/')
444+ if widget_prefix:
445+ prefix_vp = vp.chain_get(widget_prefix)
446+ if prefix_vp:
447+ vp = prefix_vp
448+
449 form = tw.form_view.ViewForm(vp, name="view_form", action="/openerp/openo2m/save")
450 cherrypy.request.terp_validators = {}
451
452- if '/' in params.o2m:
453- params.o2m = '.'.join(params.o2m.split('/')[-1:])
454+ wid = form.screen.widget.get_widgets_by_name(widget_name)[0]
455
456- wid = form.screen.widget.get_widgets_by_name(params.o2m)[0]
457+ if widget_prefix and params.o2m:
458+ prefix_params = params.chain_get(params.o2m)
459+ if prefix_params:
460+ params.update(prefix_params)
461
462 # save view_params for later phazes
463 vp = vp.make_plain('_terp_view_params/')
464 hiddens = map(lambda x: tw.form.Hidden(name=x, default=ustr(vp[x])), vp)
465
466+ if params.m2o:
467+ hiddens += [tw.form.Hidden(name='_terp_m2o', default=params.m2o)]
468+
469 params.prefix = params.o2m
470 params.views = wid.view
471
472
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 #
478 ###############################################################################
479 import cherrypy
480+import re
481
482 import openobject
483 from openerp.controllers import SecuredController, unsecured, actions, login as tiny_login, form, widgets
484@@ -29,12 +30,26 @@
485
486 _MAXIMUM_NUMBER_WELCOME_MESSAGES = 3
487
488+def insert_xmlhttprequest_status_emulation(text, status=None):
489+ """ insert http reponse status on document body,
490+ so that XMLHttpRequest using <iframe/> hack when form
491+ contains binary data, can work correctly """
492+ if status is None:
493+ status = cherrypy.response.status
494+ body_starttag = re.search('<body.*?>', text)
495+ if body_starttag:
496+ # insert status attribute
497+ insert_pos = body_starttag.end() - 1
498+ return text[:insert_pos] + ' status="%d"' % (status) + text[insert_pos:]
499+ return text
500+
501 def _cp_on_error():
502 cherrypy.request.pool = openobject.pooler.get_pool()
503
504 errorpage = cherrypy.request.pool.get_controller("/openerp/errorpage")
505 message = errorpage.render()
506 cherrypy.response.status = 500
507+ message = insert_xmlhttprequest_status_emulation(message, 500)
508 cherrypy.response.body = [message]
509
510 cherrypy.config.update({'request.error_response': _cp_on_error})
511@@ -127,7 +142,9 @@
512 id = ids[0]
513 ids = menus.search([('parent_id', '=', id)], 0, 0, 0, ctx)
514 tools = menus.read(ids, ['name', 'action'], ctx)
515- view = cache.fields_view_get('ir.ui.menu', 1, 'tree', {})
516+ #searching id for the hierarchycal tree view of ir.ui.menu
517+ view_id = rpc.RPCProxy('ir.ui.view').search([('model','=','ir.ui.menu'),('type','=','tree')],0,0,'id')[0]
518+ view = cache.fields_view_get('ir.ui.menu', view_id, 'tree', {})
519 fields = cache.fields_get(view['model'], False, ctx)
520
521 for tool in tools:
522
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 proxy = rpc.RPCProxy(model)
528 params.search_text = False
529
530+<<<<<<< TREE
531 # parent's search_view has no business being in m2o or m2m
532 if '_terp_context' in params and 'search_view' in params['_terp_context']:
533 params.get('_terp_context').pop('search_view', None)
534
535+=======
536+ # parent's search_view has no business being in m2o or m2m
537+ if '_terp_context' in params and 'search_view' in params['_terp_context']:
538+ params.get('_terp_context').pop('search_view', None)
539+>>>>>>> MERGE-SOURCE
540 if text:
541 params.search_text = True
542 ids = proxy.name_search(text, params.domain or [], 'ilike', ctx, False)
543@@ -186,6 +192,10 @@
544 if val is None:
545 context[key] = False
546
547+ for key, val in context.items():
548+ if key in ctx:
549+ context[key] = ctx[key]
550+
551 if isinstance(context, dict):
552 context = expr_eval(context, ctx)
553 parent_context.update(context)
554@@ -262,7 +272,15 @@
555
556 group_by_ctx = kw.get('group_by_ctx', [])
557 if isinstance(group_by_ctx, str):
558- group_by_ctx = cleanup_group_by(group_by_ctx).split(',')
559+<<<<<<< TREE
560+ group_by_ctx = cleanup_group_by(group_by_ctx).split(',')
561+=======
562+ group_by_ctx = cleanup_group_by(group_by_ctx).split(',')
563+
564+ filter_status = all_domains.get('filter_status')
565+ if isinstance(filter_status, str):
566+ filter_status = ast.literal_eval(filter_status)
567+>>>>>>> MERGE-SOURCE
568
569 if domains:
570 domains = eval(domains)
571@@ -283,7 +301,9 @@
572
573 if check_domain and isinstance(check_domain, basestring):
574 domain = expr_eval(check_domain, context) or []
575-
576+ m2o_filter_domain = all_domains.get('m2o_filter_domain', [])
577+ for dom in m2o_filter_domain:
578+ domain += expr_eval(dom['domain'], {'self': dom['self']}) or []
579 search_data = {}
580 model = kw.get('model')
581 proxy = rpc.RPCProxy(model)
582@@ -376,12 +396,42 @@
583 if selection_domain:
584 domain.extend(selection_domain)
585
586+ for i,flt in enumerate(ncustom_domain):
587+ if len(flt) > 1:
588+
589+ left_field = flt[0]
590+ operator = flt[1]
591+ right_val = flt[2]
592+
593+ if res[left_field]['type'] == 'selection' and right_val:
594+
595+ if operator in ['ilike','=','in']:
596+ operator = 'in'
597+ else:
598+ operator = 'not in'
599+
600+ keys = []
601+ if isinstance(right_val, list):
602+ for sel_val in res[left_field]['selection']:
603+ for rgt_val in right_val:
604+ if sel_val[1].lower().find(rgt_val.lower()) != -1 and sel_val[0] not in keys:
605+ keys.append(sel_val[0])
606+ else:
607+ for sel_val in res[left_field]['selection']:
608+ if sel_val[1].lower().find(right_val.lower()) != -1:
609+ keys.append(sel_val[0])
610+
611+ if keys:
612+ ncustom_domain[i] = (left_field, operator, keys)
613+
614 if not domain:
615 domain = None
616 if not isinstance(group_by_ctx, list):
617 group_by_ctx = [group_by_ctx]
618 if group_by_ctx:
619 search_data['group_by_ctx'] = group_by_ctx
620+ if filter_status:
621+ search_data['filter_status'] = filter_status
622 ncustom_domain = openobject.i18n.format.convert_date_format_in_domain(ncustom_domain, res, context)
623 return dict(domain=ustr(domain), context=ustr(ctx), search_data=ustr(search_data), filter_domain=ustr(ncustom_domain))
624
625@@ -427,7 +477,9 @@
626 name = kw.get('name')
627 model = kw.get('model')
628 domain = kw.get('domain')
629- group_by = kw.get('group_by', '[]')
630+ group_by = kw.get('group_by', [])
631+ if isinstance(group_by, str):
632+ group_by = expr_eval(group_by)
633 if group_by:
634 context = {'group_by': group_by}
635 else:
636
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 <link rel="stylesheet" type="text/css" href="/openerp/static/css/listgrid.css"/>
642 <link rel="stylesheet" type="text/css" href="/openerp/static/css/autocomplete.css"/>
643
644- <!--[if lt IE 9]>
645+ <!--[if lte IE 9]>
646 <link rel="stylesheet" type="text/css" href="/openerp/static/css/style-ie.css"/>
647 <![endif]-->
648 ${self.header()}
649
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+<%inherit file="/openerp/controllers/templates/base_dispatch.mako"/>
655+<%def name="current_for(name)"><%
656+ if form.name == name: context.write('current')
657+%></%def>
658+<%def name="header()">
659+ <title>${form.string}</title>
660+
661+ <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.waitbox.js"></script>
662+
663+ <link rel="stylesheet" type="text/css" href="/openerp/static/css/waitbox.css"/>
664+ <link rel="stylesheet" type="text/css" href="/openerp/static/css/database.css"/>
665+
666+ <script type="text/javascript">
667+ function on_create() {
668+ new openerp.ui.WaitBox().showAfter(2000);
669+ return true;
670+ }
671+ </script>
672+ % if error:
673+ <script type="text/javascript">
674+ var $error_tbl = jQuery('<table class="errorbox">');
675+ $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+ $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+
678+ jQuery(document).ready(function () {
679+ jQuery(document.body).append($error_tbl);
680+ $error_tbl.dialog({
681+ modal: true,
682+ resizable: false,
683+ title: '<div class="error_message_header">${error.get("title", "Warning")}</div>'
684+ });
685+ })
686+ </script>
687+ % endif
688+</%def>
689+
690+<%def name="content()">
691+ <table width="100%">
692+ <tr><%include file="header.mako"/></tr>
693+ </table>
694+ <div class="db-form">
695+ <div>
696+ <table width="100%" class="titlebar">
697+ <tr>
698+ <td width="32px" align="center">
699+ <img alt="" src="/openerp/static/images/stock/stock_person.png">
700+ </td>
701+ <td class="action">${form.string}</td>
702+ <td class="links">
703+ <a class="button static_boxes" href="${py.url('/')}">${_("Login")}</a>
704+ <a class="button static_boxes ${current_for('create')}"
705+ href="${py.url('/openerp/database/create')}">${_("Create")}</a>
706+ <a class="button static_boxes ${current_for('drop')}"
707+ href="${py.url('/openerp/database/drop')}">${_("Drop")}</a>
708+ <a class="button static_boxes ${current_for('backup')}"
709+ href="${py.url('/openerp/database/backup')}">${_("Backup")}</a>
710+ <a class="button static_boxes ${current_for('restore')}"
711+ href="${py.url('/openerp/database/restore')}">${_("Restore")}</a>
712+ <a class="button static_boxes ${current_for('password')}"
713+ href="${py.url('/openerp/database/password')}">${_("Password")}</a>
714+ </td>
715+ </tr>
716+ </table>
717+ </div>
718+ <hr style="margin: 0 0 !important; background-color: #5A5858;">
719+ % if form.name == 'create':
720+ <div>${form.display(value=dict(password = "admin"))}</div>
721+ % else:
722+ <div>${form.display()}</div>
723+ % endif
724+
725+ <script type="text/javascript">
726+ jQuery('#filename').change(function() {
727+ var choosen_filename = jQuery(this).val();
728+ var matches = /^(.*)-[0-9]{8}-[0-9]{6}.dump$/.exec(choosen_filename);
729+ if (!matches) {
730+ // show jquery alert
731+ alert('${_('The choosen file in not a valid database file')}');
732+ } else {
733+ jQuery('#dbname').val(matches[1]);
734+ }
735+ });
736+ </script>
737+ </div>
738+<%include file="footer.mako"/>
739+</%def>
740
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 <%!
746 MAINTENANCE_CONTRACTS_URL = 'http://www.openerp.com/support-or-publisher-warranty-contract'
747 %>
748+<%! import cherrypy
749+def is_xmlhttprequest():
750+ return cherrypy.request.headers.get('X-Requested-With') == 'XMLHttpRequest' and True or False
751+%>
752 <%def name="header()">
753 <script type="text/javascript" src="/openerp/static/javascript/openerp/openerp.ui.textarea.js"></script>
754
755@@ -83,7 +87,9 @@
756 </%def>
757
758 <%def name="content()">
759-
760+% if is_xmlhttprequest():
761+<body>
762+% endif
763 <table class="view" border="0" width="100%">
764 <tr>
765 % if maintenance:
766@@ -225,5 +231,8 @@
767 % endif
768 </tr>
769 </table>
770+% if is_xmlhttprequest():
771+</body>
772+% endif
773
774 </%def>
775
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 /*
781 % endif
782 */
783+ jQuery('[autofocus="autofocus"]').focus();
784 });
785 </script>
786
787
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 <td class="grid-cell" width="${100 / len(langs)}%">${lang['name']}</td>
794 % endfor
795 </tr>
796- % for n, v, x, s in data:
797+ % for n, v, x, s, t in data:
798 <tr class="grid-row">
799 % if x:
800 <input type="hidden" name="_terp_models/${n}" value="${x}"/>
801@@ -64,11 +64,19 @@
802 % if translate=='fields':
803 <td class="grid-cell label" align="right">${s}: </td>
804 % endif
805- % for lang in langs:
806- <td class="grid-cell item">
807- <input type="text" name="${lang['code']}/${n}" value="${v[lang['code']]}" style="width: 100%;"/>
808- </td>
809- % endfor
810+ % if t == 'text':
811+ % for lang in langs:
812+ <td class="grid-cell item">
813+ <textarea name="${lang['code']}/${n}" style="width: 100%;">${v[lang['code']]}</textarea>
814+ </td>
815+ % endfor
816+ % else:
817+ % for lang in langs:
818+ <td class="grid-cell item">
819+ <input type="text" name="${lang['code']}/${n}" value="${v[lang['code']]}" style="width: 100%;"/>
820+ </td>
821+ % endfor
822+ % endif
823 </tr>
824 % endfor
825 </table>
826
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 for name in names:
832 attrs = view_fields[name]
833 if attrs.get('translate'):
834+ type = attrs.get('type')
835 value = {}
836 for lang in langs:
837 context = copy.copy(ctx)
838@@ -73,11 +74,12 @@
839
840 val = proxy.read([params.id], [name], context)
841 val = val[0] if isinstance(val,list) and len(val) > 0 else None
842-
843+ if val[name] is False:
844+ val[name] = ""
845 value[lang['code']] = val[name] if isinstance(val,dict) \
846 and name in val else None
847
848- data += [(name, value, None, attrs.get('string'))]
849+ data += [(name, value, None, attrs.get('string'), type)]
850
851 if translate == 'labels':
852 for name in names:
853@@ -91,7 +93,7 @@
854 if name in val[code]:
855 value[code] = val[code][name] or None
856
857- if value: data += [(name, value, None, None)]
858+ if value: data += [(name, value, None, None, None)]
859
860 if translate == 'relates' and view_relates:
861 for bar, tools in view_relates.items():
862@@ -104,7 +106,7 @@
863
864 value[code] = val[0]['name'] or None
865
866- data += [(tool['id'], value, tool['type'], None)]
867+ data += [(tool['id'], value, tool['type'], None, None)]
868
869 if translate == 'view':
870 for lang in langs:
871
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
877 import actions
878
879+<<<<<<< TREE
880 from openobject.i18n.format import format_datetime
881 from openobject.i18n.format import format_decimal
882+=======
883+from openobject.i18n.format import format_datetime
884+>>>>>>> MERGE-SOURCE
885 from openobject.tools import url, expose
886
887 from openerp.controllers import SecuredController
888@@ -45,10 +49,17 @@
889 return format_decimal(value, digit)
890
891 FORMATTERS = {
892+<<<<<<< TREE
893 'integer': lambda value, _i: '%s' % int(value),
894 'float': decimal_formatter,
895 'date': lambda value, _i: format_datetime(value, 'date'),
896 'datetime': lambda value, _i: format_datetime(value, 'datetime'),
897+=======
898+ 'integer': lambda value, _i: '%s' % int(value),
899+ 'float': lambda value, _i: '%.02f' % (value),
900+ 'date': lambda value, _i: format_datetime(value, 'date'),
901+ 'datetime': lambda value, _i: format_datetime(value, 'datetime'),
902+>>>>>>> MERGE-SOURCE
903 'one2one': lambda value, _i: value[1],
904 'many2one': lambda value, _i: value[1],
905 'selection': lambda value, info: dict(info['selection']).get(value, ''),
906
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 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
912 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
913 "PO-Revision-Date: 2011-03-18 23:56+0000\n"
914-"Last-Translator: kifcaliph <kifcaliph@hotmail.com>\n"
915+"Last-Translator: kifcaliph <Unknown>\n"
916 "Language-Team: Arabic <ar@li.org>\n"
917 "MIME-Version: 1.0\n"
918 "Content-Type: text/plain; charset=UTF-8\n"
919 "Content-Transfer-Encoding: 8bit\n"
920+<<<<<<< TREE
921 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
922 "X-Generator: Launchpad (build 13573)\n"
923+=======
924+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
925+"X-Generator: Launchpad (build 16179)\n"
926+>>>>>>> MERGE-SOURCE
927
928 #: static/javascript/form.js:92
929 #, python-format
930
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 "MIME-Version: 1.0\n"
936 "Content-Type: text/plain; charset=UTF-8\n"
937 "Content-Transfer-Encoding: 8bit\n"
938+<<<<<<< TREE
939 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
940 "X-Generator: Launchpad (build 13573)\n"
941+=======
942+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
943+"X-Generator: Launchpad (build 16179)\n"
944+>>>>>>> MERGE-SOURCE
945
946 #: static/javascript/form.js:92
947 #, python-format
948
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 "Project-Id-Version: openobject-client-web\n"
954 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
955 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
956-"PO-Revision-Date: 2011-02-24 17:35+0000\n"
957+"PO-Revision-Date: 2011-08-18 19:01+0000\n"
958 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
959 "<jesteve@zikzakmedia.com>\n"
960 "Language-Team: Catalan <ca@li.org>\n"
961 "MIME-Version: 1.0\n"
962 "Content-Type: text/plain; charset=UTF-8\n"
963 "Content-Transfer-Encoding: 8bit\n"
964+<<<<<<< TREE
965 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
966 "X-Generator: Launchpad (build 13573)\n"
967+=======
968+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
969+"X-Generator: Launchpad (build 16179)\n"
970+>>>>>>> MERGE-SOURCE
971
972 #: static/javascript/form.js:92
973 #, python-format
974@@ -37,7 +42,7 @@
975
976 #: static/javascript/form.js:995
977 msgid "You must save this record to perform the action !"
978-msgstr ""
979+msgstr "Heu de desar aquest registre per realitzar l'acció!"
980
981 #: static/javascript/form.js:1127
982 msgid "Do you really want to delete the attachment"
983@@ -79,7 +84,7 @@
984
985 #: static/javascript/search.js:285
986 msgid "Invalid Value"
987-msgstr ""
988+msgstr "Valor no vàlid"
989
990 #: static/javascript/viewed.js:63
991 msgid "Do you really want to remove this node?"
992
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+# Translations template for PROJECT.
998+# Copyright (C) 2011 ORGANIZATION
999+# This file is distributed under the same license as the PROJECT project.
1000+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
1001+#
1002+msgid ""
1003+msgstr ""
1004+"Project-Id-Version: openobject-client-web\n"
1005+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
1006+"POT-Creation-Date: 2011-03-18 11:53+0100\n"
1007+"PO-Revision-Date: 2011-08-08 08:08+0000\n"
1008+"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
1009+"Language-Team: Czech\n"
1010+"MIME-Version: 1.0\n"
1011+"Content-Type: text/plain; charset=UTF-8\n"
1012+"Content-Transfer-Encoding: 8bit\n"
1013+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1014+"X-Generator: Launchpad (build 16179)\n"
1015+"Language: \n"
1016+"X-Poedit-Language: Czech\n"
1017+"Generated-By: Babel 0.9.5\n"
1018+
1019+#: static/javascript/form.js:92
1020+#, python-format
1021+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
1022+msgstr "Vybrali jste k otevření %(tabs)s záložky - opravdu chcete otevřít?"
1023+
1024+#: static/javascript/form.js:169
1025+msgid "Invalid form, correct red fields."
1026+msgstr "Neplatný formulář, opravte červená pole."
1027+
1028+#: static/javascript/form.js:204
1029+msgid "Do you really want to delete this record?"
1030+msgstr "Opravdu chcete smazat tento záznam?"
1031+
1032+#: static/javascript/form.js:960
1033+msgid "You must select one or several records !"
1034+msgstr "Musíte vybrat jeden nebo více záznamů !"
1035+
1036+#: static/javascript/form.js:995
1037+msgid "You must save this record to perform the action !"
1038+msgstr "Musíte tento záznam uložit pro vykonání akce !"
1039+
1040+#: static/javascript/form.js:1127
1041+msgid "Do you really want to delete the attachment"
1042+msgstr "Opravdu chcete smazat přílohu?"
1043+
1044+#: static/javascript/form.js:1161
1045+msgid "No record selected ! You can only attach to existing record."
1046+msgstr "Nevybrán žádný záznam ! Můžete přiložit pouze existující záznam."
1047+
1048+#: static/javascript/form.js:1220
1049+msgid "OpenERP - Error"
1050+msgstr "OpenERP - Chyba"
1051+
1052+#: static/javascript/form.js:1291
1053+msgid ""
1054+"Warning, the record has been modified,\n"
1055+"your changes will be discarded."
1056+msgstr ""
1057+"Varování, záznam byl upraven,\n"
1058+"vaše změny budou zahozeny."
1059+
1060+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
1061+msgid "To edit Record, please first save it."
1062+msgstr "Pro úpravu Záznamu jej prosíme nejdříve uložte."
1063+
1064+#: static/javascript/listgrid.js:650
1065+msgid "Do you really want to delete selected record(s) ?"
1066+msgstr "Opravdu chcete smazat vybrané záznam(y) ?"
1067+
1068+#: static/javascript/m2o.js:526
1069+msgid "error in display::"
1070+msgstr "chyba ve zobrazení::"
1071+
1072+#: static/javascript/o2m.js:67
1073+msgid "Do you really want to delete record ?"
1074+msgstr "Opravdu chcete smazat záznam ?"
1075+
1076+#: static/javascript/search.js:285
1077+msgid "Invalid Value"
1078+msgstr "Neplatná hodnota"
1079+
1080+#: static/javascript/viewed.js:63
1081+msgid "Do you really want to remove this node?"
1082+msgstr "Opravdu chcete odstranit tento uzel?"
1083+
1084+#: static/javascript/viewed.js:329
1085+msgid "Do you really wants to create an inherited view here?"
1086+msgstr "Opravdu zde chcete vytvořit zděděný pohled?"
1087+
1088+#: static/javascript/openerp/openerp.base.js:127
1089+msgid "doLoadingSuccess: Cannot parse JSON"
1090+msgstr "doLoadingSuccess: Nelze parsovat JSON"
1091+
1092+#: static/javascript/openerp/openerp.base.js:335
1093+msgid "Loading"
1094+msgstr "Načítání"
1095+
1096+#: static/javascript/openerp/openerp.ui.tips.js:51
1097+msgid "Object"
1098+msgstr "Objekt"
1099+
1100+#: static/javascript/openerp/openerp.ui.tips.js:52
1101+msgid "Field"
1102+msgstr "Pole"
1103
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 "MIME-Version: 1.0\n"
1109 "Content-Type: text/plain; charset=UTF-8\n"
1110 "Content-Transfer-Encoding: 8bit\n"
1111+<<<<<<< TREE
1112 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
1113 "X-Generator: Launchpad (build 13573)\n"
1114+=======
1115+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1116+"X-Generator: Launchpad (build 16179)\n"
1117+>>>>>>> MERGE-SOURCE
1118
1119 #: static/javascript/form.js:92
1120 #, python-format
1121
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 "MIME-Version: 1.0\n"
1127 "Content-Type: text/plain; charset=utf-8\n"
1128 "Content-Transfer-Encoding: 8bit\n"
1129+<<<<<<< TREE
1130 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1131 "X-Generator: Launchpad (build 13573)\n"
1132+=======
1133+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1134+"X-Generator: Launchpad (build 16179)\n"
1135+>>>>>>> MERGE-SOURCE
1136 "Generated-By: Babel None\n"
1137
1138 #: static/javascript/form.js:92
1139
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 "MIME-Version: 1.0\n"
1145 "Content-Type: text/plain; charset=UTF-8\n"
1146 "Content-Transfer-Encoding: 8bit\n"
1147+<<<<<<< TREE
1148 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1149 "X-Generator: Launchpad (build 13573)\n"
1150+=======
1151+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1152+"X-Generator: Launchpad (build 16179)\n"
1153+>>>>>>> MERGE-SOURCE
1154
1155 #: static/javascript/form.js:92
1156 #, python-format
1157
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 "MIME-Version: 1.0\n"
1163 "Content-Type: text/plain; charset=UTF-8\n"
1164 "Content-Transfer-Encoding: 8bit\n"
1165+<<<<<<< TREE
1166 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1167 "X-Generator: Launchpad (build 13573)\n"
1168+=======
1169+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1170+"X-Generator: Launchpad (build 16179)\n"
1171+>>>>>>> MERGE-SOURCE
1172
1173 #: static/javascript/form.js:92
1174 #, python-format
1175
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 "MIME-Version: 1.0\n"
1181 "Content-Type: text/plain; charset=UTF-8\n"
1182 "Content-Transfer-Encoding: 8bit\n"
1183+<<<<<<< TREE
1184 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1185 "X-Generator: Launchpad (build 13573)\n"
1186+=======
1187+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1188+"X-Generator: Launchpad (build 16179)\n"
1189+>>>>>>> MERGE-SOURCE
1190
1191 #: static/javascript/form.js:92
1192 #, python-format
1193
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 "MIME-Version: 1.0\n"
1199 "Content-Type: text/plain; charset=utf-8\n"
1200 "Content-Transfer-Encoding: 8bit\n"
1201+<<<<<<< TREE
1202 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1203 "X-Generator: Launchpad (build 13573)\n"
1204+=======
1205+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1206+"X-Generator: Launchpad (build 16179)\n"
1207+>>>>>>> MERGE-SOURCE
1208 "Generated-By: Babel None\n"
1209
1210 #: static/javascript/form.js:92
1211
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 "MIME-Version: 1.0\n"
1217 "Content-Type: text/plain; charset=UTF-8\n"
1218 "Content-Transfer-Encoding: 8bit\n"
1219+<<<<<<< TREE
1220 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1221 "X-Generator: Launchpad (build 13573)\n"
1222+=======
1223+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1224+"X-Generator: Launchpad (build 16179)\n"
1225+>>>>>>> MERGE-SOURCE
1226
1227 #: static/javascript/form.js:92
1228 #, python-format
1229@@ -36,7 +41,7 @@
1230
1231 #: static/javascript/form.js:995
1232 msgid "You must save this record to perform the action !"
1233-msgstr ""
1234+msgstr "Debe guardar este registro para ejecutar la acción"
1235
1236 #: static/javascript/form.js:1127
1237 msgid "Do you really want to delete the attachment"
1238@@ -74,7 +79,7 @@
1239
1240 #: static/javascript/search.js:285
1241 msgid "Invalid Value"
1242-msgstr ""
1243+msgstr "Valor inválido"
1244
1245 #: static/javascript/viewed.js:63
1246 msgid "Do you really want to remove this node?"
1247
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 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1253 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
1254 "PO-Revision-Date: 2011-02-15 19:35+0000\n"
1255-"Last-Translator: Antony Lesuisse <al@openerp.com>\n"
1256+"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
1257 "Language-Team: Basque <eu@li.org>\n"
1258 "MIME-Version: 1.0\n"
1259 "Content-Type: text/plain; charset=UTF-8\n"
1260 "Content-Transfer-Encoding: 8bit\n"
1261+<<<<<<< TREE
1262 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
1263 "X-Generator: Launchpad (build 13573)\n"
1264+=======
1265+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1266+"X-Generator: Launchpad (build 16179)\n"
1267+>>>>>>> MERGE-SOURCE
1268
1269 #: static/javascript/form.js:92
1270 #, python-format
1271
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+# Persian translation for openobject-client-web
1277+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
1278+# This file is distributed under the same license as the openobject-client-web package.
1279+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
1280+#
1281+msgid ""
1282+msgstr ""
1283+"Project-Id-Version: openobject-client-web\n"
1284+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1285+"POT-Creation-Date: 2011-03-18 11:53+0100\n"
1286+"PO-Revision-Date: 2011-12-18 16:39+0000\n"
1287+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1288+"Language-Team: Persian <fa@li.org>\n"
1289+"MIME-Version: 1.0\n"
1290+"Content-Type: text/plain; charset=UTF-8\n"
1291+"Content-Transfer-Encoding: 8bit\n"
1292+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1293+"X-Generator: Launchpad (build 16179)\n"
1294+
1295+#: static/javascript/form.js:92
1296+#, python-format
1297+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
1298+msgstr ""
1299+
1300+#: static/javascript/form.js:169
1301+msgid "Invalid form, correct red fields."
1302+msgstr ""
1303+
1304+#: static/javascript/form.js:204
1305+msgid "Do you really want to delete this record?"
1306+msgstr ""
1307+
1308+#: static/javascript/form.js:960
1309+msgid "You must select one or several records !"
1310+msgstr ""
1311+
1312+#: static/javascript/form.js:995
1313+msgid "You must save this record to perform the action !"
1314+msgstr ""
1315+
1316+#: static/javascript/form.js:1127
1317+msgid "Do you really want to delete the attachment"
1318+msgstr ""
1319+
1320+#: static/javascript/form.js:1161
1321+msgid "No record selected ! You can only attach to existing record."
1322+msgstr ""
1323+
1324+#: static/javascript/form.js:1220
1325+msgid "OpenERP - Error"
1326+msgstr ""
1327+
1328+#: static/javascript/form.js:1291
1329+msgid ""
1330+"Warning, the record has been modified,\n"
1331+"your changes will be discarded."
1332+msgstr ""
1333+
1334+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
1335+msgid "To edit Record, please first save it."
1336+msgstr ""
1337+
1338+#: static/javascript/listgrid.js:650
1339+msgid "Do you really want to delete selected record(s) ?"
1340+msgstr ""
1341+
1342+#: static/javascript/m2o.js:526
1343+msgid "error in display::"
1344+msgstr ""
1345+
1346+#: static/javascript/o2m.js:67
1347+msgid "Do you really want to delete record ?"
1348+msgstr ""
1349+
1350+#: static/javascript/search.js:285
1351+msgid "Invalid Value"
1352+msgstr ""
1353+
1354+#: static/javascript/viewed.js:63
1355+msgid "Do you really want to remove this node?"
1356+msgstr ""
1357+
1358+#: static/javascript/viewed.js:329
1359+msgid "Do you really wants to create an inherited view here?"
1360+msgstr ""
1361+
1362+#: static/javascript/openerp/openerp.base.js:127
1363+msgid "doLoadingSuccess: Cannot parse JSON"
1364+msgstr ""
1365+
1366+#: static/javascript/openerp/openerp.base.js:335
1367+msgid "Loading"
1368+msgstr ""
1369+
1370+#: static/javascript/openerp/openerp.ui.tips.js:51
1371+msgid "Object"
1372+msgstr ""
1373+
1374+#: static/javascript/openerp/openerp.ui.tips.js:52
1375+msgid "Field"
1376+msgstr ""
1377
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 "MIME-Version: 1.0\n"
1383 "Content-Type: text/plain; charset=UTF-8\n"
1384 "Content-Transfer-Encoding: 8bit\n"
1385+<<<<<<< TREE
1386 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
1387 "X-Generator: Launchpad (build 13573)\n"
1388+=======
1389+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1390+"X-Generator: Launchpad (build 16179)\n"
1391+>>>>>>> MERGE-SOURCE
1392
1393 #: static/javascript/form.js:92
1394 #, python-format
1395
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 "Project-Id-Version: PROJECT VERSION\n"
1401 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
1402 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
1403-"PO-Revision-Date: 2011-05-16 16:57+0000\n"
1404-"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
1405+"PO-Revision-Date: 2011-09-20 09:43+0000\n"
1406+"Last-Translator: Quentin THEURET <Unknown>\n"
1407 "Language-Team: fr <LL@li.org>\n"
1408 "MIME-Version: 1.0\n"
1409 "Content-Type: text/plain; charset=utf-8\n"
1410 "Content-Transfer-Encoding: 8bit\n"
1411+<<<<<<< TREE
1412 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
1413 "X-Generator: Launchpad (build 13573)\n"
1414+=======
1415+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1416+"X-Generator: Launchpad (build 16179)\n"
1417+>>>>>>> MERGE-SOURCE
1418 "Generated-By: Babel None\n"
1419
1420 #: static/javascript/form.js:92
1421 #, python-format
1422 msgid "You selected to open %(tabs)s tabs - do you want to continue?"
1423-msgstr "Vous avez choisi d'ouvrir %(tabs)s onglets - voulez-vous continuer?"
1424+msgstr "Vous avez choisi d'ouvrir %(tabs)s onglets. Voulez-vous continuer ?"
1425
1426 #: static/javascript/form.js:169
1427 msgid "Invalid form, correct red fields."
1428 msgstr ""
1429-"Le formulaire est incorrectement rempli, veuillez vérifier les champs "
1430-"surlignés en rouge"
1431+"Formulaire incomplet, veuillez mettre à jour les champs surlignés en rouge."
1432
1433 #: static/javascript/form.js:204
1434 msgid "Do you really want to delete this record?"
1435@@ -43,7 +47,7 @@
1436
1437 #: static/javascript/form.js:1127
1438 msgid "Do you really want to delete the attachment"
1439-msgstr "Voulez-vous réellement supprimer ce fichier attaché?"
1440+msgstr "Voulez-vous réellement supprimer cette pièce jointe ?"
1441
1442 #: static/javascript/form.js:1161
1443 msgid "No record selected ! You can only attach to existing record."
1444@@ -69,7 +73,7 @@
1445
1446 #: static/javascript/listgrid.js:650
1447 msgid "Do you really want to delete selected record(s) ?"
1448-msgstr "Voulez-vous réellement supprimer les enregistrements sélectionnés?"
1449+msgstr "Voulez-vous réellement supprimer les enregistrements sélectionnés ?"
1450
1451 #: static/javascript/m2o.js:526
1452 msgid "error in display::"
1453@@ -77,7 +81,7 @@
1454
1455 #: static/javascript/o2m.js:67
1456 msgid "Do you really want to delete record ?"
1457-msgstr "Voulez-vous réellement supprimer cet enregistrement?"
1458+msgstr "Voulez-vous réellement supprimer cet enregistrement ?"
1459
1460 #: static/javascript/search.js:285
1461 msgid "Invalid Value"
1462@@ -85,11 +89,11 @@
1463
1464 #: static/javascript/viewed.js:63
1465 msgid "Do you really want to remove this node?"
1466-msgstr "Voulez-vous réellement supprimer ce noeud?"
1467+msgstr "Voulez-vous réellement supprimer ce noeud ?"
1468
1469 #: static/javascript/viewed.js:329
1470 msgid "Do you really wants to create an inherited view here?"
1471-msgstr "Voulez-vous réellement créer une vue héritée à cet emplacement?"
1472+msgstr "Voulez-vous réellement créer une vue héritée à cet emplacement ?"
1473
1474 #: static/javascript/openerp/openerp.base.js:127
1475 msgid "doLoadingSuccess: Cannot parse JSON"
1476
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 "MIME-Version: 1.0\n"
1482 "Content-Type: text/plain; charset=UTF-8\n"
1483 "Content-Transfer-Encoding: 8bit\n"
1484+<<<<<<< TREE
1485 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1486 "X-Generator: Launchpad (build 13573)\n"
1487+=======
1488+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1489+"X-Generator: Launchpad (build 16179)\n"
1490+>>>>>>> MERGE-SOURCE
1491
1492 #: static/javascript/form.js:92
1493 #, python-format
1494
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 "MIME-Version: 1.0\n"
1500 "Content-Type: text/plain; charset=UTF-8\n"
1501 "Content-Transfer-Encoding: 8bit\n"
1502+<<<<<<< TREE
1503 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1504 "X-Generator: Launchpad (build 13573)\n"
1505+=======
1506+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1507+"X-Generator: Launchpad (build 16179)\n"
1508+>>>>>>> MERGE-SOURCE
1509
1510 #: static/javascript/form.js:92
1511 #, python-format
1512
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 "Project-Id-Version: openobject-client-web\n"
1518 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1519 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
1520-"PO-Revision-Date: 2011-02-15 19:35+0000\n"
1521-"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
1522+"PO-Revision-Date: 2011-10-04 18:19+0000\n"
1523+"Last-Translator: Goran Cvijanović <goranc@gmail.com>\n"
1524 "Language-Team: Croatian <hr@li.org>\n"
1525 "MIME-Version: 1.0\n"
1526 "Content-Type: text/plain; charset=UTF-8\n"
1527 "Content-Transfer-Encoding: 8bit\n"
1528+<<<<<<< TREE
1529 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1530 "X-Generator: Launchpad (build 13573)\n"
1531+=======
1532+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1533+"X-Generator: Launchpad (build 16179)\n"
1534+>>>>>>> MERGE-SOURCE
1535
1536 #: static/javascript/form.js:92
1537 #, python-format
1538 msgid "You selected to open %(tabs)s tabs - do you want to continue?"
1539-msgstr ""
1540+msgstr "Odabrali ste otvaranje %(tabs)s jezičke - želite li nastaviti?"
1541
1542 #: static/javascript/form.js:169
1543 msgid "Invalid form, correct red fields."
1544@@ -36,7 +41,7 @@
1545
1546 #: static/javascript/form.js:995
1547 msgid "You must save this record to perform the action !"
1548-msgstr ""
1549+msgstr "Morate spremiti zapis prije izvršenja akcije"
1550
1551 #: static/javascript/form.js:1127
1552 msgid "Do you really want to delete the attachment"
1553@@ -68,7 +73,7 @@
1554
1555 #: static/javascript/m2o.js:526
1556 msgid "error in display::"
1557-msgstr ""
1558+msgstr "greška u prikazu::"
1559
1560 #: static/javascript/o2m.js:67
1561 msgid "Do you really want to delete record ?"
1562@@ -76,7 +81,7 @@
1563
1564 #: static/javascript/search.js:285
1565 msgid "Invalid Value"
1566-msgstr ""
1567+msgstr "Pogrešna vrijednost"
1568
1569 #: static/javascript/viewed.js:63
1570 msgid "Do you really want to remove this node?"
1571@@ -88,7 +93,7 @@
1572
1573 #: static/javascript/openerp/openerp.base.js:127
1574 msgid "doLoadingSuccess: Cannot parse JSON"
1575-msgstr ""
1576+msgstr "doLoadingSuccess: Nije moguće parsirati JSON"
1577
1578 #: static/javascript/openerp/openerp.base.js:335
1579 msgid "Loading"
1580
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 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1586 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
1587 "PO-Revision-Date: 2011-02-15 19:34+0000\n"
1588-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
1589+"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
1590+"<openerp@novotrade.hu>\n"
1591 "Language-Team: Hungarian <hu@li.org>\n"
1592 "MIME-Version: 1.0\n"
1593 "Content-Type: text/plain; charset=UTF-8\n"
1594 "Content-Transfer-Encoding: 8bit\n"
1595+<<<<<<< TREE
1596 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1597 "X-Generator: Launchpad (build 13573)\n"
1598+=======
1599+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1600+"X-Generator: Launchpad (build 16179)\n"
1601+>>>>>>> MERGE-SOURCE
1602
1603 #: static/javascript/form.js:92
1604 #, python-format
1605
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 "MIME-Version: 1.0\n"
1611 "Content-Type: text/plain; charset=UTF-8\n"
1612 "Content-Transfer-Encoding: 8bit\n"
1613+<<<<<<< TREE
1614 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1615 "X-Generator: Launchpad (build 13573)\n"
1616+=======
1617+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1618+"X-Generator: Launchpad (build 16179)\n"
1619+>>>>>>> MERGE-SOURCE
1620
1621 #: static/javascript/form.js:92
1622 #, python-format
1623@@ -37,7 +42,7 @@
1624
1625 #: static/javascript/form.js:995
1626 msgid "You must save this record to perform the action !"
1627-msgstr "Anda harus menyimpan catatan ini untuk melakukan tindakan"
1628+msgstr "Anda harus menyimpan data ini untuk melakukan tindakan!"
1629
1630 #: static/javascript/form.js:1127
1631 msgid "Do you really want to delete the attachment"
1632@@ -78,7 +83,7 @@
1633
1634 #: static/javascript/search.js:285
1635 msgid "Invalid Value"
1636-msgstr "Nilai tidak valid"
1637+msgstr "Nilai Tidak Valid"
1638
1639 #: static/javascript/viewed.js:63
1640 msgid "Do you really want to remove this node?"
1641
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 "MIME-Version: 1.0\n"
1647 "Content-Type: text/plain; charset=utf-8\n"
1648 "Content-Transfer-Encoding: 8bit\n"
1649+<<<<<<< TREE
1650 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1651 "X-Generator: Launchpad (build 13573)\n"
1652+=======
1653+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1654+"X-Generator: Launchpad (build 16179)\n"
1655+>>>>>>> MERGE-SOURCE
1656 "Generated-By: Babel None\n"
1657
1658 #: static/javascript/form.js:92
1659
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 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1665 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
1666 "PO-Revision-Date: 2011-02-15 19:34+0000\n"
1667-"Last-Translator: Antony Lesuisse <al@openerp.com>\n"
1668+"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
1669 "Language-Team: Lithuanian <lt@li.org>\n"
1670 "MIME-Version: 1.0\n"
1671 "Content-Type: text/plain; charset=UTF-8\n"
1672 "Content-Transfer-Encoding: 8bit\n"
1673+<<<<<<< TREE
1674 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1675 "X-Generator: Launchpad (build 13573)\n"
1676+=======
1677+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1678+"X-Generator: Launchpad (build 16179)\n"
1679+>>>>>>> MERGE-SOURCE
1680
1681 #: static/javascript/form.js:92
1682 #, python-format
1683
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 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1689 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
1690 "PO-Revision-Date: 2011-02-15 19:34+0000\n"
1691-"Last-Translator: Antony Lesuisse <al@openerp.com>\n"
1692+"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
1693 "Language-Team: Latvian <lv@li.org>\n"
1694 "MIME-Version: 1.0\n"
1695 "Content-Type: text/plain; charset=UTF-8\n"
1696 "Content-Transfer-Encoding: 8bit\n"
1697+<<<<<<< TREE
1698 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1699 "X-Generator: Launchpad (build 13573)\n"
1700+=======
1701+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1702+"X-Generator: Launchpad (build 16179)\n"
1703+>>>>>>> MERGE-SOURCE
1704
1705 #: static/javascript/form.js:92
1706 #, python-format
1707
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 "MIME-Version: 1.0\n"
1713 "Content-Type: text/plain; charset=UTF-8\n"
1714 "Content-Transfer-Encoding: 8bit\n"
1715+<<<<<<< TREE
1716 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1717 "X-Generator: Launchpad (build 13573)\n"
1718+=======
1719+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1720+"X-Generator: Launchpad (build 16179)\n"
1721+>>>>>>> MERGE-SOURCE
1722
1723 #: static/javascript/form.js:92
1724 #, python-format
1725
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 "Project-Id-Version: PROJECT VERSION\n"
1731 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
1732 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
1733-"PO-Revision-Date: 2011-05-30 06:56+0000\n"
1734+"PO-Revision-Date: 2011-10-02 19:01+0000\n"
1735 "Last-Translator: BAYARAA Sainbayar <Unknown>\n"
1736 "Language-Team: mn <LL@li.org>\n"
1737 "MIME-Version: 1.0\n"
1738 "Content-Type: text/plain; charset=utf-8\n"
1739 "Content-Transfer-Encoding: 8bit\n"
1740+<<<<<<< TREE
1741 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1742 "X-Generator: Launchpad (build 13573)\n"
1743+=======
1744+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1745+"X-Generator: Launchpad (build 16179)\n"
1746+>>>>>>> MERGE-SOURCE
1747 "Generated-By: Babel None\n"
1748
1749 #: static/javascript/form.js:92
1750@@ -67,7 +72,7 @@
1751
1752 #: static/javascript/m2o.js:526
1753 msgid "error in display::"
1754-msgstr "дэлгэцний алдаа::"
1755+msgstr "алдаа"
1756
1757 #: static/javascript/o2m.js:67
1758 msgid "Do you really want to delete record ?"
1759
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 "Project-Id-Version: openobject-client-web\n"
1765 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1766 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
1767-"PO-Revision-Date: 2011-07-11 10:09+0000\n"
1768+"PO-Revision-Date: 2012-07-02 19:25+0000\n"
1769 "Last-Translator: Ole Kristian Gaski <Unknown>\n"
1770 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
1771 "MIME-Version: 1.0\n"
1772 "Content-Type: text/plain; charset=UTF-8\n"
1773 "Content-Transfer-Encoding: 8bit\n"
1774+<<<<<<< TREE
1775 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1776 "X-Generator: Launchpad (build 13573)\n"
1777+=======
1778+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1779+"X-Generator: Launchpad (build 16179)\n"
1780+>>>>>>> MERGE-SOURCE
1781
1782 #: static/javascript/form.js:92
1783 #, python-format
1784@@ -86,7 +91,7 @@
1785
1786 #: static/javascript/viewed.js:329
1787 msgid "Do you really wants to create an inherited view here?"
1788-msgstr ""
1789+msgstr "Vil du virkelig opprette en underordnet visning her?"
1790
1791 #: static/javascript/openerp/openerp.base.js:127
1792 msgid "doLoadingSuccess: Cannot parse JSON"
1793
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 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
1799 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
1800 "PO-Revision-Date: 2011-02-15 19:42+0000\n"
1801-"Last-Translator: Nicolas Vanhoren (OpenERP) <Unknown>\n"
1802+"Last-Translator: Nicolas (OpenERP) <Unknown>\n"
1803 "Language-Team: nl <LL@li.org>\n"
1804 "MIME-Version: 1.0\n"
1805 "Content-Type: text/plain; charset=utf-8\n"
1806 "Content-Transfer-Encoding: 8bit\n"
1807+<<<<<<< TREE
1808 "X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
1809 "X-Generator: Launchpad (build 13573)\n"
1810+=======
1811+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1812+"X-Generator: Launchpad (build 16179)\n"
1813+>>>>>>> MERGE-SOURCE
1814 "Generated-By: Babel None\n"
1815
1816 #: static/javascript/form.js:92
1817
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 "Project-Id-Version: PROJECT VERSION\n"
1823 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
1824 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
1825-"PO-Revision-Date: 2011-02-15 19:34+0000\n"
1826-"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
1827+"PO-Revision-Date: 2012-11-04 13:05+0000\n"
1828+"Last-Translator: Łukasz Cieśluk <lukaszciesluk@gmail.com>\n"
1829 "Language-Team: pl <LL@li.org>\n"
1830 "MIME-Version: 1.0\n"
1831 "Content-Type: text/plain; charset=utf-8\n"
1832 "Content-Transfer-Encoding: 8bit\n"
1833+<<<<<<< TREE
1834 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1835 "X-Generator: Launchpad (build 13573)\n"
1836+=======
1837+"X-Launchpad-Export-Date: 2012-11-05 04:49+0000\n"
1838+"X-Generator: Launchpad (build 16232)\n"
1839+>>>>>>> MERGE-SOURCE
1840 "Generated-By: Babel None\n"
1841
1842 #: static/javascript/form.js:92
1843@@ -78,7 +83,7 @@
1844
1845 #: static/javascript/search.js:285
1846 msgid "Invalid Value"
1847-msgstr ""
1848+msgstr "Niewłaściwa wartość"
1849
1850 #: static/javascript/viewed.js:63
1851 msgid "Do you really want to remove this node?"
1852@@ -90,7 +95,7 @@
1853
1854 #: static/javascript/openerp/openerp.base.js:127
1855 msgid "doLoadingSuccess: Cannot parse JSON"
1856-msgstr ""
1857+msgstr "doLoadingSuccess: Nie można sparsować JSON"
1858
1859 #: static/javascript/openerp/openerp.base.js:335
1860 msgid "Loading"
1861
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 "Project-Id-Version: openobject-client-web\n"
1867 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1868 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
1869-"PO-Revision-Date: 2011-02-15 19:33+0000\n"
1870-"Last-Translator: Antony Lesuisse <al@openerp.com>\n"
1871+"PO-Revision-Date: 2012-06-21 12:54+0000\n"
1872+"Last-Translator: ThinkOpen Solutions <Unknown>\n"
1873 "Language-Team: Portuguese <pt@li.org>\n"
1874 "MIME-Version: 1.0\n"
1875 "Content-Type: text/plain; charset=UTF-8\n"
1876 "Content-Transfer-Encoding: 8bit\n"
1877+<<<<<<< TREE
1878 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1879 "X-Generator: Launchpad (build 13573)\n"
1880+=======
1881+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1882+"X-Generator: Launchpad (build 16179)\n"
1883+>>>>>>> MERGE-SOURCE
1884
1885 #: static/javascript/form.js:92
1886 #, python-format
1887@@ -36,7 +41,7 @@
1888
1889 #: static/javascript/form.js:995
1890 msgid "You must save this record to perform the action !"
1891-msgstr ""
1892+msgstr "Precisa gravar este registo para executar a acção !"
1893
1894 #: static/javascript/form.js:1127
1895 msgid "Do you really want to delete the attachment"
1896@@ -77,7 +82,7 @@
1897
1898 #: static/javascript/search.js:285
1899 msgid "Invalid Value"
1900-msgstr ""
1901+msgstr "Valor Inválido"
1902
1903 #: static/javascript/viewed.js:63
1904 msgid "Do you really want to remove this node?"
1905
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 "MIME-Version: 1.0\n"
1911 "Content-Type: text/plain; charset=utf-8\n"
1912 "Content-Transfer-Encoding: 8bit\n"
1913+<<<<<<< TREE
1914 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1915 "X-Generator: Launchpad (build 13573)\n"
1916+=======
1917+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1918+"X-Generator: Launchpad (build 16179)\n"
1919+>>>>>>> MERGE-SOURCE
1920 "Generated-By: Babel None\n"
1921
1922 #: static/javascript/form.js:92
1923
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 "Project-Id-Version: openobject-client-web\n"
1929 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1930 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
1931+<<<<<<< TREE
1932 "PO-Revision-Date: 2011-03-15 08:06+0000\n"
1933 "Last-Translator: Mihai Satmarean <Unknown>\n"
1934+=======
1935+"PO-Revision-Date: 2011-09-16 16:34+0000\n"
1936+"Last-Translator: Syraxes <Unknown>\n"
1937+>>>>>>> MERGE-SOURCE
1938 "Language-Team: Romanian <ro@li.org>\n"
1939 "MIME-Version: 1.0\n"
1940 "Content-Type: text/plain; charset=UTF-8\n"
1941 "Content-Transfer-Encoding: 8bit\n"
1942+<<<<<<< TREE
1943 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
1944 "X-Generator: Launchpad (build 13573)\n"
1945+=======
1946+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
1947+"X-Generator: Launchpad (build 16179)\n"
1948+>>>>>>> MERGE-SOURCE
1949
1950 #: static/javascript/form.js:92
1951 #, python-format
1952@@ -24,7 +34,7 @@
1953
1954 #: static/javascript/form.js:169
1955 msgid "Invalid form, correct red fields."
1956-msgstr ""
1957+msgstr "Forma invalidă. Corectați cîmpurile colorate în roșu."
1958
1959 #: static/javascript/form.js:204
1960 msgid "Do you really want to delete this record?"
1961@@ -32,70 +42,74 @@
1962
1963 #: static/javascript/form.js:960
1964 msgid "You must select one or several records !"
1965-msgstr ""
1966+msgstr "Trebuie să selectați cel puțin o înregistrare !"
1967
1968 #: static/javascript/form.js:995
1969 msgid "You must save this record to perform the action !"
1970-msgstr ""
1971+msgstr "Trebuie să salvați înregistrarea mai întîi !"
1972
1973 #: static/javascript/form.js:1127
1974 msgid "Do you really want to delete the attachment"
1975-msgstr ""
1976+msgstr "Sigur doriți să ștergeți atașamentul"
1977
1978 #: static/javascript/form.js:1161
1979 msgid "No record selected ! You can only attach to existing record."
1980 msgstr ""
1981+"Nu ați selectat nici o înregistrare ! Atașarea nu poate fi făcută decît la o "
1982+"înregistrare existentă."
1983
1984 #: static/javascript/form.js:1220
1985 msgid "OpenERP - Error"
1986-msgstr ""
1987+msgstr "Eroare OpenERP"
1988
1989 #: static/javascript/form.js:1291
1990 msgid ""
1991 "Warning, the record has been modified,\n"
1992 "your changes will be discarded."
1993 msgstr ""
1994+"Atenție: înregistrarea a fost modificată întretimp,\n"
1995+"așadar schimbările făcute de dvs vor fi anulate."
1996
1997 #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
1998 msgid "To edit Record, please first save it."
1999-msgstr ""
2000+msgstr "Vă rugăm să salvați înregistrarea înainte de a încerca să o editați."
2001
2002 #: static/javascript/listgrid.js:650
2003 msgid "Do you really want to delete selected record(s) ?"
2004-msgstr ""
2005+msgstr "Sigur doriți ștergerea înregistrărilor selectate ?"
2006
2007 #: static/javascript/m2o.js:526
2008 msgid "error in display::"
2009-msgstr ""
2010+msgstr "eroare la afișare::"
2011
2012 #: static/javascript/o2m.js:67
2013 msgid "Do you really want to delete record ?"
2014-msgstr ""
2015+msgstr "Sigur doriți să ștergeți înregistrarea ?"
2016
2017 #: static/javascript/search.js:285
2018 msgid "Invalid Value"
2019-msgstr ""
2020+msgstr "Valoare incorectă"
2021
2022 #: static/javascript/viewed.js:63
2023 msgid "Do you really want to remove this node?"
2024-msgstr ""
2025+msgstr "Sigur doriți ștergerea acestui nod ?"
2026
2027 #: static/javascript/viewed.js:329
2028 msgid "Do you really wants to create an inherited view here?"
2029-msgstr ""
2030+msgstr "Sigur doriți crearea aici a unui view moștenit ?"
2031
2032 #: static/javascript/openerp/openerp.base.js:127
2033 msgid "doLoadingSuccess: Cannot parse JSON"
2034-msgstr ""
2035+msgstr "doLoadingSuccess: Eroare la parsarea JSON"
2036
2037 #: static/javascript/openerp/openerp.base.js:335
2038 msgid "Loading"
2039-msgstr ""
2040+msgstr "Se încarcă"
2041
2042 #: static/javascript/openerp/openerp.ui.tips.js:51
2043 msgid "Object"
2044-msgstr ""
2045+msgstr "Obiect"
2046
2047 #: static/javascript/openerp/openerp.ui.tips.js:52
2048 msgid "Field"
2049-msgstr ""
2050+msgstr "Câmp"
2051
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 "MIME-Version: 1.0\n"
2057 "Content-Type: text/plain; charset=UTF-8\n"
2058 "Content-Transfer-Encoding: 8bit\n"
2059+<<<<<<< TREE
2060 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
2061 "X-Generator: Launchpad (build 13573)\n"
2062+=======
2063+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
2064+"X-Generator: Launchpad (build 16179)\n"
2065+>>>>>>> MERGE-SOURCE
2066
2067 #: static/javascript/form.js:92
2068 #, python-format
2069
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 "MIME-Version: 1.0\n"
2075 "Content-Type: text/plain; charset=UTF-8\n"
2076 "Content-Transfer-Encoding: 8bit\n"
2077+<<<<<<< TREE
2078 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
2079 "X-Generator: Launchpad (build 13573)\n"
2080+=======
2081+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
2082+"X-Generator: Launchpad (build 16179)\n"
2083+>>>>>>> MERGE-SOURCE
2084
2085 #: static/javascript/form.js:92
2086 #, python-format
2087
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+# Slovenian translation for openobject-client-web
2093+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
2094+# This file is distributed under the same license as the openobject-client-web package.
2095+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
2096+#
2097+msgid ""
2098+msgstr ""
2099+"Project-Id-Version: openobject-client-web\n"
2100+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2101+"POT-Creation-Date: 2011-03-18 11:53+0100\n"
2102+"PO-Revision-Date: 2011-09-21 08:29+0000\n"
2103+"Last-Translator: Anze (Neotek) <Unknown>\n"
2104+"Language-Team: Slovenian <sl@li.org>\n"
2105+"MIME-Version: 1.0\n"
2106+"Content-Type: text/plain; charset=UTF-8\n"
2107+"Content-Transfer-Encoding: 8bit\n"
2108+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
2109+"X-Generator: Launchpad (build 16179)\n"
2110+
2111+#: static/javascript/form.js:92
2112+#, python-format
2113+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
2114+msgstr ""
2115+"Izbrali ste, da boste odprli zavihke %(tabs)s - ali želite nadaljevati?"
2116+
2117+#: static/javascript/form.js:169
2118+msgid "Invalid form, correct red fields."
2119+msgstr "Neveljavna oblika, popravite rdeča polja."
2120+
2121+#: static/javascript/form.js:204
2122+msgid "Do you really want to delete this record?"
2123+msgstr "Ali res želite izbrisati ta zapis?"
2124+
2125+#: static/javascript/form.js:960
2126+msgid "You must select one or several records !"
2127+msgstr "Izbrati morate enega ali več zapisov!"
2128+
2129+#: static/javascript/form.js:995
2130+msgid "You must save this record to perform the action !"
2131+msgstr "Morate shtaniti zapis za izvršitev tega dejanja!"
2132+
2133+#: static/javascript/form.js:1127
2134+msgid "Do you really want to delete the attachment"
2135+msgstr "Ali res želite izbrisati to priponko?"
2136+
2137+#: static/javascript/form.js:1161
2138+msgid "No record selected ! You can only attach to existing record."
2139+msgstr "Zapis ni izbran. Pripnete lahko samo na obstoječ zapis!"
2140+
2141+#: static/javascript/form.js:1220
2142+msgid "OpenERP - Error"
2143+msgstr "OpenERP - Napaka"
2144+
2145+#: static/javascript/form.js:1291
2146+msgid ""
2147+"Warning, the record has been modified,\n"
2148+"your changes will be discarded."
2149+msgstr ""
2150+"Opozorilo, zapis je bil spremenjen,\n"
2151+"vaše spremembe ne bodo upoštevane."
2152+
2153+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
2154+msgid "To edit Record, please first save it."
2155+msgstr "Za urejanje zapisa, ga prosim najprej shranite."
2156+
2157+#: static/javascript/listgrid.js:650
2158+msgid "Do you really want to delete selected record(s) ?"
2159+msgstr "Ali res želite izbrisati izbrane zapise?"
2160+
2161+#: static/javascript/m2o.js:526
2162+msgid "error in display::"
2163+msgstr "napaka v prikazu::"
2164+
2165+#: static/javascript/o2m.js:67
2166+msgid "Do you really want to delete record ?"
2167+msgstr "Ali res želite izbrisati zapis?"
2168+
2169+#: static/javascript/search.js:285
2170+msgid "Invalid Value"
2171+msgstr "Neveljavna vrednost"
2172+
2173+#: static/javascript/viewed.js:63
2174+msgid "Do you really want to remove this node?"
2175+msgstr "Ali res želite izbrisati to vozlišče?"
2176+
2177+#: static/javascript/viewed.js:329
2178+msgid "Do you really wants to create an inherited view here?"
2179+msgstr "Ali res želite ustvariti deden pogled tukaj?"
2180+
2181+#: static/javascript/openerp/openerp.base.js:127
2182+msgid "doLoadingSuccess: Cannot parse JSON"
2183+msgstr "doLoadingSuccess: Ni mogoče razčleniti JSON"
2184+
2185+#: static/javascript/openerp/openerp.base.js:335
2186+msgid "Loading"
2187+msgstr "Nalaganje"
2188+
2189+#: static/javascript/openerp/openerp.ui.tips.js:51
2190+msgid "Object"
2191+msgstr "Predmet"
2192+
2193+#: static/javascript/openerp/openerp.ui.tips.js:52
2194+msgid "Field"
2195+msgstr "Polje"
2196
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 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
2202 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
2203 "PO-Revision-Date: 2011-02-15 19:32+0000\n"
2204-"Last-Translator: Antony Lesuisse <al@openerp.com>\n"
2205+"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
2206 "Language-Team: sr <LL@li.org>\n"
2207 "MIME-Version: 1.0\n"
2208 "Content-Type: text/plain; charset=utf-8\n"
2209 "Content-Transfer-Encoding: 8bit\n"
2210+<<<<<<< TREE
2211 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
2212 "X-Generator: Launchpad (build 13573)\n"
2213+=======
2214+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
2215+"X-Generator: Launchpad (build 16179)\n"
2216+>>>>>>> MERGE-SOURCE
2217 "Generated-By: Babel None\n"
2218
2219 #: static/javascript/form.js:92
2220
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 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2226 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
2227 "PO-Revision-Date: 2011-02-15 19:31+0000\n"
2228-"Last-Translator: Antony Lesuisse <al@openerp.com>\n"
2229+"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
2230 "Language-Team: Serbian latin <sr@latin@li.org>\n"
2231 "MIME-Version: 1.0\n"
2232 "Content-Type: text/plain; charset=UTF-8\n"
2233 "Content-Transfer-Encoding: 8bit\n"
2234+<<<<<<< TREE
2235 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
2236 "X-Generator: Launchpad (build 13573)\n"
2237+=======
2238+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
2239+"X-Generator: Launchpad (build 16179)\n"
2240+>>>>>>> MERGE-SOURCE
2241
2242 #: static/javascript/form.js:92
2243 #, python-format
2244@@ -74,7 +79,7 @@
2245
2246 #: static/javascript/search.js:285
2247 msgid "Invalid Value"
2248-msgstr ""
2249+msgstr "Vrednost nije ispravna"
2250
2251 #: static/javascript/viewed.js:63
2252 msgid "Do you really want to remove this node?"
2253
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 "Project-Id-Version: PROJECT VERSION\n"
2259 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
2260 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
2261-"PO-Revision-Date: 2011-02-15 19:31+0000\n"
2262-"Last-Translator: Antony Lesuisse <al@openerp.com>\n"
2263+"PO-Revision-Date: 2012-04-24 10:37+0000\n"
2264+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
2265 "Language-Team: sv <LL@li.org>\n"
2266 "MIME-Version: 1.0\n"
2267 "Content-Type: text/plain; charset=utf-8\n"
2268 "Content-Transfer-Encoding: 8bit\n"
2269+<<<<<<< TREE
2270 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
2271 "X-Generator: Launchpad (build 13573)\n"
2272+=======
2273+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
2274+"X-Generator: Launchpad (build 16179)\n"
2275+>>>>>>> MERGE-SOURCE
2276 "Generated-By: Babel None\n"
2277
2278 #: static/javascript/form.js:92
2279 #, python-format
2280 msgid "You selected to open %(tabs)s tabs - do you want to continue?"
2281-msgstr ""
2282+msgstr "Du valde att öppna %(tabs)s flikar - vill du fullfölja?"
2283
2284 #: static/javascript/form.js:169
2285 msgid "Invalid form, correct red fields."
2286@@ -33,11 +38,11 @@
2287
2288 #: static/javascript/form.js:960
2289 msgid "You must select one or several records !"
2290-msgstr ""
2291+msgstr "Du måste välja minst en post !"
2292
2293 #: static/javascript/form.js:995
2294 msgid "You must save this record to perform the action !"
2295-msgstr ""
2296+msgstr "Du måste spara denna post för att utföra åtgärden!"
2297
2298 #: static/javascript/form.js:1127
2299 msgid "Do you really want to delete the attachment"
2300@@ -45,17 +50,19 @@
2301
2302 #: static/javascript/form.js:1161
2303 msgid "No record selected ! You can only attach to existing record."
2304-msgstr ""
2305+msgstr "Ingen post vald ! Du kan endast bifoga till befintliga poster."
2306
2307 #: static/javascript/form.js:1220
2308 msgid "OpenERP - Error"
2309-msgstr ""
2310+msgstr "OpenERP - Fel"
2311
2312 #: static/javascript/form.js:1291
2313 msgid ""
2314 "Warning, the record has been modified,\n"
2315 "your changes will be discarded."
2316 msgstr ""
2317+"Varning! Posten har ändrats,\n"
2318+"dina ändringar kommer att förloras."
2319
2320 #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
2321 msgid "To edit Record, please first save it."
2322@@ -67,7 +74,7 @@
2323
2324 #: static/javascript/m2o.js:526
2325 msgid "error in display::"
2326-msgstr ""
2327+msgstr "fel i presentationen::"
2328
2329 #: static/javascript/o2m.js:67
2330 msgid "Do you really want to delete record ?"
2331@@ -75,7 +82,7 @@
2332
2333 #: static/javascript/search.js:285
2334 msgid "Invalid Value"
2335-msgstr ""
2336+msgstr "Ogiltigt värde"
2337
2338 #: static/javascript/viewed.js:63
2339 msgid "Do you really want to remove this node?"
2340@@ -87,11 +94,11 @@
2341
2342 #: static/javascript/openerp/openerp.base.js:127
2343 msgid "doLoadingSuccess: Cannot parse JSON"
2344-msgstr ""
2345+msgstr "doLoadingSuccess: Kan inte tolka JSON"
2346
2347 #: static/javascript/openerp/openerp.base.js:335
2348 msgid "Loading"
2349-msgstr ""
2350+msgstr "Läser in"
2351
2352 #: static/javascript/openerp/openerp.ui.tips.js:51
2353 msgid "Object"
2354
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 "MIME-Version: 1.0\n"
2360 "Content-Type: text/plain; charset=UTF-8\n"
2361 "Content-Transfer-Encoding: 8bit\n"
2362+<<<<<<< TREE
2363 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
2364 "X-Generator: Launchpad (build 13573)\n"
2365+=======
2366+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
2367+"X-Generator: Launchpad (build 16179)\n"
2368+>>>>>>> MERGE-SOURCE
2369
2370 #: static/javascript/form.js:92
2371 #, python-format
2372
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 "Project-Id-Version: openobject-client-web\n"
2378 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2379 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
2380-"PO-Revision-Date: 2011-04-27 13:36+0000\n"
2381-"Last-Translator: Caner Başaran <Unknown>\n"
2382+"PO-Revision-Date: 2012-07-29 20:56+0000\n"
2383+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
2384 "Language-Team: Turkish <tr@li.org>\n"
2385 "MIME-Version: 1.0\n"
2386 "Content-Type: text/plain; charset=UTF-8\n"
2387 "Content-Transfer-Encoding: 8bit\n"
2388+<<<<<<< TREE
2389 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
2390 "X-Generator: Launchpad (build 13573)\n"
2391+=======
2392+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
2393+"X-Generator: Launchpad (build 16179)\n"
2394+>>>>>>> MERGE-SOURCE
2395
2396 #: static/javascript/form.js:92
2397 #, python-format
2398 msgid "You selected to open %(tabs)s tabs - do you want to continue?"
2399-msgstr "Sekmelerini %(tabs) seçtiniz - Devam etmek istiyor musunuz?"
2400+msgstr ""
2401+"Açmak için %(tabs) sekmelerini seçtiniz - Devam etmek istiyor musunuz?"
2402
2403 #: static/javascript/form.js:169
2404 msgid "Invalid form, correct red fields."
2405-msgstr "Hatalı form, kırmızı alanların düzeltiniz."
2406+msgstr "Geçersiz biçim, kırmızı alanları düzeltiniz."
2407
2408 #: static/javascript/form.js:204
2409 msgid "Do you really want to delete this record?"
2410@@ -44,8 +50,7 @@
2411
2412 #: static/javascript/form.js:1161
2413 msgid "No record selected ! You can only attach to existing record."
2414-msgstr ""
2415-"Hiç Kayıt seçilmedi! Sadece oluşturulmuş bir kayda ek ekleyebilirsiniz."
2416+msgstr "Hiç kayıt seçilmedi! Sadece varolan kayıta ekleyebilirsiniz."
2417
2418 #: static/javascript/form.js:1220
2419 msgid "OpenERP - Error"
2420@@ -56,20 +61,20 @@
2421 "Warning, the record has been modified,\n"
2422 "your changes will be discarded."
2423 msgstr ""
2424-"Dikkat, Bu kayıt değiştirilmiş,\n"
2425+"Uyarı, Bu kayıt değiştirilmiş,\n"
2426 "yaptığınız değişiklikler gözardı edilecek."
2427
2428 #: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
2429 msgid "To edit Record, please first save it."
2430-msgstr "Bu kaydı düzenlemek için önce kaydetmeniz gerekiyor."
2431+msgstr "Kaydı düzenlemek için lütfen önce kaydedin."
2432
2433 #: static/javascript/listgrid.js:650
2434 msgid "Do you really want to delete selected record(s) ?"
2435-msgstr "Bu kayıt(lar)ı silmek istediğinden emin misin?"
2436+msgstr "Seçili kayıt(lar)ı silmek istediğinize emin misiniz?"
2437
2438 #: static/javascript/m2o.js:526
2439 msgid "error in display::"
2440-msgstr "ekranda hata::"
2441+msgstr "görüntüde hata::"
2442
2443 #: static/javascript/o2m.js:67
2444 msgid "Do you really want to delete record ?"
2445@@ -81,15 +86,15 @@
2446
2447 #: static/javascript/viewed.js:63
2448 msgid "Do you really want to remove this node?"
2449-msgstr "Bu kayıtı gerçekten silmek istiyor musunuz?"
2450+msgstr "Bu düğümü silmek istediğinize emin misiniz?"
2451
2452 #: static/javascript/viewed.js:329
2453 msgid "Do you really wants to create an inherited view here?"
2454-msgstr "Bağlantılı görünüm oluşturmak istediğinden emin misin?"
2455+msgstr "Devralınmış görünüm oluşturmak istediğinden emin misin?"
2456
2457 #: static/javascript/openerp/openerp.base.js:127
2458 msgid "doLoadingSuccess: Cannot parse JSON"
2459-msgstr "doLoadingSuccess: Parse edilemedi JSON"
2460+msgstr "doLoadingSuccess: JSON ayrıştırılamıyor"
2461
2462 #: static/javascript/openerp/openerp.base.js:335
2463 msgid "Loading"
2464
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 "MIME-Version: 1.0\n"
2470 "Content-Type: text/plain; charset=UTF-8\n"
2471 "Content-Transfer-Encoding: 8bit\n"
2472+<<<<<<< TREE
2473 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
2474 "X-Generator: Launchpad (build 13573)\n"
2475+=======
2476+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
2477+"X-Generator: Launchpad (build 16179)\n"
2478+>>>>>>> MERGE-SOURCE
2479
2480 #: static/javascript/form.js:92
2481 #, python-format
2482
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 "MIME-Version: 1.0\n"
2488 "Content-Type: text/plain; charset=UTF-8\n"
2489 "Content-Transfer-Encoding: 8bit\n"
2490+<<<<<<< TREE
2491 "X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
2492 "X-Generator: Launchpad (build 13573)\n"
2493+=======
2494+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
2495+"X-Generator: Launchpad (build 16179)\n"
2496+>>>>>>> MERGE-SOURCE
2497
2498 #: static/javascript/form.js:92
2499 #, python-format
2500
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+# Chinese (Traditional) translation for openobject-client-web
2506+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
2507+# This file is distributed under the same license as the openobject-client-web package.
2508+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
2509+#
2510+msgid ""
2511+msgstr ""
2512+"Project-Id-Version: openobject-client-web\n"
2513+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2514+"POT-Creation-Date: 2011-03-18 11:53+0100\n"
2515+"PO-Revision-Date: 2011-12-04 16:15+0000\n"
2516+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2517+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
2518+"MIME-Version: 1.0\n"
2519+"Content-Type: text/plain; charset=UTF-8\n"
2520+"Content-Transfer-Encoding: 8bit\n"
2521+"X-Launchpad-Export-Date: 2012-10-23 05:09+0000\n"
2522+"X-Generator: Launchpad (build 16179)\n"
2523+
2524+#: static/javascript/form.js:92
2525+#, python-format
2526+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
2527+msgstr ""
2528+
2529+#: static/javascript/form.js:169
2530+msgid "Invalid form, correct red fields."
2531+msgstr ""
2532+
2533+#: static/javascript/form.js:204
2534+msgid "Do you really want to delete this record?"
2535+msgstr ""
2536+
2537+#: static/javascript/form.js:960
2538+msgid "You must select one or several records !"
2539+msgstr ""
2540+
2541+#: static/javascript/form.js:995
2542+msgid "You must save this record to perform the action !"
2543+msgstr "必須儲存此紀錄以進行動作!"
2544+
2545+#: static/javascript/form.js:1127
2546+msgid "Do you really want to delete the attachment"
2547+msgstr ""
2548+
2549+#: static/javascript/form.js:1161
2550+msgid "No record selected ! You can only attach to existing record."
2551+msgstr ""
2552+
2553+#: static/javascript/form.js:1220
2554+msgid "OpenERP - Error"
2555+msgstr ""
2556+
2557+#: static/javascript/form.js:1291
2558+msgid ""
2559+"Warning, the record has been modified,\n"
2560+"your changes will be discarded."
2561+msgstr ""
2562+
2563+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
2564+msgid "To edit Record, please first save it."
2565+msgstr ""
2566+
2567+#: static/javascript/listgrid.js:650
2568+msgid "Do you really want to delete selected record(s) ?"
2569+msgstr ""
2570+
2571+#: static/javascript/m2o.js:526
2572+msgid "error in display::"
2573+msgstr ""
2574+
2575+#: static/javascript/o2m.js:67
2576+msgid "Do you really want to delete record ?"
2577+msgstr ""
2578+
2579+#: static/javascript/search.js:285
2580+msgid "Invalid Value"
2581+msgstr ""
2582+
2583+#: static/javascript/viewed.js:63
2584+msgid "Do you really want to remove this node?"
2585+msgstr ""
2586+
2587+#: static/javascript/viewed.js:329
2588+msgid "Do you really wants to create an inherited view here?"
2589+msgstr ""
2590+
2591+#: static/javascript/openerp/openerp.base.js:127
2592+msgid "doLoadingSuccess: Cannot parse JSON"
2593+msgstr ""
2594+
2595+#: static/javascript/openerp/openerp.base.js:335
2596+msgid "Loading"
2597+msgstr ""
2598+
2599+#: static/javascript/openerp/openerp.ui.tips.js:51
2600+msgid "Object"
2601+msgstr ""
2602+
2603+#: static/javascript/openerp/openerp.ui.tips.js:52
2604+msgid "Field"
2605+msgstr ""
2606
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 "Project-Id-Version: openobject-client-web\n"
2612 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2613 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
2614-"PO-Revision-Date: 2011-03-26 15:22+0000\n"
2615-"Last-Translator: kifcaliph <kifcaliph@hotmail.com>\n"
2616+"PO-Revision-Date: 2011-09-02 22:08+0000\n"
2617+"Last-Translator: kifcaliph <Unknown>\n"
2618 "Language-Team: Arabic <ar@li.org>\n"
2619 "MIME-Version: 1.0\n"
2620 "Content-Type: text/plain; charset=UTF-8\n"
2621 "Content-Transfer-Encoding: 8bit\n"
2622+<<<<<<< TREE
2623 "X-Launchpad-Export-Date: 2011-08-04 05:13+0000\n"
2624 "X-Generator: Launchpad (build 13573)\n"
2625+=======
2626+"X-Launchpad-Export-Date: 2012-10-23 05:10+0000\n"
2627+"X-Generator: Launchpad (build 16179)\n"
2628+>>>>>>> MERGE-SOURCE
2629
2630 #: validators.py:75
2631 msgid "Invalid literal for float"
2632@@ -967,7 +972,7 @@
2633
2634 #: controllers/templates/header.mako:66 controllers/templates/header.mako:69
2635 msgid "About"
2636-msgstr "عن"
2637+msgstr "عن النظام"
2638
2639 #: controllers/templates/header.mako:73 controllers/templates/header.mako:75
2640 msgid "Help"
2641@@ -1577,79 +1582,3 @@
2642 #: widgets/templates/listgrid/listgrid.mako:194
2643 msgid "Delete record(s)."
2644 msgstr "حذف السجل او السجلات."
2645-
2646-#~ msgid "Click here to add new image."
2647-#~ msgstr "إضغط لإضافة صورة جديدة"
2648-
2649-#~ msgid "Add Resource:"
2650-#~ msgstr "إضافة مصدر:"
2651-
2652-#~ msgid "Image"
2653-#~ msgstr "صوره"
2654-
2655-#~ msgid "You do not have a valid OpenERP publisher warranty contract !"
2656-#~ msgstr "لا يوجد لديك عقد ضمان صحيح من الناشر للـ OpenERP"
2657-
2658-#~ msgid ""
2659-#~ "If you are using OpenERP in production, it is recommended to have\n"
2660-#~ "a publisher warranty program.\n"
2661-#~ "\n"
2662-#~ "The OpenERP publisher warranty contract provides you with bug fix guarantees "
2663-#~ "and an\n"
2664-#~ "automatic migration system so that we can start working on your problems "
2665-#~ "within a few\n"
2666-#~ "hours.\n"
2667-#~ "\n"
2668-#~ "With a publisher warranty contract, errors such as this one can be sent "
2669-#~ "directly to the OpenERP\n"
2670-#~ "team for review and evaluation.\n"
2671-#~ "\n"
2672-#~ "The publisher warranty program offers you:\n"
2673-#~ "* Automatic migrations on new versions,\n"
2674-#~ "* A bugfix guarantee,\n"
2675-#~ "* Monthly announces of potential bugs and their fixes,\n"
2676-#~ "* Security alerts by email and automatic migration,\n"
2677-#~ "* Access to the customer portal.\n"
2678-#~ msgstr ""
2679-#~ "إذا كنت تستخدم OpenERP للإنتاج، فإنه من المفضل الحصول\n"
2680-#~ "علي عقد ضمان من الناشر.\n"
2681-#~ "\n"
2682-#~ "يتضمن عقد الضمان من الناشر توفير حلول لمشاكل النظام و نقل\n"
2683-#~ "تلقائي للنظام و ذلك للبدء في حل مشاكلك في ساعات قليلة.\n"
2684-#~ "\n"
2685-#~ "مع عقد الضمان، مثل هذه الأخطاء يتم إرسالها مباشرة إلي فريق عمل\n"
2686-#~ "OpenERP للنظر فيها و التحليل.\n"
2687-#~ "\n"
2688-#~ "إن عقد الضمان يتيح لك:\n"
2689-#~ "* النقل التلقائي للإصدارات الجديدة.\n"
2690-#~ "* ضمان تصحيح أخطاء البرنامج.\n"
2691-#~ "* سلامة أمن النظام\n"
2692-#~ "* الدع م الفني اللازم\n"
2693-
2694-#~ msgid ""
2695-#~ "Your publisher warranty contract does not cover all modules installed in "
2696-#~ "your system !\n"
2697-#~ "If you are using OpenERP in production, it is highly suggested to upgrade "
2698-#~ "your\n"
2699-#~ "contract.\n"
2700-#~ "\n"
2701-#~ "If you have developed your own modules or installed third party module, we\n"
2702-#~ "can provide you an additional publisher warranty contract for these modules. "
2703-#~ "After\n"
2704-#~ "having reviewed your modules, our quality team will ensure they will "
2705-#~ "migrate\n"
2706-#~ "automatically for all future stable versions of OpenERP at no extra cost.\n"
2707-#~ "\n"
2708-#~ "Here is the list of modules not covered by your publisher warranty contract:"
2709-#~ msgstr ""
2710-#~ "لا يشمل عقد الضمان جميع الأكواد التي تم تنصيبها علي النظام!\n"
2711-#~ "إذا كنت تستخدم OpenERP للإنتاج، فإنه من الأفضل لك تحديث\n"
2712-#~ "عقد الضمان.\n"
2713-#~ "\n"
2714-#~ "إذا قمت بتطوير أكواد خاصة لك أو إستخدمت أكواد من شركات أخري غير OpenERP، "
2715-#~ "فنحن\n"
2716-#~ "يمكننا أيضاً تقديم عقد ضمان نشر إضافي لهذه الأكواد ايضاً، و ذلك بعد\n"
2717-#~ "ان يتم إستعراض هذه الأكواد، ليقوم فريق الجودة لتأكيد و لدعم النقل\n"
2718-#~ "التلقائي لكل الإصدارات الحديثة لنظام OpenERP و ذلك دون أي تكلفة\n"
2719-#~ "\n"
2720-#~ "هذه قائمة بـ بجميع الأكواد التي لا تشتمل علي ضمان الناشر:"
2721
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 "Project-Id-Version: openobject-client-web\n"
2727 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2728 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
2729-"PO-Revision-Date: 2011-03-27 16:44+0000\n"
2730+"PO-Revision-Date: 2012-03-01 16:57+0000\n"
2731 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
2732 "Language-Team: Bulgarian <bg@li.org>\n"
2733 "MIME-Version: 1.0\n"
2734 "Content-Type: text/plain; charset=UTF-8\n"
2735 "Content-Transfer-Encoding: 8bit\n"
2736+<<<<<<< TREE
2737 "X-Launchpad-Export-Date: 2011-08-04 05:13+0000\n"
2738 "X-Generator: Launchpad (build 13573)\n"
2739+=======
2740+"X-Launchpad-Export-Date: 2012-10-23 05:10+0000\n"
2741+"X-Generator: Launchpad (build 16179)\n"
2742+>>>>>>> MERGE-SOURCE
2743
2744 #: validators.py:75
2745 msgid "Invalid literal for float"
2746@@ -64,7 +69,7 @@
2747 #: validators.py:256
2748 #, python-format
2749 msgid "You must provide a full domain name (like %(domain)s.com)"
2750-msgstr ""
2751+msgstr "Трябва да предоставите пълни име на домейн (напр. %(domain)s.com)"
2752
2753 #: validators.py:260
2754 msgid "Please enter an integer value"
2755@@ -190,6 +195,8 @@
2756 "This is the password of the 'admin' user that will be created in your new "
2757 "database. It has to be the same than the above field."
2758 msgstr ""
2759+"Това е паролата на \"ADMIN\" потрбителят, който ще бъде създаден в новата "
2760+"база данни. Трябва да бъде еднакъв с горното поле."
2761
2762 #: controllers/database.py:79
2763 msgid "Drop database"
2764@@ -1567,12 +1574,3 @@
2765 #: widgets/templates/listgrid/listgrid.mako:194
2766 msgid "Delete record(s)."
2767 msgstr "Изтриване на запис(и)."
2768-
2769-#~ msgid "Image"
2770-#~ msgstr "Изображение"
2771-
2772-#~ msgid "Add Resource:"
2773-#~ msgstr "Добави ресурс"
2774-
2775-#~ msgid "Click here to add new image."
2776-#~ msgstr "Натиснете за да добавите ново изображение."
2777
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+# Bengali translation for openobject-client-web
2783+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
2784+# This file is distributed under the same license as the openobject-client-web package.
2785+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
2786+#
2787+msgid ""
2788+msgstr ""
2789+"Project-Id-Version: openobject-client-web\n"
2790+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2791+"POT-Creation-Date: 2011-03-18 11:53+0100\n"
2792+"PO-Revision-Date: 2011-12-02 07:14+0000\n"
2793+"Last-Translator: Kaustav Das Modak <kaustav.dasmodak@yahoo.co.in>\n"
2794+"Language-Team: Bengali <bn@li.org>\n"
2795+"MIME-Version: 1.0\n"
2796+"Content-Type: text/plain; charset=UTF-8\n"
2797+"Content-Transfer-Encoding: 8bit\n"
2798+"X-Launchpad-Export-Date: 2012-10-23 05:10+0000\n"
2799+"X-Generator: Launchpad (build 16179)\n"
2800+
2801+#: validators.py:75
2802+msgid "Invalid literal for float"
2803+msgstr ""
2804+
2805+#: validators.py:114 validators.py:119 validators.py:262
2806+msgid "Invalid datetime format"
2807+msgstr ""
2808+
2809+#: validators.py:166
2810+msgid "Please select a file."
2811+msgstr "অনুগ্রহ করে একটি ফাইল নির্বাচন করুন"
2812+
2813+#: validators.py:247
2814+msgid "Please enter an email address"
2815+msgstr "অনুগ্রহ করে একটি ই-মেল ঠিকানা লিখুন"
2816+
2817+#: validators.py:248
2818+msgid "An email address must contain a single @"
2819+msgstr "ই-মেল ঠিকানাতে একটি @ চিহ্ন থাকা উচিৎ"
2820+
2821+#: validators.py:249
2822+#, python-format
2823+msgid ""
2824+"The username portion of the email address is invalid (the portion before the "
2825+"@: %(username)s)"
2826+msgstr ""
2827+"ই-মেল ঠিকানায় ব্যবহারকারীর নামের অংশটি অবৈধ্য (@ ছিহ্নের আগের অংশটি: "
2828+"%(username)s)"
2829+
2830+#: validators.py:250
2831+#, python-format
2832+msgid ""
2833+"The domain portion of the email address is invalid (the portion after the @: "
2834+"%(domain)s)"
2835+msgstr ""
2836+"ই-মেল ঠিকানায় ডোমেন নামের অংশটি অবৈধ্য (@ ছিহ্নের পরের অংশটি: %(domain)s)"
2837+
2838+#: validators.py:254
2839+msgid "You must start your URL with http://, https://, etc"
2840+msgstr "ইউআরএল http://, https://, ইত্যাদি দিয়ে শুরু হওয়া উচিৎ"
2841+
2842+#: validators.py:255
2843+msgid "That is not a valid URL"
2844+msgstr ""
2845+
2846+#: validators.py:256
2847+#, python-format
2848+msgid "You must provide a full domain name (like %(domain)s.com)"
2849+msgstr ""
2850+
2851+#: validators.py:260
2852+msgid "Please enter an integer value"
2853+msgstr ""
2854+
2855+#: validators.py:261
2856+msgid "Please enter a number"
2857+msgstr ""
2858+
2859+#: controllers/actions.py:94
2860+msgid "Invalid View"
2861+msgstr ""
2862+
2863+#: controllers/actions.py:127
2864+msgid "Error no report"
2865+msgstr ""
2866+
2867+#: controllers/actions.py:153
2868+msgid "Nothing to print"
2869+msgstr ""
2870+
2871+#: controllers/actions.py:173
2872+msgid "Printing aborted, too long delay"
2873+msgstr ""
2874+
2875+#: controllers/actions.py:397
2876+msgid "Relative URLs are not supported"
2877+msgstr ""
2878+
2879+#: controllers/actions.py:425
2880+msgid "Action not found"
2881+msgstr ""
2882+
2883+#: controllers/actions.py:474
2884+msgid "No action defined"
2885+msgstr ""
2886+
2887+#: controllers/attachment.py:55
2888+msgid "No record selected, You can only attach to existing record..."
2889+msgstr ""
2890+
2891+#: controllers/database.py:63
2892+msgid "Create database"
2893+msgstr ""
2894+
2895+#: controllers/database.py:65 controllers/templates/database.mako:56
2896+#: controllers/templates/search.mako:145
2897+msgid "Create"
2898+msgstr ""
2899+
2900+#: controllers/database.py:68
2901+msgid "Super admin password:"
2902+msgstr ""
2903+
2904+#: controllers/database.py:68
2905+msgid ""
2906+"This is the password of the user that have the rights to administer "
2907+"databases. This is not a OpenERP user, just a super administrator. If you "
2908+"did not changed it, the password is 'admin' after installation."
2909+msgstr ""
2910+
2911+#: controllers/database.py:69 controllers/database.py:101
2912+msgid "New database name:"
2913+msgstr ""
2914+
2915+#: controllers/database.py:69
2916+msgid ""
2917+"Choose the name of the database that will be created. The name must not "
2918+"contain any special character. Exemple: 'terp'."
2919+msgstr ""
2920+
2921+#: controllers/database.py:70
2922+msgid "Load Demonstration data:"
2923+msgstr ""
2924+
2925+#: controllers/database.py:70
2926+msgid ""
2927+"Check this box if you want demonstration data to be installed on your new "
2928+"database. These data will help you to understand OpenERP, with predefined "
2929+"products, partners, etc."
2930+msgstr ""
2931+
2932+#: controllers/database.py:71
2933+msgid "Default Language:"
2934+msgstr ""
2935+
2936+#: controllers/database.py:71
2937+msgid ""
2938+"Choose the default language that will be installed for this database. You "
2939+"will be able to install new languages after installation through the "
2940+"administration menu."
2941+msgstr ""
2942+
2943+#: controllers/database.py:72
2944+msgid "Administrator password:"
2945+msgstr ""
2946+
2947+#: controllers/database.py:72
2948+msgid ""
2949+"This is the password of the 'admin' user that will be created in your new "
2950+"database."
2951+msgstr ""
2952+
2953+#: controllers/database.py:73
2954+msgid "Confirm password:"
2955+msgstr ""
2956+
2957+#: controllers/database.py:73
2958+msgid ""
2959+"This is the password of the 'admin' user that will be created in your new "
2960+"database. It has to be the same than the above field."
2961+msgstr ""
2962+
2963+#: controllers/database.py:79
2964+msgid "Drop database"
2965+msgstr ""
2966+
2967+#: controllers/database.py:81 controllers/templates/database.mako:58
2968+msgid "Drop"
2969+msgstr ""
2970+
2971+#: controllers/database.py:83 controllers/database.py:91
2972+#: controllers/templates/login.mako:43
2973+msgid "Database:"
2974+msgstr ""
2975+
2976+#: controllers/database.py:84 controllers/database.py:92
2977+#: controllers/database.py:100 controllers/templates/login.mako:61
2978+#: controllers/templates/login_ajax.mako:78
2979+#: controllers/templates/login_ajax.mako:98
2980+msgid "Password:"
2981+msgstr ""
2982+
2983+#: controllers/database.py:88
2984+msgid "Backup database"
2985+msgstr ""
2986+
2987+#: controllers/database.py:90 controllers/templates/database.mako:60
2988+msgid "Backup"
2989+msgstr ""
2990+
2991+#: controllers/database.py:96
2992+msgid "Restore database"
2993+msgstr ""
2994+
2995+#: controllers/database.py:98 controllers/templates/database.mako:62
2996+msgid "Restore"
2997+msgstr ""
2998+
2999+#: controllers/database.py:99
3000+msgid "File:"
3001+msgstr ""
3002+
3003+#: controllers/database.py:105
3004+msgid "Change Administrator Password"
3005+msgstr ""
3006+
3007+#: controllers/database.py:107 controllers/templates/preferences/index.mako:37
3008+msgid "Change Password"
3009+msgstr ""
3010+
3011+#: controllers/database.py:108
3012+msgid "Old Password:"
3013+msgstr ""
3014+
3015+#: controllers/database.py:109
3016+msgid "New Password:"
3017+msgstr ""
3018+
3019+#: controllers/database.py:110
3020+msgid "Confirm Password:"
3021+msgstr ""
3022+
3023+#: controllers/database.py:173
3024+msgid "You must avoid all accents, space or special characters."
3025+msgstr ""
3026+
3027+#: controllers/database.py:174
3028+msgid "Bad database name"
3029+msgstr ""
3030+
3031+#: controllers/database.py:194
3032+msgid ""
3033+"The server crashed during installation.\n"
3034+"We suggest you to drop this database."
3035+msgstr ""
3036+
3037+#: controllers/database.py:195
3038+msgid "Error during database creation"
3039+msgstr ""
3040+
3041+#: controllers/database.py:198 controllers/database.py:225
3042+#: controllers/database.py:271 controllers/database.py:294
3043+msgid "Bad super admin password"
3044+msgstr ""
3045+
3046+#: controllers/database.py:202
3047+msgid "Could not create database."
3048+msgstr ""
3049+
3050+#: controllers/database.py:228
3051+msgid "Could not drop database"
3052+msgstr ""
3053+
3054+#: controllers/database.py:251
3055+msgid "Could not create backup."
3056+msgstr ""
3057+
3058+#: controllers/database.py:275
3059+msgid "Could not restore database"
3060+msgstr ""
3061+
3062+#: controllers/database.py:298
3063+msgid "Error, password not changed."
3064+msgstr ""
3065+
3066+#: controllers/error_page.py:79
3067+msgid ""
3068+"Your problem has been sent to the quality team\n"
3069+"We will recontact you after analysing the problem."
3070+msgstr ""
3071+
3072+#: controllers/error_page.py:81
3073+#, python-format
3074+msgid ""
3075+"Your problem could not be sent to the quality team\n"
3076+"Please report this error manually at %s"
3077+msgstr ""
3078+
3079+#: controllers/form.py:561
3080+#, python-format
3081+msgid "Invalid button type \"%s\""
3082+msgstr ""
3083+
3084+#: controllers/form.py:944 controllers/tree.py:243
3085+msgid "No record selected"
3086+msgstr ""
3087+
3088+#: controllers/form.py:949
3089+msgid "Print Screen"
3090+msgstr ""
3091+
3092+#: controllers/form.py:1016 widgets/listgrid.py:305 widgets/listgrid.py:366
3093+#: widgets/form/_form.py:910
3094+msgid "Application Error"
3095+msgstr ""
3096+
3097+#: controllers/form.py:1016
3098+#, python-format
3099+msgid "Wrong on_change trigger: %s"
3100+msgstr ""
3101+
3102+#: controllers/form.py:1121
3103+msgid "Open resource"
3104+msgstr ""
3105+
3106+#: controllers/form.py:1124
3107+msgid "Set to default value"
3108+msgstr ""
3109+
3110+#: controllers/form.py:1125
3111+msgid "Set as default"
3112+msgstr ""
3113+
3114+#: controllers/form.py:1132
3115+msgid "Action"
3116+msgstr ""
3117+
3118+#: controllers/form.py:1133
3119+msgid "Report"
3120+msgstr ""
3121+
3122+#: controllers/impex.py:66
3123+msgid ""
3124+"Operation failed\n"
3125+"I/O error"
3126+msgstr ""
3127+
3128+#: controllers/impex.py:402
3129+msgid "Export Error"
3130+msgstr ""
3131+
3132+#: controllers/impex.py:469
3133+msgid "Database ID"
3134+msgstr ""
3135+
3136+#: controllers/impex.py:476
3137+msgid "Error opening .CSV file"
3138+msgstr ""
3139+
3140+#: controllers/impex.py:476
3141+msgid "Input Error."
3142+msgstr ""
3143+
3144+#: controllers/impex.py:498
3145+#, python-format
3146+msgid "You cannot import the field '%s', because we cannot auto-detect it"
3147+msgstr ""
3148+
3149+#: controllers/impex.py:501
3150+#, python-format
3151+msgid "Error processing the first line of the file. Field \"%s\" is unknown"
3152+msgstr ""
3153+
3154+#: controllers/impex.py:72 controllers/impex.py:501
3155+msgid "Import Error."
3156+msgstr ""
3157+
3158+#: controllers/impex.py:520
3159+msgid "The CSV delimiter must be a single character"
3160+msgstr ""
3161+
3162+#: controllers/impex.py:532
3163+msgid "File Format Error"
3164+msgstr ""
3165+
3166+#: controllers/impex.py:550
3167+msgid "XML-RPC error"
3168+msgstr ""
3169+
3170+#: controllers/impex.py:555
3171+#, python-format
3172+msgid "Imported %d objects"
3173+msgstr ""
3174+
3175+#: controllers/impex.py:560
3176+#, python-format
3177+msgid "Error trying to import this record:%s. ErrorMessage:%s %s"
3178+msgstr ""
3179+
3180+#: controllers/impex.py:561
3181+msgid "ImportationError"
3182+msgstr ""
3183+
3184+#: controllers/listgrid.py:52
3185+msgid "Parent record doesn't exists..."
3186+msgstr ""
3187+
3188+#: controllers/preferences.py:35
3189+msgid "Change your password"
3190+msgstr ""
3191+
3192+#: controllers/preferences.py:65 controllers/templates/header.mako:59
3193+msgid "Preferences"
3194+msgstr ""
3195+
3196+#: controllers/preferences.py:92
3197+msgid "All passwords have to be filled."
3198+msgstr ""
3199+
3200+#: controllers/preferences.py:94
3201+msgid "The new password and its confirmation must be identical."
3202+msgstr ""
3203+
3204+#: controllers/preferences.py:103
3205+msgid "Could not change your password."
3206+msgstr ""
3207+
3208+#: controllers/preferences.py:105
3209+msgid "Original password incorrect, your password was not changed."
3210+msgstr ""
3211+
3212+#: controllers/root.py:174
3213+#, python-format
3214+msgid "Version %s"
3215+msgstr ""
3216+
3217+#: controllers/translator.py:136
3218+msgid "You need to save the resource before adding translations."
3219+msgstr ""
3220+
3221+#: controllers/tree.py:274
3222+msgid "No resource selected"
3223+msgstr ""
3224+
3225+#: controllers/utils.py:43
3226+msgid "Could not connect to server"
3227+msgstr ""
3228+
3229+#: controllers/utils.py:127 controllers/templates/login_ajax.mako:111
3230+msgid "Bad username or password"
3231+msgstr ""
3232+
3233+#: controllers/view_log.py:32
3234+msgid "ID"
3235+msgstr ""
3236+
3237+#: controllers/view_log.py:33
3238+msgid "Creation User"
3239+msgstr ""
3240+
3241+#: controllers/view_log.py:34
3242+msgid "Creation Date"
3243+msgstr ""
3244+
3245+#: controllers/view_log.py:35
3246+msgid "Latest Modification by"
3247+msgstr ""
3248+
3249+#: controllers/view_log.py:36
3250+msgid "Latest Modification Date"
3251+msgstr ""
3252+
3253+#: controllers/view_log.py:37
3254+msgid "Owner"
3255+msgstr ""
3256+
3257+#: controllers/view_log.py:38
3258+msgid "Group Owner"
3259+msgstr ""
3260+
3261+#: controllers/view_log.py:39
3262+msgid "Access Level"
3263+msgstr ""
3264+
3265+#: controllers/view_log.py:40
3266+msgid "Internal module data ID"
3267+msgstr ""
3268+
3269+#: controllers/viewed.py:221
3270+msgid "Invalid view id."
3271+msgstr ""
3272+
3273+#: controllers/viewed.py:499
3274+msgid "Unable to create inherited view."
3275+msgstr ""
3276+
3277+#: controllers/viewed.py:501
3278+msgid "Can't create inherited view here."
3279+msgstr ""
3280+
3281+#: controllers/viewed.py:504
3282+msgid "Not implemented yet!"
3283+msgstr ""
3284+
3285+#: controllers/viewed.py:609
3286+msgid "Unable to update the view."
3287+msgstr ""
3288+
3289+#: controllers/viewed.py:859
3290+msgid "New Window"
3291+msgstr ""
3292+
3293+#: controllers/viewed.py:871
3294+msgid "Save Button"
3295+msgstr ""
3296+
3297+#: controllers/viewed.py:871
3298+msgid "Cancel Button"
3299+msgstr ""
3300+
3301+#: controllers/viewed.py:871
3302+msgid "Open Button"
3303+msgstr ""
3304+
3305+#: controllers/viewed.py:877
3306+msgid "Left"
3307+msgstr ""
3308+
3309+#: controllers/viewed.py:877
3310+msgid "Center"
3311+msgstr ""
3312+
3313+#: controllers/viewed.py:877
3314+msgid "Right"
3315+msgstr ""
3316+
3317+#: controllers/templates/about.mako:4
3318+msgid "About the OpenERP Web"
3319+msgstr ""
3320+
3321+#: controllers/templates/about.mako:27
3322+msgid "OpenERP Web"
3323+msgstr ""
3324+
3325+#: controllers/templates/about.mako:30
3326+msgid "Copyright &copy; 2006-TODAY OpenERP SA. All Rights Reserved."
3327+msgstr ""
3328+
3329+#: controllers/templates/about.mako:31
3330+msgid "OpenERP is a trademark of the OpenERP SA Company."
3331+msgstr ""
3332+
3333+#: controllers/templates/about.mako:33
3334+#, python-format
3335+msgid "%(ooweb)s is jointly developed by %(tiny)s and %(axelor)s."
3336+msgstr ""
3337+
3338+#: controllers/templates/about.mako:39
3339+#, python-format
3340+msgid "Licenced under the terms of %(license)s"
3341+msgstr ""
3342+
3343+#: controllers/templates/about.mako:42
3344+msgid "About OpenERP"
3345+msgstr ""
3346+
3347+#: controllers/templates/about.mako:44
3348+#, python-format
3349+msgid ""
3350+"%(openobject)s is a free enterprise-scale software system that is designed "
3351+"to boost\n"
3352+" productivity and profit through data integration. It "
3353+"connects, improves and\n"
3354+" manages business processes in areas such as sales, "
3355+"finance, supply chain,\n"
3356+" project management, production, services, CRM, etc..\n"
3357+" "
3358+msgstr ""
3359+
3360+#: controllers/templates/about.mako:51
3361+msgid ""
3362+"The system is platform-independent, and can be installed on Windows, Mac OS "
3363+"X,\n"
3364+" and various Linux and other Unix-based distributions. "
3365+"Its architecture enables\n"
3366+" new functionality to be rapidly created, modifications "
3367+"to be made to a\n"
3368+" production system and migration to a new version to be "
3369+"straightforward."
3370+msgstr ""
3371+
3372+#: controllers/templates/about.mako:57
3373+msgid ""
3374+"Depending on your needs, OpenERP is available through a web or application "
3375+"client."
3376+msgstr ""
3377+
3378+#: controllers/templates/database.mako:54 controllers/templates/login.mako:4
3379+#: controllers/templates/login.mako:71 controllers/templates/login_ajax.mako:85
3380+#: controllers/templates/login_ajax.mako:104
3381+msgid "Login"
3382+msgstr ""
3383+
3384+#: controllers/templates/database.mako:64
3385+msgid "Password"
3386+msgstr ""
3387+
3388+#: controllers/templates/error_page.mako:82
3389+#, python-format
3390+msgid "An %(error_type)s has been reported."
3391+msgstr ""
3392+
3393+#: controllers/templates/error_page.mako:84
3394+msgid "Let me fix it"
3395+msgstr ""
3396+
3397+#: controllers/templates/error_page.mako:91
3398+#: controllers/templates/error_page.mako:93
3399+msgid "Fix it for me"
3400+msgstr ""
3401+
3402+#: controllers/templates/error_page.mako:99
3403+msgid "Publisher warranty contract."
3404+msgstr ""
3405+
3406+#: controllers/templates/error_page.mako:100
3407+msgid ""
3408+"Your request will be sent to OpenERP and publisher warranty team will reply "
3409+"you shortly."
3410+msgstr ""
3411+
3412+#: controllers/templates/error_page.mako:104
3413+msgid "Summary of the problem:"
3414+msgstr ""
3415+
3416+#: controllers/templates/error_page.mako:111
3417+msgid "Explain what you did:"
3418+msgstr ""
3419+
3420+#: controllers/templates/error_page.mako:120
3421+msgid "Other Comments:"
3422+msgstr ""
3423+
3424+#: controllers/templates/error_page.mako:132
3425+msgid "Send to Publisher Warranty Team"
3426+msgstr ""
3427+
3428+#: controllers/templates/error_page.mako:159
3429+msgid "Write concurrency warning :"
3430+msgstr ""
3431+
3432+#: controllers/templates/error_page.mako:164
3433+msgid ""
3434+"This document has been modified while you were editing it.\n"
3435+"Choose:\n"
3436+"\n"
3437+" - \"Cancel\" to cancel saving.\n"
3438+" - \"Write anyway\" to save your current version."
3439+msgstr ""
3440+
3441+#: controllers/templates/error_page.mako:178 controllers/templates/exp.mako:251
3442+#: controllers/templates/form.mako:141 controllers/templates/openo2m.mako:41
3443+#: controllers/templates/selection.mako:43
3444+#: controllers/templates/viewlist.mako:160
3445+#: controllers/templates/preferences/index.mako:38
3446+#: widgets/templates/listgrid/listgrid.mako:41
3447+msgid "Cancel"
3448+msgstr ""
3449+
3450+#: controllers/templates/error_page.mako:179
3451+msgid "Write Anyway"
3452+msgstr ""
3453+
3454+#: controllers/templates/exp.mako:151
3455+msgid "Export Data"
3456+msgstr ""
3457+
3458+#: controllers/templates/exp.mako:166
3459+msgid "Export Type:"
3460+msgstr ""
3461+
3462+#: controllers/templates/exp.mako:169
3463+msgid "Import Compatible Export"
3464+msgstr ""
3465+
3466+#: controllers/templates/exp.mako:172
3467+msgid "Export all Data"
3468+msgstr ""
3469+
3470+#: controllers/templates/exp.mako:190
3471+msgid "Available fields"
3472+msgstr ""
3473+
3474+#: controllers/templates/exp.mako:192
3475+msgid "Fields to export"
3476+msgstr ""
3477+
3478+#: controllers/templates/exp.mako:194
3479+msgid "Save fields list"
3480+msgstr ""
3481+
3482+#: controllers/templates/exp.mako:196
3483+msgid "Save as:"
3484+msgstr ""
3485+
3486+#: controllers/templates/exp.mako:198 controllers/templates/fieldpref.mako:102
3487+#: controllers/templates/selection.mako:45
3488+msgid "OK"
3489+msgstr ""
3490+
3491+#: controllers/templates/exp.mako:202
3492+msgid "Saved exports:"
3493+msgstr ""
3494+
3495+#: controllers/templates/exp.mako:211 controllers/templates/form.mako:136
3496+#: widgets/form/templates/one2many.mako:23 widgets/templates/sidebar.mako:67
3497+#: widgets/templates/listgrid/listgrid.mako:119
3498+#: widgets/templates/listgrid/listgrid.mako:123
3499+#: widgets/templates/listgrid/listgrid.mako:127
3500+#: widgets/templates/listgrid/listgrid.mako:191
3501+#: widgets/templates/listgrid/listgrid.mako:196
3502+#: widgets/templates/listgrid/listgroup.mako:131
3503+#: widgets/templates/listgrid/multiple_group.mako:81
3504+msgid "Delete"
3505+msgstr ""
3506+
3507+#: controllers/templates/exp.mako:224 widgets/templates/sidebar.mako:56
3508+#: widgets/templates/listgrid/listgrid.mako:153
3509+msgid "Add"
3510+msgstr ""
3511+
3512+#: controllers/templates/exp.mako:229 controllers/templates/viewlist.mako:125
3513+msgid "Remove"
3514+msgstr ""
3515+
3516+#: controllers/templates/exp.mako:234
3517+msgid "Remove All"
3518+msgstr ""
3519+
3520+#: controllers/templates/exp.mako:252
3521+msgid "Export to File"
3522+msgstr ""
3523+
3524+#: controllers/templates/fieldpref.mako:4
3525+#: controllers/templates/fieldpref.mako:29
3526+msgid "Field Preferences"
3527+msgstr ""
3528+
3529+#: controllers/templates/fieldpref.mako:39
3530+msgid "Field Name:"
3531+msgstr ""
3532+
3533+#: controllers/templates/fieldpref.mako:43
3534+msgid "Domain:"
3535+msgstr ""
3536+
3537+#: controllers/templates/fieldpref.mako:47
3538+msgid "Default Value:"
3539+msgstr ""
3540+
3541+#: controllers/templates/fieldpref.mako:57
3542+msgid "Value applicable for:"
3543+msgstr ""
3544+
3545+#: controllers/templates/fieldpref.mako:63
3546+msgid "Only for you"
3547+msgstr ""
3548+
3549+#: controllers/templates/fieldpref.mako:67
3550+msgid "For all"
3551+msgstr ""
3552+
3553+#: controllers/templates/fieldpref.mako:76
3554+msgid "Value applicable if:"
3555+msgstr ""
3556+
3557+#: controllers/templates/fieldpref.mako:79
3558+msgid "Always applicable!"
3559+msgstr ""
3560+
3561+#: controllers/templates/fieldpref.mako:99 controllers/templates/imp.mako:204
3562+#: controllers/templates/index.mako:201 controllers/templates/openm2.mako:52
3563+#: controllers/templates/save_filter.mako:42
3564+#: controllers/templates/search.mako:129
3565+#: controllers/templates/translator.mako:41
3566+#: controllers/templates/translator.mako:108
3567+#: controllers/templates/viewed.mako:37
3568+#: controllers/templates/viewed_new.mako:43
3569+#: controllers/templates/viewed_new_model.mako:42
3570+#: controllers/templates/viewed_preview.mako:28
3571+#: controllers/templates/viewlist.mako:129 widgets/templates/sidebar.mako:67
3572+#: widgets/templates/viewform.mako:37
3573+msgid "Close"
3574+msgstr ""
3575+
3576+#: controllers/templates/footer.mako:3
3577+#, python-format
3578+msgid "&copy; 2008-2010 %(ooweb)s SA. All Rights Reserved "
3579+msgstr ""
3580+
3581+#: controllers/templates/footer.mako:6
3582+msgid "Significant contributions to the web client have been made by"
3583+msgstr ""
3584+
3585+#: controllers/templates/form.mako:64 controllers/templates/tree.mako:33
3586+msgid "Disable all Tips"
3587+msgstr ""
3588+
3589+#: controllers/templates/form.mako:65 controllers/templates/tree.mako:34
3590+msgid "Hide this Tip"
3591+msgstr ""
3592+
3593+#: controllers/templates/form.mako:83 controllers/templates/tree.mako:41
3594+msgid "Add / Remove Shortcut..."
3595+msgstr ""
3596+
3597+#: controllers/templates/form.mako:87
3598+#, python-format
3599+msgid "Search: %s"
3600+msgstr ""
3601+
3602+#: controllers/templates/form.mako:94
3603+msgid "Corporate Intelligence..."
3604+msgstr ""
3605+
3606+#: controllers/templates/form.mako:100
3607+msgid "Show Logs..."
3608+msgstr ""
3609+
3610+#: controllers/templates/form.mako:112
3611+msgid "Create a new resource"
3612+msgstr ""
3613+
3614+#: controllers/templates/form.mako:113 controllers/templates/search.mako:128
3615+#: controllers/templates/viewed_new_model.mako:36
3616+#: controllers/templates/viewlist.mako:119 widgets/form/_o2m.py:97
3617+#: widgets/form/templates/one2many.mako:21
3618+#: widgets/templates/listgrid/listgrid.mako:158
3619+#: widgets/templates/listgrid/listgrid.mako:162
3620+#: widgets/templates/listgrid/listgroup.mako:20
3621+msgid "New"
3622+msgstr ""
3623+
3624+#: controllers/templates/form.mako:117
3625+msgid "Edit this resource"
3626+msgstr ""
3627+
3628+#: controllers/templates/form.mako:118 controllers/templates/viewlist.mako:122
3629+#: widgets/templates/listgrid/listgrid.mako:83
3630+#: widgets/templates/listgrid/listgrid.mako:93
3631+#: widgets/templates/listgrid/listgroup.mako:112
3632+#: widgets/templates/listgrid/multiple_group.mako:63
3633+msgid "Edit"
3634+msgstr ""
3635+
3636+#: controllers/templates/form.mako:122
3637+msgid "Save this resource"
3638+msgstr ""
3639+
3640+#: controllers/templates/form.mako:123 controllers/templates/openm2.mako:48
3641+#: controllers/templates/save_filter.mako:41
3642+#: controllers/templates/translator.mako:39
3643+#: controllers/templates/translator.mako:106
3644+#: controllers/templates/viewed_new.mako:40
3645+#: controllers/templates/viewed_new_model.mako:39
3646+#: controllers/templates/viewlist.mako:157
3647+#: controllers/templates/preferences/index.mako:39
3648+msgid "Save"
3649+msgstr ""
3650+
3651+#: controllers/templates/form.mako:125
3652+msgid "Save & Edit this resource"
3653+msgstr ""
3654+
3655+#: controllers/templates/form.mako:126
3656+msgid "Save & Edit"
3657+msgstr ""
3658+
3659+#: controllers/templates/form.mako:130
3660+msgid "Duplicate this resource"
3661+msgstr ""
3662+
3663+#: controllers/templates/form.mako:131
3664+msgid "Duplicate"
3665+msgstr ""
3666+
3667+#: controllers/templates/form.mako:135
3668+msgid "Delete this resource"
3669+msgstr ""
3670+
3671+#: controllers/templates/form.mako:140
3672+msgid "Cancel editing the current resource"
3673+msgstr ""
3674+
3675+#: controllers/templates/form.mako:145
3676+msgid "Create new node"
3677+msgstr ""
3678+
3679+#: controllers/templates/form.mako:146
3680+msgid "New Node"
3681+msgstr ""
3682+
3683+#: controllers/templates/form.mako:150
3684+msgid "Show grid in workflow canvas"
3685+msgstr ""
3686+
3687+#: controllers/templates/form.mako:151
3688+msgid "Show grid"
3689+msgstr ""
3690+
3691+#: controllers/templates/header.mako:33
3692+#, python-format
3693+msgid "%(company)s"
3694+msgstr ""
3695+
3696+#: controllers/templates/header.mako:34 controllers/templates/index.mako:230
3697+#, python-format
3698+msgid "%(user)s"
3699+msgstr ""
3700+
3701+#: controllers/templates/header.mako:45 controllers/templates/header.mako:47
3702+msgid "Home"
3703+msgstr ""
3704+
3705+#: controllers/templates/header.mako:53
3706+msgid "Requests"
3707+msgstr ""
3708+
3709+#: controllers/templates/header.mako:62
3710+msgid "Edit Preferences"
3711+msgstr ""
3712+
3713+#: controllers/templates/header.mako:66 controllers/templates/header.mako:69
3714+msgid "About"
3715+msgstr ""
3716+
3717+#: controllers/templates/header.mako:73 controllers/templates/header.mako:75
3718+msgid "Help"
3719+msgstr ""
3720+
3721+#: controllers/templates/header.mako:81 controllers/templates/header.mako:84
3722+msgid "Clear Cache"
3723+msgstr ""
3724+
3725+#: controllers/templates/header.mako:89
3726+msgid "Logout"
3727+msgstr ""
3728+
3729+#: controllers/templates/imp.mako:79
3730+msgid "Import Data"
3731+msgstr ""
3732+
3733+#: controllers/templates/imp.mako:89
3734+msgid "1. Import a .CSV file"
3735+msgstr ""
3736+
3737+#: controllers/templates/imp.mako:105
3738+msgid "CSV File:"
3739+msgstr ""
3740+
3741+#: controllers/templates/imp.mako:123
3742+msgid "2. Check your file format"
3743+msgstr ""
3744+
3745+#: controllers/templates/imp.mako:130
3746+#, python-format
3747+msgid "The import failed due to: %(message)s"
3748+msgstr ""
3749+
3750+#: controllers/templates/imp.mako:132
3751+msgid "Here is a preview of the file we could not import:"
3752+msgstr ""
3753+
3754+#: controllers/templates/imp.mako:157
3755+msgid "CSV Options"
3756+msgstr ""
3757+
3758+#: controllers/templates/imp.mako:160
3759+msgid "Separator:"
3760+msgstr ""
3761+
3762+#: controllers/templates/imp.mako:162
3763+msgid "Delimiter:"
3764+msgstr ""
3765+
3766+#: controllers/templates/imp.mako:166
3767+msgid "Encoding:"
3768+msgstr ""
3769+
3770+#: controllers/templates/imp.mako:173
3771+msgid "Lines to skip:"
3772+msgstr ""
3773+
3774+#: controllers/templates/imp.mako:187
3775+msgid "3. File imported"
3776+msgstr ""
3777+
3778+#: controllers/templates/imp.mako:205
3779+msgid "Import File"
3780+msgstr ""
3781+
3782+#: controllers/templates/index.mako:167
3783+msgid "System Logs"
3784+msgstr ""
3785+
3786+#: controllers/templates/index.mako:192
3787+msgid "More"
3788+msgstr ""
3789+
3790+#: controllers/templates/index.mako:193
3791+msgid "Widgets"
3792+msgstr ""
3793+
3794+#: controllers/templates/index.mako:233 controllers/templates/index.mako:238
3795+#, python-format
3796+msgid "Powered by %(openerp)s "
3797+msgstr ""
3798+
3799+#: controllers/templates/login.mako:57 controllers/templates/login_ajax.mako:72
3800+#: controllers/templates/login_ajax.mako:94
3801+msgid "User:"
3802+msgstr ""
3803+
3804+#: controllers/templates/login.mako:68
3805+msgid "Databases"
3806+msgstr ""
3807+
3808+#: controllers/templates/login.mako:88
3809+msgid "Top Contributor:"
3810+msgstr ""
3811+
3812+#: controllers/templates/login.mako:98
3813+msgid ""
3814+"We think that daily job activities can be more intuitive, efficient, "
3815+"automated, .. and even fun."
3816+msgstr ""
3817+
3818+#: controllers/templates/login.mako:99
3819+msgid "OpenERP's vision to be:"
3820+msgstr ""
3821+
3822+#: controllers/templates/login.mako:107
3823+msgid "Full featured"
3824+msgstr ""
3825+
3826+#: controllers/templates/login.mako:108
3827+msgid ""
3828+"Today's enterprise challenges are multiple. We provide one module for each "
3829+"need."
3830+msgstr ""
3831+
3832+#: controllers/templates/login.mako:116
3833+msgid "Open Source"
3834+msgstr ""
3835+
3836+#: controllers/templates/login.mako:117
3837+msgid ""
3838+"To Build a great product, we rely on the knowledge of thousands of "
3839+"contributors."
3840+msgstr ""
3841+
3842+#: controllers/templates/login.mako:125
3843+msgid "User Friendly"
3844+msgstr ""
3845+
3846+#: controllers/templates/login.mako:126
3847+msgid ""
3848+"In order to be productive, people need clean and easy to use interface."
3849+msgstr ""
3850+
3851+#: controllers/templates/modules.mako:4
3852+msgid "Module Management"
3853+msgstr ""
3854+
3855+#: controllers/templates/modules.mako:17
3856+msgid "Web Modules"
3857+msgstr ""
3858+
3859+#: controllers/templates/openo2m.mako:34
3860+msgid "Save & Close"
3861+msgstr ""
3862+
3863+#: controllers/templates/openo2m.mako:37
3864+msgid "Save & New"
3865+msgstr ""
3866+
3867+#: controllers/templates/save_filter.mako:18
3868+msgid "Save as Filter"
3869+msgstr ""
3870+
3871+#: controllers/templates/save_filter.mako:30
3872+msgid "Filter Name"
3873+msgstr ""
3874+
3875+#: controllers/templates/search.mako:110
3876+#, python-format
3877+msgid "Search %(name)s"
3878+msgstr ""
3879+
3880+#: controllers/templates/search.mako:125 widgets/form/templates/datetime.mako:8
3881+msgid "Select"
3882+msgstr ""
3883+
3884+#: controllers/templates/search.mako:127 widgets/_views.py:77
3885+#: widgets/form/templates/many2one.mako:22
3886+#: widgets/form/templates/reference.mako:27 widgets/templates/viewform.mako:26
3887+msgid "Search"
3888+msgstr ""
3889+
3890+#: controllers/templates/search.mako:143
3891+#, python-format
3892+msgid "No record found : '%(searched_string)s'."
3893+msgstr ""
3894+
3895+#: controllers/templates/selection.mako:4
3896+msgid "Select action"
3897+msgstr ""
3898+
3899+#: controllers/templates/selection.mako:23
3900+msgid "Select your action"
3901+msgstr ""
3902+
3903+#: controllers/templates/server_log.mako:4
3904+msgid "Server Actions..."
3905+msgstr ""
3906+
3907+#: controllers/templates/server_log.mako:14
3908+msgid "Server Actions"
3909+msgstr ""
3910+
3911+#: controllers/templates/translator.mako:4
3912+msgid "Add Translations"
3913+msgstr ""
3914+
3915+#: controllers/templates/translator.mako:17
3916+msgid "Add Translation"
3917+msgstr ""
3918+
3919+#: controllers/templates/translator.mako:27
3920+msgid "Add Translation for:"
3921+msgstr ""
3922+
3923+#: controllers/templates/translator.mako:31
3924+msgid "Fields"
3925+msgstr ""
3926+
3927+#: controllers/templates/translator.mako:32
3928+msgid "Labels"
3929+msgstr ""
3930+
3931+#: controllers/templates/translator.mako:33
3932+msgid "Relates"
3933+msgstr ""
3934+
3935+#: controllers/templates/translator.mako:34
3936+msgid "View"
3937+msgstr ""
3938+
3939+#: controllers/templates/translator.mako:53
3940+msgid "Field"
3941+msgstr ""
3942+
3943+#: controllers/templates/view_log.mako:4 controllers/templates/view_log.mako:12
3944+msgid "Information"
3945+msgstr ""
3946+
3947+#: controllers/templates/viewed.mako:17
3948+#, python-format
3949+msgid "View Editor %s - %s"
3950+msgstr ""
3951+
3952+#: controllers/templates/viewed.mako:31
3953+msgid "Create a new inherited view"
3954+msgstr ""
3955+
3956+#: controllers/templates/viewed.mako:31
3957+msgid "Inherited View"
3958+msgstr ""
3959+
3960+#: controllers/templates/viewed.mako:34
3961+msgid "Preview"
3962+msgstr ""
3963+
3964+#: controllers/templates/viewed_add.mako:6
3965+msgid "Node Type:"
3966+msgstr ""
3967+
3968+#: controllers/templates/viewed_add.mako:23
3969+msgid "New Field"
3970+msgstr ""
3971+
3972+#: controllers/templates/viewed_add.mako:27
3973+msgid "Position:"
3974+msgstr ""
3975+
3976+#: controllers/templates/viewlist.mako:4
3977+#: controllers/templates/viewlist.mako:108
3978+#, python-format
3979+msgid "Manage Views (%s)"
3980+msgstr ""
3981+
3982+#: controllers/templates/viewlist.mako:146
3983+#, python-format
3984+msgid "Create a view (%s)"
3985+msgstr ""
3986+
3987+#: controllers/templates/viewlist.mako:174
3988+msgid "View Name:"
3989+msgstr ""
3990+
3991+#: controllers/templates/viewlist.mako:178
3992+msgid "View Type:"
3993+msgstr ""
3994+
3995+#: controllers/templates/viewlist.mako:189
3996+msgid "Priority:"
3997+msgstr ""
3998+
3999+#: utils/common.py:24
4000+msgid "Error"
4001+msgstr ""
4002+
4003+#: utils/common.py:27
4004+msgid "Warning"
4005+msgstr ""
4006+
4007+#: utils/rpc.py:131
4008+msgid "Access Denied"
4009+msgstr ""
4010+
4011+#: utils/rpc.py:238
4012+msgid "Unsupported protocol."
4013+msgstr ""
4014+
4015+#: utils/rpc.py:342
4016+msgid ""
4017+"You select a timezone but OpenERP could not find pytz library!\n"
4018+"The timezone functionality will be disable."
4019+msgstr ""
4020+
4021+#: utils/rpc.py:355
4022+msgid "Not logged..."
4023+msgstr ""
4024+
4025+#: utils/rpc.py:355
4026+msgid "Authorization Error"
4027+msgstr ""
4028+
4029+#: utils/rpc.py:439
4030+msgid "== Access Denied =="
4031+msgstr ""
4032+
4033+#: widgets/_views.py:46
4034+msgid "Form"
4035+msgstr ""
4036+
4037+#: widgets/_views.py:47
4038+msgid "Form view..."
4039+msgstr ""
4040+
4041+#: widgets/_views.py:78
4042+msgid "Search view..."
4043+msgstr ""
4044+
4045+#: widgets/listgrid.py:305
4046+msgid "Wrong on_change trigger"
4047+msgstr ""
4048+
4049+#: widgets/listgrid.py:368 widgets/form/_form.py:904
4050+#, python-format
4051+msgid "Invalid view, duplicate field: %s"
4052+msgstr ""
4053+
4054+#: widgets/pager.py:56
4055+#, python-format
4056+msgid "%s"
4057+msgstr ""
4058+
4059+#: widgets/pager.py:68
4060+#, python-format
4061+msgid "%s - %s"
4062+msgstr ""
4063+
4064+#: widgets/search.py:280
4065+msgid "contains"
4066+msgstr ""
4067+
4068+#: widgets/search.py:280
4069+msgid "doesn't contain"
4070+msgstr ""
4071+
4072+#: widgets/search.py:281
4073+msgid "is equal to"
4074+msgstr ""
4075+
4076+#: widgets/search.py:281
4077+msgid "is not equal to"
4078+msgstr ""
4079+
4080+#: widgets/search.py:282
4081+msgid "greater than"
4082+msgstr ""
4083+
4084+#: widgets/search.py:282
4085+msgid "less than"
4086+msgstr ""
4087+
4088+#: widgets/search.py:283
4089+msgid "in"
4090+msgstr ""
4091+
4092+#: widgets/search.py:283
4093+msgid "not in"
4094+msgstr ""
4095+
4096+#: widgets/search.py:392
4097+msgid "Yes"
4098+msgstr ""
4099+
4100+#: widgets/search.py:392
4101+msgid "No"
4102+msgstr ""
4103+
4104+#: widgets/form/_action.py:48
4105+msgid "Action not found!"
4106+msgstr ""
4107+
4108+#: widgets/form/_o2m.py:97 widgets/templates/listgrid/listgrid.mako:156
4109+#: widgets/templates/listgrid/listgrid.mako:162
4110+#: widgets/templates/listgrid/listgroup.mako:20
4111+msgid "Create new record."
4112+msgstr ""
4113+
4114+#: widgets/form/_o2m.py:110
4115+msgid "Save/New"
4116+msgstr ""
4117+
4118+#: widgets/form/_o2m.py:110
4119+msgid "Save parent record."
4120+msgstr ""
4121+
4122+#: widgets/form/_o2m.py:229
4123+#, python-format
4124+msgid "%d of %d"
4125+msgstr ""
4126+
4127+#: widgets/form/_o2m.py:231
4128+#, python-format
4129+msgid "- of %d"
4130+msgstr ""
4131+
4132+#: widgets/form/templates/binary.mako:28
4133+msgid "Save As"
4134+msgstr ""
4135+
4136+#: widgets/form/templates/binary.mako:31
4137+msgid "add attachment"
4138+msgstr ""
4139+
4140+#: widgets/form/templates/image.mako:6
4141+msgid "Replace image"
4142+msgstr ""
4143+
4144+#: widgets/form/templates/many2one.mako:2
4145+#: widgets/form/templates/reference.mako:30
4146+msgid "Open"
4147+msgstr ""
4148+
4149+#: widgets/form/templates/many2one.mako:2
4150+#: widgets/form/templates/reference.mako:30
4151+msgid "Open a resource"
4152+msgstr ""
4153+
4154+#: widgets/form/templates/one2many.mako:21
4155+msgid "Create new record..."
4156+msgstr ""
4157+
4158+#: widgets/form/templates/one2many.mako:23
4159+msgid "Delete record..."
4160+msgstr ""
4161+
4162+#: widgets/form/templates/one2many.mako:29
4163+msgid "Translate me."
4164+msgstr ""
4165+
4166+#: widgets/form/templates/one2many.mako:48
4167+msgid "Previous record..."
4168+msgstr ""
4169+
4170+#: widgets/form/templates/one2many.mako:50
4171+msgid "Next record..."
4172+msgstr ""
4173+
4174+#: widgets/templates/logs.mako:22
4175+msgid "More..."
4176+msgstr ""
4177+
4178+#: widgets/templates/logs.mako:35
4179+msgid "Less..."
4180+msgstr ""
4181+
4182+#: widgets/templates/pager.mako:9
4183+msgid "<< First"
4184+msgstr ""
4185+
4186+#: widgets/templates/pager.mako:14
4187+msgid "< Previous"
4188+msgstr ""
4189+
4190+#: widgets/templates/pager.mako:19
4191+msgid "of"
4192+msgstr ""
4193+
4194+#: widgets/templates/pager.mako:24
4195+msgid "Next >"
4196+msgstr ""
4197+
4198+#: widgets/templates/pager.mako:29
4199+msgid "Last >>"
4200+msgstr ""
4201+
4202+#: widgets/templates/pager.mako:37
4203+msgid "Change Limit:"
4204+msgstr ""
4205+
4206+#: widgets/templates/sidebar.mako:37
4207+msgid "Reports"
4208+msgstr ""
4209+
4210+#: widgets/templates/sidebar.mako:41 widgets/templates/viewform.mako:51
4211+msgid "Actions"
4212+msgstr ""
4213+
4214+#: widgets/templates/sidebar.mako:45
4215+msgid "Links"
4216+msgstr ""
4217+
4218+#: widgets/templates/sidebar.mako:49
4219+msgid "Submenu"
4220+msgstr ""
4221+
4222+#: widgets/templates/sidebar.mako:54
4223+msgid "Attachments"
4224+msgstr ""
4225+
4226+#: widgets/templates/sidebar.mako:74
4227+msgid "File"
4228+msgstr ""
4229+
4230+#: widgets/templates/sidebar.mako:83
4231+msgid "Customize"
4232+msgstr ""
4233+
4234+#: widgets/templates/sidebar.mako:87
4235+msgid "Manage views of the current object"
4236+msgstr ""
4237+
4238+#: widgets/templates/sidebar.mako:89
4239+msgid "Manage Views"
4240+msgstr ""
4241+
4242+#: widgets/templates/sidebar.mako:93
4243+msgid "Edit workflow of the current object"
4244+msgstr ""
4245+
4246+#: widgets/templates/sidebar.mako:94
4247+msgid "Edit Workflow"
4248+msgstr ""
4249+
4250+#: widgets/templates/sidebar.mako:98
4251+msgid "Customize current object or create a new object"
4252+msgstr ""
4253+
4254+#: widgets/templates/sidebar.mako:100
4255+msgid "Customize Object"
4256+msgstr ""
4257+
4258+#: widgets/templates/sidebar.mako:106
4259+msgid "Other Options"
4260+msgstr ""
4261+
4262+#: widgets/templates/sidebar.mako:111 widgets/templates/sidebar.mako:119
4263+msgid "Import"
4264+msgstr ""
4265+
4266+#: widgets/templates/sidebar.mako:114 widgets/templates/sidebar.mako:122
4267+msgid "Export"
4268+msgstr ""
4269+
4270+#: widgets/templates/sidebar.mako:126
4271+msgid "Translate"
4272+msgstr ""
4273+
4274+#: widgets/templates/sidebar.mako:131
4275+msgid "View Log"
4276+msgstr ""
4277+
4278+#: widgets/templates/viewform.mako:25
4279+msgid "Filter records."
4280+msgstr ""
4281+
4282+#: widgets/templates/viewform.mako:33
4283+msgid "Clear all."
4284+msgstr ""
4285+
4286+#: widgets/templates/viewform.mako:35
4287+msgid "Clear"
4288+msgstr ""
4289+
4290+#: widgets/templates/viewform.mako:43
4291+msgid "Filters"
4292+msgstr ""
4293+
4294+#: widgets/templates/viewform.mako:45
4295+msgid "Saved Filters"
4296+msgstr ""
4297+
4298+#: widgets/templates/viewform.mako:52
4299+msgid "New Filter"
4300+msgstr ""
4301+
4302+#: widgets/templates/viewform.mako:53
4303+msgid "Save Filter"
4304+msgstr ""
4305+
4306+#: widgets/templates/viewform.mako:54
4307+msgid "Manage Filters"
4308+msgstr ""
4309+
4310+#: widgets/templates/listgrid/listgrid.mako:23
4311+msgid "Update"
4312+msgstr ""
4313+
4314+#: widgets/templates/listgrid/listgrid.mako:152
4315+msgid "Add records..."
4316+msgstr ""
4317+
4318+#: widgets/templates/listgrid/listgrid.mako:190
4319+#: widgets/templates/listgrid/listgrid.mako:194
4320+msgid "Delete record(s)."
4321+msgstr ""
4322
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 "Project-Id-Version: openobject-client-web\n"
4328 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4329 "POT-Creation-Date: 2011-03-18 11:53+0100\n"
4330-"PO-Revision-Date: 2011-02-28 12:02+0000\n"
4331-"Last-Translator: Esther Xaus (Zikzakmedia) <Unknown>\n"
4332+"PO-Revision-Date: 2011-08-18 19:03+0000\n"
4333+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
4334+"<jesteve@zikzakmedia.com>\n"
4335 "Language-Team: Catalan <ca@li.org>\n"
4336 "MIME-Version: 1.0\n"
4337 "Content-Type: text/plain; charset=UTF-8\n"
4338 "Content-Transfer-Encoding: 8bit\n"
4339+<<<<<<< TREE
4340 "X-Launchpad-Export-Date: 2011-08-04 05:13+0000\n"
4341 "X-Generator: Launchpad (build 13573)\n"
4342+=======
4343+"X-Launchpad-Export-Date: 2012-10-23 05:10+0000\n"
4344+"X-Generator: Launchpad (build 16179)\n"
4345+>>>>>>> MERGE-SOURCE
4346
4347 #: validators.py:75
4348 msgid "Invalid literal for float"
4349@@ -403,11 +409,11 @@
4350
4351 #: controllers/impex.py:520
4352 msgid "The CSV delimiter must be a single character"
4353-msgstr ""
4354+msgstr "El delimitador CSV ha de ser un únic caràcter"
4355
4356 #: controllers/impex.py:532
4357 msgid "File Format Error"
4358-msgstr ""
4359+msgstr "Error format de fitxer"
4360
4361 #: controllers/impex.py:550
4362 msgid "XML-RPC error"
4363@@ -1422,7 +1428,7 @@
4364
4365 #: widgets/form/templates/image.mako:6
4366 msgid "Replace image"
4367-msgstr ""
4368+msgstr "Reemplaça imatge"
4369
4370 #: widgets/form/templates/many2one.mako:2
4371 #: widgets/form/templates/reference.mako:30
4372@@ -1602,87 +1608,3 @@
4373 #: widgets/templates/listgrid/listgrid.mako:194
4374 msgid "Delete record(s)."
4375 msgstr "Elimina registre(s)."
4376-
4377-#~ msgid "You do not have a valid OpenERP publisher warranty contract !"
4378-#~ msgstr "No disposeu d'un contracte vàlid de garantia de l'editor d'OpenERP!"
4379-
4380-#~ msgid ""
4381-#~ "If you are using OpenERP in production, it is recommended to have\n"
4382-#~ "a publisher warranty program.\n"
4383-#~ "\n"
4384-#~ "The OpenERP publisher warranty contract provides you with bug fix guarantees "
4385-#~ "and an\n"
4386-#~ "automatic migration system so that we can start working on your problems "
4387-#~ "within a few\n"
4388-#~ "hours.\n"
4389-#~ "\n"
4390-#~ "With a publisher warranty contract, errors such as this one can be sent "
4391-#~ "directly to the OpenERP\n"
4392-#~ "team for review and evaluation.\n"
4393-#~ "\n"
4394-#~ "The publisher warranty program offers you:\n"
4395-#~ "* Automatic migrations on new versions,\n"
4396-#~ "* A bugfix guarantee,\n"
4397-#~ "* Monthly announces of potential bugs and their fixes,\n"
4398-#~ "* Security alerts by email and automatic migration,\n"
4399-#~ "* Access to the customer portal.\n"
4400-#~ msgstr ""
4401-#~ "Si esteu utilitzant OpenERP en producció, us recomanem adquirir\n"
4402-#~ "un contracte de garantia de l'editor.\n"
4403-#~ "El contracte de garantia de l'editor d'OpenERP us proporciona garanties de "
4404-#~ "correcció d'errors\n"
4405-#~ "i una migració automàtica del sistema, i nosaltres podrem treballar en el "
4406-#~ "vostre problema\n"
4407-#~ "en poques hores.\n"
4408-#~ "Amb el contracte de garantia de l'editor, errors com l'actual es poden "
4409-#~ "enviar directament a \n"
4410-#~ "l'equip d'OpenERP per la sevq revisió i avaluació.\n"
4411-#~ "El contracte de garantia de l'editor a més us ofereix:\n"
4412-#~ "* Migracions automàtiques cap noves versions,\n"
4413-#~ "* Garantia en correcció d'errors,\n"
4414-#~ "* Anuncis mensuals d'errors potencials i les seves solucions,\n"
4415-#~ "* Alertes de seguretat per email i migració automàtica,\n"
4416-#~ "* Accés al portal de clients.\n"
4417-
4418-#~ msgid ""
4419-#~ "Your publisher warranty contract does not cover all modules installed in "
4420-#~ "your system !\n"
4421-#~ "If you are using OpenERP in production, it is highly suggested to upgrade "
4422-#~ "your\n"
4423-#~ "contract.\n"
4424-#~ "\n"
4425-#~ "If you have developed your own modules or installed third party module, we\n"
4426-#~ "can provide you an additional publisher warranty contract for these modules. "
4427-#~ "After\n"
4428-#~ "having reviewed your modules, our quality team will ensure they will "
4429-#~ "migrate\n"
4430-#~ "automatically for all future stable versions of OpenERP at no extra cost.\n"
4431-#~ "\n"
4432-#~ "Here is the list of modules not covered by your publisher warranty contract:"
4433-#~ msgstr ""
4434-#~ "El vostre contracte de garantia de l'editor no cobreix tots els mòduls "
4435-#~ "instal·lats en el vostre sistema!\n"
4436-#~ "Si esteu utilitzant OpenERP en producció, és recomanable actualitzar el "
4437-#~ "vostre\n"
4438-#~ "contracte.\n"
4439-#~ "\n"
4440-#~ "Si heu desenvolupat els vostres propis mòduls o instal·lat un mòdul de "
4441-#~ "tercers, \n"
4442-#~ "podem oferir-li un contracte de garantia de l'editor addicional per aquests "
4443-#~ "mòduls. Després \n"
4444-#~ "d'haver examinat els mòduls, el nostre equip de qualitat garantira que els "
4445-#~ "migraran\n"
4446-#~ "automàticament per totes les versions futures estables d'OpenERP, sense cost "
4447-#~ "addicional.\n"
4448-#~ "\n"
4449-#~ "Aquesta és la llista dels mòduls que no estan coberts pel contracte de "
4450-#~ "garantia de l'editor:"
4451-
4452-#~ msgid "Image"
4453-#~ msgstr "Imatge"
4454-
4455-#~ msgid "Add Resource:"
4456-#~ msgstr "Afegeix recurs:"
4457-
4458-#~ msgid "Click here to add new image."
4459-#~ msgstr "Feu clic aquí per afegir una nova imatge."
4460
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+# Translations template for PROJECT.
4466+# Copyright (C) 2011 ORGANIZATION
4467+# This file is distributed under the same license as the PROJECT project.
4468+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
4469+#
4470+msgid ""
4471+msgstr ""
4472+"Project-Id-Version: openobject-client-web\n"
4473+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
4474+"POT-Creation-Date: 2011-03-18 11:53+0100\n"
4475+"PO-Revision-Date: 2011-12-14 10:07+0000\n"
4476+"Last-Translator: Konki <pavel.konkol@seznam.cz>\n"
4477+"Language-Team: Czech\n"
4478+"MIME-Version: 1.0\n"
4479+"Content-Type: text/plain; charset=utf-8\n"
4480+"Content-Transfer-Encoding: 8bit\n"
4481+"X-Launchpad-Export-Date: 2012-10-23 05:10+0000\n"
4482+"X-Generator: Launchpad (build 16179)\n"
4483+"X-Poedit-Language: Czech\n"
4484+"Generated-By: Babel 0.9.5\n"
4485+
4486+#: validators.py:75
4487+msgid "Invalid literal for float"
4488+msgstr "Neplatné znaky pro desetinné číslo"
4489+
4490+#: validators.py:114 validators.py:119 validators.py:262
4491+msgid "Invalid datetime format"
4492+msgstr "Neplatný formát data a času"
4493+
4494+#: validators.py:166
4495+msgid "Please select a file."
4496+msgstr "Prosíme vyberte soubor."
4497+
4498+#: validators.py:247
4499+msgid "Please enter an email address"
4500+msgstr "Prosíme zadejte emailovou adresu"
4501+
4502+#: validators.py:248
4503+msgid "An email address must contain a single @"
4504+msgstr "Emailová adresa musí obsahovat jediný @"
4505+
4506+#: validators.py:249
4507+#, python-format
4508+msgid ""
4509+"The username portion of the email address is invalid (the portion before the "
4510+"@: %(username)s)"
4511+msgstr ""
4512+"Část jména uživatele emailové adresy není platná (část přes @: %(username)s)"
4513+
4514+#: validators.py:250
4515+#, python-format
4516+msgid ""
4517+"The domain portion of the email address is invalid (the portion after the @: "
4518+"%(domain)s)"
4519+msgstr "Neplatná doménová část emailové adresy (část po @: %(domain)s)"
4520+
4521+#: validators.py:254
4522+msgid "You must start your URL with http://, https://, etc"
4523+msgstr "Vaše URL musí začínat http://, https://, atd."
4524+
4525+#: validators.py:255
4526+msgid "That is not a valid URL"
4527+msgstr "Toto není platné URL"
4528+
4529+#: validators.py:256
4530+#, python-format
4531+msgid "You must provide a full domain name (like %(domain)s.com)"
4532+msgstr "Musíte poskytnout plné jméno domény (jako %(domain)s.com)"
4533+
4534+#: validators.py:260
4535+msgid "Please enter an integer value"
4536+msgstr "Prosíme zadejte číselnou hodnotu"
4537+
4538+#: validators.py:261
4539+msgid "Please enter a number"
4540+msgstr "Prosíme zadejte číslo"
4541+
4542+#: controllers/actions.py:94
4543+msgid "Invalid View"
4544+msgstr "Neplatný pohled"
4545+
4546+#: controllers/actions.py:127
4547+msgid "Error no report"
4548+msgstr "Chyba bez hlášení"
4549+
4550+#: controllers/actions.py:153
4551+msgid "Nothing to print"
4552+msgstr "Není co tisknout!"
4553+
4554+#: controllers/actions.py:173
4555+msgid "Printing aborted, too long delay"
4556+msgstr "Tisk zrušen, dlouhá čekací prodleva"
4557+
4558+#: controllers/actions.py:397
4559+msgid "Relative URLs are not supported"
4560+msgstr "Nejsou podporována relativní URL"
4561+
4562+#: controllers/actions.py:425
4563+msgid "Action not found"
4564+msgstr "Akce nenalezena"
4565+
4566+#: controllers/actions.py:474
4567+msgid "No action defined"
4568+msgstr "Nedefinována žádná akce"
4569+
4570+#: controllers/attachment.py:55
4571+msgid "No record selected, You can only attach to existing record..."
4572+msgstr "Nevybrán záznam, můžete přiložit pouze k existujícímu záznamu..."
4573+
4574+#: controllers/database.py:63
4575+msgid "Create database"
4576+msgstr "Vytvořit databázi"
4577+
4578+#: controllers/database.py:65 controllers/templates/database.mako:56
4579+#: controllers/templates/search.mako:145
4580+msgid "Create"
4581+msgstr "Vytvořit"
4582+
4583+#: controllers/database.py:68
4584+msgid "Super admin password:"
4585+msgstr "Heslo hlavního správce:"
4586+
4587+#: controllers/database.py:68
4588+msgid ""
4589+"This is the password of the user that have the rights to administer "
4590+"databases. This is not a OpenERP user, just a super administrator. If you "
4591+"did not changed it, the password is 'admin' after installation."
4592+msgstr ""
4593+"Toto je heslo uživatele, který má práva spravovat databázi. Toto není "
4594+"uživatel OpenERP, jen super správce. Heslo po instalaci je 'admin', pokud "
4595+"jste jej nezměnili."
4596+
4597+#: controllers/database.py:69 controllers/database.py:101
4598+msgid "New database name:"
4599+msgstr "Jméno nové databáze:"
4600+
4601+#: controllers/database.py:69
4602+msgid ""
4603+"Choose the name of the database that will be created. The name must not "
4604+"contain any special character. Exemple: 'terp'."
4605+msgstr ""
4606+"Vyberte jméno databáze, která bude vytvořena. Jméno nesmí obsahovat "
4607+"speciální symboly. Příklad: 'terp'."
4608+
4609+#: controllers/database.py:70
4610+msgid "Load Demonstration data:"
4611+msgstr "Načíst ukázkové údaje:"
4612+
4613+#: controllers/database.py:70
4614+msgid ""
4615+"Check this box if you want demonstration data to be installed on your new "
4616+"database. These data will help you to understand OpenERP, with predefined "
4617+"products, partners, etc."
4618+msgstr ""
4619+"Zaškrtněte toto pole, pokud chcete nechat načíst ukázková data do vaší nové "
4620+"databáze. Tyto data vám pomůžou pochopit OpenERP, s přednastavenými výrobky, "
4621+"partnery, aj."
4622+
4623+#: controllers/database.py:71
4624+msgid "Default Language:"
4625+msgstr "Výchozí jazyk:"
4626+
4627+#: controllers/database.py:71
4628+msgid ""
4629+"Choose the default language that will be installed for this database. You "
4630+"will be able to install new languages after installation through the "
4631+"administration menu."
4632+msgstr ""
4633+"Vyberte výchozí jazyk, který bude instalován do této databáze. Po instalaci "
4634+"budete mít možnost instalovat nové jazyky přes správcovskou nabídku."
4635+
4636+#: controllers/database.py:72
4637+msgid "Administrator password:"
4638+msgstr "Heslo správce:"
4639+
4640+#: controllers/database.py:72
4641+msgid ""
4642+"This is the password of the 'admin' user that will be created in your new "
4643+"database."
4644+msgstr ""
4645+"Toto je heslo uživatele 'admin', který bude vytvořen ve vaši nové databázi."
4646+
4647+#: controllers/database.py:73
4648+msgid "Confirm password:"
4649+msgstr "Potvrdit heslo:"
4650+
4651+#: controllers/database.py:73
4652+msgid ""
4653+"This is the password of the 'admin' user that will be created in your new "
4654+"database. It has to be the same than the above field."
4655+msgstr ""
4656+"Toto je heslo uživatele 'admin', který bude vytvořen ve vaši nové databázi. "
4657+"Musí být stejné jako pole nad ním."
4658+
4659+#: controllers/database.py:79
4660+msgid "Drop database"
4661+msgstr "Odstranit databázi"
4662+
4663+#: controllers/database.py:81 controllers/templates/database.mako:58
4664+msgid "Drop"
4665+msgstr "Odstranit"
4666+
4667+#: controllers/database.py:83 controllers/database.py:91
4668+#: controllers/templates/login.mako:43
4669+msgid "Database:"
4670+msgstr "Databáze:"
4671+
4672+#: controllers/database.py:84 controllers/database.py:92
4673+#: controllers/database.py:100 controllers/templates/login.mako:61
4674+#: controllers/templates/login_ajax.mako:78
4675+#: controllers/templates/login_ajax.mako:98
4676+msgid "Password:"
4677+msgstr "Heslo:"
4678+
4679+#: controllers/database.py:88
4680+msgid "Backup database"
4681+msgstr "Zálohovat databáze"
4682+
4683+#: controllers/database.py:90 controllers/templates/database.mako:60
4684+msgid "Backup"
4685+msgstr "Zálohovat"
4686+
4687+#: controllers/database.py:96
4688+msgid "Restore database"
4689+msgstr "Obnovit databázi"
4690+
4691+#: controllers/database.py:98 controllers/templates/database.mako:62
4692+msgid "Restore"
4693+msgstr "Obnovit"
4694+
4695+#: controllers/database.py:99
4696+msgid "File:"
4697+msgstr "Soubor:"
4698+
4699+#: controllers/database.py:105
4700+msgid "Change Administrator Password"
4701+msgstr "Změnit heslo správce"
4702+
4703+#: controllers/database.py:107 controllers/templates/preferences/index.mako:37
4704+msgid "Change Password"
4705+msgstr "Změnit heslo"
4706+
4707+#: controllers/database.py:108
4708+msgid "Old Password:"
4709+msgstr "Staré heslo:"
4710+
4711+#: controllers/database.py:109
4712+msgid "New Password:"
4713+msgstr "Nové heslo:"
4714+
4715+#: controllers/database.py:110
4716+msgid "Confirm Password:"
4717+msgstr "Potvrdit heslo:"
4718+
4719+#: controllers/database.py:173
4720+msgid "You must avoid all accents, space or special characters."
4721+msgstr "Musíte se vyhnout přízvukům, mezerám nebo speciálním znakům."
4722+
4723+#: controllers/database.py:174
4724+msgid "Bad database name"
4725+msgstr "Chybné jméno databáze"
4726+
4727+#: controllers/database.py:194
4728+msgid ""
4729+"The server crashed during installation.\n"
4730+"We suggest you to drop this database."
4731+msgstr ""
4732+"Server zkolaboval během instalace.\n"
4733+"Doporučujeme vám smazat tuto databázi."
4734+
4735+#: controllers/database.py:195
4736+msgid "Error during database creation"
4737+msgstr "Chyba během vytváření databáze"
4738+
4739+#: controllers/database.py:198 controllers/database.py:225
4740+#: controllers/database.py:271 controllers/database.py:294
4741+msgid "Bad super admin password"
4742+msgstr "Chybné heslo hlavního správce"
4743+
4744+#: controllers/database.py:202
4745+msgid "Could not create database."
4746+msgstr "Nelze vytvořit databázi."
4747+
4748+#: controllers/database.py:228
4749+msgid "Could not drop database"
4750+msgstr "Nelze odstranit databázi"
4751+
4752+#: controllers/database.py:251
4753+msgid "Could not create backup."
4754+msgstr "Nelze vytvořit zálohu."
4755+
4756+#: controllers/database.py:275
4757+msgid "Could not restore database"
4758+msgstr "Databázi nelze obnovit"
4759+
4760+#: controllers/database.py:298
4761+msgid "Error, password not changed."
4762+msgstr "Chyba, heslo nebylo změněno."
4763+
4764+#: controllers/error_page.py:79
4765+msgid ""
4766+"Your problem has been sent to the quality team\n"
4767+"We will recontact you after analysing the problem."
4768+msgstr ""
4769+"Váš problém byl odeslán týmu kvality\n"
4770+"Po analýze problému vás budeme kontaktovat."
4771+
4772+#: controllers/error_page.py:81
4773+#, python-format
4774+msgid ""
4775+"Your problem could not be sent to the quality team\n"
4776+"Please report this error manually at %s"
4777+msgstr ""
4778+"Váš problém nelze odeslat týmu kvality\n"
4779+"Prosíme nahlašte tuto chybu ručně na: %s"
4780+
4781+#: controllers/form.py:561
4782+#, python-format
4783+msgid "Invalid button type \"%s\""
4784+msgstr "Neplatný typ tlačítka \"%s\""
4785+
4786+#: controllers/form.py:944 controllers/tree.py:243
4787+msgid "No record selected"
4788+msgstr "Nevybrán žádný záznam"
4789+
4790+#: controllers/form.py:949
4791+msgid "Print Screen"
4792+msgstr "Tisknout obrazovku"
4793+
4794+#: controllers/form.py:1016 widgets/listgrid.py:305 widgets/listgrid.py:366
4795+#: widgets/form/_form.py:910
4796+msgid "Application Error"
4797+msgstr "Chyba aplikace"
4798+
4799+#: controllers/form.py:1016
4800+#, python-format
4801+msgid "Wrong on_change trigger: %s"
4802+msgstr "Chybný spouštěč on_change: %s"
4803+
4804+#: controllers/form.py:1121
4805+msgid "Open resource"
4806+msgstr "Otevřít zdroj"
4807+
4808+#: controllers/form.py:1124
4809+msgid "Set to default value"
4810+msgstr "Nastavit výchozí hodnotu"
4811+
4812+#: controllers/form.py:1125
4813+msgid "Set as default"
4814+msgstr "Nastavit jako výchozí"
4815+
4816+#: controllers/form.py:1132
4817+msgid "Action"
4818+msgstr "Akce"
4819+
4820+#: controllers/form.py:1133
4821+msgid "Report"
4822+msgstr "Výkaz"
4823+
4824+#: controllers/impex.py:66
4825+msgid ""
4826+"Operation failed\n"
4827+"I/O error"
4828+msgstr ""
4829+"Operace selhala\n"
4830+"I/O chyba"
4831+
4832+#: controllers/impex.py:402
4833+msgid "Export Error"
4834+msgstr "Chyba exportu"
4835+
4836+#: controllers/impex.py:469
4837+msgid "Database ID"
4838+msgstr "ID databáze"
4839+
4840+#: controllers/impex.py:476
4841+msgid "Error opening .CSV file"
4842+msgstr "Chyba otvírání souboru .CSV"
4843+
4844+#: controllers/impex.py:476
4845+msgid "Input Error."
4846+msgstr "Chyba vstupu."
4847+
4848+#: controllers/impex.py:498
4849+#, python-format
4850+msgid "You cannot import the field '%s', because we cannot auto-detect it"
4851+msgstr ""
4852+"Nemůžete importovat pole '%s', protože jej nemůžeme automaticky rozpoznat"
4853+
4854+#: controllers/impex.py:501
4855+#, python-format
4856+msgid "Error processing the first line of the file. Field \"%s\" is unknown"
4857+msgstr "Chyba zpracování první řádky souboru. Neznámé pole \"%s\""
4858+
4859+#: controllers/impex.py:72 controllers/impex.py:501
4860+msgid "Import Error."
4861+msgstr "Chyba importu."
4862+
4863+#: controllers/impex.py:520
4864+msgid "The CSV delimiter must be a single character"
4865+msgstr "CSV oddělovač musí být jediný znak"
4866+
4867+#: controllers/impex.py:532
4868+msgid "File Format Error"
4869+msgstr "Chyba formátu souboru"
4870+
4871+#: controllers/impex.py:550
4872+msgid "XML-RPC error"
4873+msgstr "Chyba XML-RPC"
4874+
4875+#: controllers/impex.py:555
4876+#, python-format
4877+msgid "Imported %d objects"
4878+msgstr "Importováno %d objektů"
4879+
4880+#: controllers/impex.py:560
4881+#, python-format
4882+msgid "Error trying to import this record:%s. ErrorMessage:%s %s"
4883+msgstr "Chyba při pokusu o import tohoto záznamu:%s. Chybová zpráva:%s %s"
4884+
4885+#: controllers/impex.py:561
4886+msgid "ImportationError"
4887+msgstr "ChybaImportování"
4888+
4889+#: controllers/listgrid.py:52
4890+msgid "Parent record doesn't exists..."
4891+msgstr "Nadřazený záznam neexistuje..."
4892+
4893+#: controllers/preferences.py:35
4894+msgid "Change your password"
4895+msgstr "Změnit vaše heslo"
4896+
4897+#: controllers/preferences.py:65 controllers/templates/header.mako:59
4898+msgid "Preferences"
4899+msgstr "Předvolby"
4900+
4901+#: controllers/preferences.py:92
4902+msgid "All passwords have to be filled."
4903+msgstr "Musí být vyplněna všechna hesla."
4904+
4905+#: controllers/preferences.py:94
4906+msgid "The new password and its confirmation must be identical."
4907+msgstr "Nové heslo a jeho potvrzení musí být stejné."
4908+
4909+#: controllers/preferences.py:103
4910+msgid "Could not change your password."
4911+msgstr "Nelze změnit vaše heslo."
4912+
4913+#: controllers/preferences.py:105
4914+msgid "Original password incorrect, your password was not changed."
4915+msgstr "Neplatné původní heslo, vaše heslo nebylo změněno."
4916+
4917+#: controllers/root.py:174
4918+#, python-format
4919+msgid "Version %s"
4920+msgstr "Verze %s"
4921+
4922+#: controllers/translator.py:136
4923+msgid "You need to save the resource before adding translations."
4924+msgstr "Potřebujte uložit zdroj před přidáním překladů."
4925+
4926+#: controllers/tree.py:274
4927+msgid "No resource selected"
4928+msgstr "Nevybrán žádný zdroj"
4929+
4930+#: controllers/utils.py:43
4931+msgid "Could not connect to server"
4932+msgstr "Nelze připojit k serveru"
4933+
4934+#: controllers/utils.py:127 controllers/templates/login_ajax.mako:111
4935+msgid "Bad username or password"
4936+msgstr "Chybné jméno nebo heslo"
4937+
4938+#: controllers/view_log.py:32
4939+msgid "ID"
4940+msgstr "ID"
4941+
4942+#: controllers/view_log.py:33
4943+msgid "Creation User"
4944+msgstr "Vytvořil"
4945+
4946+#: controllers/view_log.py:34
4947+msgid "Creation Date"
4948+msgstr "Datum vytvoření"
4949+
4950+#: controllers/view_log.py:35
4951+msgid "Latest Modification by"
4952+msgstr "Změnil"
4953+
4954+#: controllers/view_log.py:36
4955+msgid "Latest Modification Date"
4956+msgstr "Naposledy změněno"
4957+
4958+#: controllers/view_log.py:37
4959+msgid "Owner"
4960+msgstr "Vlastník"
4961+
4962+#: controllers/view_log.py:38
4963+msgid "Group Owner"
4964+msgstr "Vlastník skupiny"
4965+
4966+#: controllers/view_log.py:39
4967+msgid "Access Level"
4968+msgstr "Úroveň přístupu"
4969+
4970+#: controllers/view_log.py:40
4971+msgid "Internal module data ID"
4972+msgstr "ID vnitřního datového modulu"
4973+
4974+#: controllers/viewed.py:221
4975+msgid "Invalid view id."
4976+msgstr "Chybné id pohledu"
4977+
4978+#: controllers/viewed.py:499
4979+msgid "Unable to create inherited view."
4980+msgstr "Nelze vytvořit zděděný pohled"
4981+
4982+#: controllers/viewed.py:501
4983+msgid "Can't create inherited view here."
4984+msgstr "Zde nelze vytvořit zděděný pohled."
4985+
4986+#: controllers/viewed.py:504
4987+msgid "Not implemented yet!"
4988+msgstr "Doposud nerealizováno!"
4989+
4990+#: controllers/viewed.py:609
4991+msgid "Unable to update the view."
4992+msgstr "Nelze aktualizovat pohled."
4993+
4994+#: controllers/viewed.py:859
4995+msgid "New Window"
4996+msgstr "Nové okno"
4997+
4998+#: controllers/viewed.py:871
4999+msgid "Save Button"
5000+msgstr "Tlačítko Uložit"
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: