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 |
Related bugs: |
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