merge

bin/addons/base/base_data.xml

bin/addons/base/i18n/am.po

bin/addons/base/i18n/ar.po

bin/addons/base/i18n/bg.po

bin/addons/base/i18n/bs.po

bin/addons/base/i18n/ca.po

bin/addons/base/i18n/cs.po

bin/addons/base/i18n/da.po

bin/addons/base/i18n/de.po

bin/addons/base/i18n/el.po

bin/addons/base/i18n/es.po

bin/addons/base/i18n/es_EC.po

bin/addons/base/i18n/et.po

bin/addons/base/i18n/eu.po

bin/addons/base/i18n/fa.po

bin/addons/base/i18n/fi.po

bin/addons/base/i18n/fr.po

bin/addons/base/i18n/gl.po

bin/addons/base/i18n/he.po

bin/addons/base/i18n/hr.po