[MERGE] forward port of branch 8.0 up to baa4cc0

# Conflicts:
#	addons/account/i18n/bs.po
#	addons/account_analytic_default/i18n/lo.po
#	addons/account_analytic_plans/i18n/lo.po
#	addons/account_bank_statement_extensions/i18n/zh_CN.po
#	addons/account_cancel/i18n/ca.po
#	addons/account_check_writing/i18n/zh_CN.po
#	addons/account_payment/i18n/bs.po
#	addons/account_test/i18n/zh_CN.po
#	addons/analytic/i18n/te.po
#	addons/auth_ldap/i18n/pl.po
#	addons/auth_oauth/i18n/bs.po
#	addons/auth_oauth/i18n/pl.po
#	addons/base_geolocalize/i18n/uk.po
#	addons/base_import/i18n/pl.po
#	addons/base_import_module/i18n/pl.po
#	addons/base_setup/i18n/bs.po
#	addons/claim_from_delivery/i18n/zh_CN.po
#	addons/crm_claim/i18n/zh_CN.po
#	addons/crm_helpdesk/i18n/zh_CN.po
#	addons/crm_partner_assign/i18n/pl.po
#	addons/crm_profiling/i18n/zh_CN.po
#	addons/crm_project_issue/i18n/ca.po
#	addons/email_template/i18n/ca.po
#	addons/email_template/i18n/zh_CN.po
#	addons/event/i18n/da.po
#	addons/event_sale/i18n/da.po
#	addons/google_calendar/i18n/bs.po
#	addons/google_drive/i18n/bs.po
#	addons/hr/i18n/cs.po
#	addons/hr_expense/i18n/sv.po
#	addons/hr_holidays/i18n/pl.po
#	addons/hr_payroll_account/i18n/zh_CN.po
#	addons/hr_recruitment/i18n/ja.po
#	addons/hr_timesheet/i18n/tlh.po
#	addons/hr_timesheet_sheet/i18n/fr.po
#	addons/im_chat/i18n/bs.po
#	addons/im_chat/i18n/da.po
#	addons/im_livechat/i18n/bs.po
#	addons/l10n_be/i18n/pl.po
#	addons/l10n_be_intrastat/i18n/es_DO.po
#	addons/l10n_be_intrastat/i18n/lo.po
#	addons/l10n_be_invoice_bba/i18n/ca.po
#	addons/l10n_be_invoice_bba/i18n/lo.po
#	addons/l10n_eu_service/i18n/mk.po
#	addons/l10n_in_hr_payroll/i18n/zh_CN.po
#	addons/l10n_multilang/i18n/zh_CN.po
#	addons/l10n_th/i18n/zh_CN.po
#	addons/lunch/i18n/bs.po
#	addons/lunch/i18n/pl.po
#	addons/lunch/i18n/sv.po
#	addons/lunch/i18n/th.po
#	addons/marketing/i18n/te.po
#	addons/marketing_campaign/i18n/zh_CN.po
#	addons/marketing_campaign_crm_demo/i18n/pl.po
#	addons/membership/i18n/zh_CN.po
#	addons/mrp_byproduct/i18n/ab.po
#	addons/mrp_repair/i18n/pl.po
#	addons/mrp_repair/i18n/sv.po
#	addons/note/i18n/zh_CN.po
#	addons/pad/i18n/pl.po
#	addons/payment_buckaroo/i18n/pl.po
#	addons/payment_ogone/i18n/pl.po
#	addons/point_of_sale/i18n/bs.po
#	addons/pos_discount/i18n/bs.po
#	addons/pos_restaurant/i18n/bs.po
#	addons/procurement/i18n/ja.po
#	addons/procurement/i18n/sv.po
#	addons/product/i18n/bs.po
#	addons/product_expiry/i18n/hr.po
#	addons/product_expiry/i18n/sv.po
#	addons/product_extended/i18n/sv.po
#	addons/project/i18n/ja.po
#	addons/project_issue/i18n/ja.po
#	addons/project_issue/i18n/zh_CN.po
#	addons/project_issue_sheet/i18n/zh_CN.po
#	addons/purchase/i18n/bs.po
#	addons/purchase/i18n/ja.po
#	addons/purchase/i18n/nb.po
#	addons/purchase/i18n/sv.po
#	addons/report/i18n/fr.po
#	addons/report/i18n/pt_BR.po
#	addons/report_intrastat/i18n/sv.po
#	addons/sale/i18n/bs.po
#	addons/sale/i18n/ja.po
#	addons/sale_crm/i18n/fa.po
#	addons/sale_layout/i18n/zh_CN.po
#	addons/sale_service/i18n/lo.po
#	addons/sales_team/i18n/zh_CN.po
#	addons/stock_account/i18n/ja.po
#	addons/stock_account/i18n/sv.po
#	addons/stock_picking_wave/i18n/lo.po
#	addons/subscription/i18n/zh_CN.po
#	addons/survey/i18n/mk.po
#	addons/survey/i18n/pt_BR.po
#	addons/warning/i18n/lo.po
#	addons/web/i18n/lo.po
#	addons/website_blog/i18n/bs.po
#	addons/website_blog/i18n/ja.po
#	addons/website_crm_partner_assign/i18n/pl.po
#	addons/website_crm_partner_assign/i18n/zh_CN.po
#	addons/website_event/i18n/da.po
#	addons/website_event/i18n/zh_CN.po
#	addons/website_event_sale/i18n/da.po
#	addons/website_event_track/i18n/da.po
#	addons/website_event_track/i18n/ja.po
#	addons/website_event_track/i18n/zh_CN.po
#	addons/website_forum_doc/i18n/zh_CN.po
#	addons/website_hr_recruitment/i18n/da.po
#	addons/website_hr_recruitment/i18n/ja.po
#	addons/website_mail/i18n/fr.po
#	addons/website_mail/i18n/ja.po
#	addons/website_mail_group/i18n/zh_CN.po
#	addons/website_quote/i18n/bs.po
#	addons/website_sale/controllers/main.py
#	addons/website_sale/i18n/bs.po
#	addons/website_sale/i18n/fa.po
#	addons/website_sale_delivery/i18n/zh_CN.po
#	addons/website_sale_options/i18n/lo.po
#	openerp/addons/base/i18n/bs.po
#	openerp/addons/base/i18n/ka.po

0 files changed, 0 insertions, 0 deletions